diff --git a/.cirrus.yml b/.cirrus.yml --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,3 @@ - compute_engine_instance: # Image list available via # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,3 @@ - The compilation of software known as FreeBSD is distributed under the following terms: diff --git a/LOCKS b/LOCKS --- a/LOCKS +++ b/LOCKS @@ -1,4 +1,3 @@ - This file documents formal review/approval requirements that have been approved by core. diff --git a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,3 @@ - Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements are granted by core. These are documented in LOCKS and enforced diff --git a/Makefile.libcompat b/Makefile.libcompat --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -1,4 +1,3 @@ - .if !targets(__<${_this:T}>__) __<${_this:T}>__: diff --git a/bin/Makefile b/bin/Makefile --- a/bin/Makefile +++ b/bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= cat \ diff --git a/bin/Makefile.inc b/bin/Makefile.inc --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /bin diff --git a/bin/cat/Makefile b/bin/cat/Makefile --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile --- a/bin/cat/tests/Makefile +++ b/bin/cat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= cat_test diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile --- a/bin/chflags/Makefile +++ b/bin/chflags/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/chflags/tests/Makefile b/bin/chflags/tests/Makefile --- a/bin/chflags/tests/Makefile +++ b/bin/chflags/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chflags_test .include diff --git a/bin/chio/Makefile b/bin/chio/Makefile --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities PROG= chio diff --git a/bin/chio/defs.h b/bin/chio/defs.h --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/chmod/tests/Makefile b/bin/chmod/tests/Makefile --- a/bin/chmod/tests/Makefile +++ b/bin/chmod/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chmod_test .include diff --git a/bin/cp/Makefile b/bin/cp/Makefile --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/cp/tests/Makefile b/bin/cp/tests/Makefile --- a/bin/cp/tests/Makefile +++ b/bin/cp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= cp_test diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile --- a/bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -1,4 +1,3 @@ - PROG= cpuset LIBADD= jail diff --git a/bin/date/Makefile b/bin/date/Makefile --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile --- a/bin/date/tests/Makefile +++ b/bin/date/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= format_string_test .include diff --git a/bin/dd/Makefile b/bin/dd/Makefile --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile --- a/bin/dd/tests/Makefile +++ b/bin/dd/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= dd2_test NETBSD_ATF_TESTS_SH= dd_test diff --git a/bin/df/Makefile b/bin/df/Makefile --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= df diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile --- a/bin/domainname/Makefile +++ b/bin/domainname/Makefile @@ -1,4 +1,3 @@ - PACKAGE=yp PROG= domainname diff --git a/bin/echo/Makefile b/bin/echo/Makefile --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/echo/tests/Makefile b/bin/echo/tests/Makefile --- a/bin/echo/tests/Makefile +++ b/bin/echo/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= echo_test .include diff --git a/bin/ed/Makefile b/bin/ed/Makefile --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ed/POSIX b/bin/ed/POSIX --- a/bin/ed/POSIX +++ b/bin/ed/POSIX @@ -1,4 +1,3 @@ - This version of ed(1) is not strictly POSIX compliant, as described in the POSIX 1003.2 document. The following is a summary of the omissions, extensions and possible deviations from POSIX 1003.2. diff --git a/bin/ed/README b/bin/ed/README --- a/bin/ed/README +++ b/bin/ed/README @@ -1,4 +1,3 @@ - ed is an 8-bit-clean, POSIX-compliant line editor. It should work with any regular expression package that conforms to the POSIX interface standard, such as GNU regex(3). diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile --- a/bin/ed/test/Makefile +++ b/bin/ed/test/Makefile @@ -1,4 +1,3 @@ - SHELL= /bin/sh ED= ${.OBJDIR}/ed diff --git a/bin/ed/test/README b/bin/ed/test/README --- a/bin/ed/test/README +++ b/bin/ed/test/README @@ -1,4 +1,3 @@ - The files in this directory with suffixes `.t', `.d', `.r' and `.err' are used for testing ed. To run the tests, set the ED variable in the Makefile for the path name of the program to be tested (e.g., /bin/ed), and type diff --git a/bin/ed/test/nl1.r b/bin/ed/test/nl1.r --- a/bin/ed/test/nl1.r +++ b/bin/ed/test/nl1.r @@ -1,5 +1,3 @@ - - hello world line 1 line 2 diff --git a/bin/expr/Makefile b/bin/expr/Makefile --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile --- a/bin/expr/tests/Makefile +++ b/bin/expr/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= expr_test ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g' diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile --- a/bin/freebsd-version/Makefile +++ b/bin/freebsd-version/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime SCRIPTS = freebsd-version MAN = freebsd-version.1 diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile --- a/bin/getfacl/Makefile +++ b/bin/getfacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= getfacl diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= hostname diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile --- a/bin/kenv/Makefile +++ b/bin/kenv/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= kenv diff --git a/bin/kill/Makefile b/bin/kill/Makefile --- a/bin/kill/Makefile +++ b/bin/kill/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= kill diff --git a/bin/ln/Makefile b/bin/ln/Makefile --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ln/tests/Makefile b/bin/ln/tests/Makefile --- a/bin/ln/tests/Makefile +++ b/bin/ln/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ln_test .include diff --git a/bin/ls/Makefile b/bin/ls/Makefile --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile --- a/bin/ls/tests/Makefile +++ b/bin/ls/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ls_tests # This seems like overkill, but the idea in mind is that all of the testcases # should be runnable as !root diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile --- a/bin/mkdir/Makefile +++ b/bin/mkdir/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/mkdir/tests/Makefile b/bin/mkdir/tests/Makefile --- a/bin/mkdir/tests/Makefile +++ b/bin/mkdir/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= mkdir_test .include diff --git a/bin/mv/Makefile b/bin/mv/Makefile --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile --- a/bin/mv/tests/Makefile +++ b/bin/mv/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= legacy_test diff --git a/bin/pax/Makefile b/bin/pax/Makefile --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile --- a/bin/pax/tests/Makefile +++ b/bin/pax/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_PERL= legacy_test diff --git a/bin/pax/tests/legacy_test.pl b/bin/pax/tests/legacy_test.pl --- a/bin/pax/tests/legacy_test.pl +++ b/bin/pax/tests/legacy_test.pl @@ -1,4 +1,3 @@ - use strict; use warnings; diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile --- a/bin/pkill/tests/Makefile +++ b/bin/pkill/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/bin/ps/Makefile b/bin/ps/Makefile --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile --- a/bin/pwait/Makefile +++ b/bin/pwait/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/pwait/tests/Makefile b/bin/pwait/tests/Makefile --- a/bin/pwait/tests/Makefile +++ b/bin/pwait/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= pwait_test .include diff --git a/bin/pwait/tests/pwait_test.sh b/bin/pwait/tests/pwait_test.sh --- a/bin/pwait/tests/pwait_test.sh +++ b/bin/pwait/tests/pwait_test.sh @@ -1,4 +1,3 @@ - atf_test_case basic basic_head() { diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile --- a/bin/pwd/Makefile +++ b/bin/pwd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= pwd diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile --- a/bin/realpath/Makefile +++ b/bin/realpath/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= realpath diff --git a/bin/rm/Makefile b/bin/rm/Makefile --- a/bin/rm/Makefile +++ b/bin/rm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/rm/tests/Makefile b/bin/rm/tests/Makefile --- a/bin/rm/tests/Makefile +++ b/bin/rm/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rm_test .include diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile --- a/bin/rmdir/Makefile +++ b/bin/rmdir/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/rmdir/tests/Makefile b/bin/rmdir/tests/Makefile --- a/bin/rmdir/tests/Makefile +++ b/bin/rmdir/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rmdir_test .include diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile --- a/bin/setfacl/Makefile +++ b/bin/setfacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= setfacl SRCS= file.c mask.c merge.c remove.c setfacl.c util.c diff --git a/bin/sh/Makefile b/bin/sh/Makefile --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,4 +1,3 @@ - .include CONFGROUPS= ETC ROOT diff --git a/bin/sh/TOUR b/bin/sh/TOUR --- a/bin/sh/TOUR +++ b/bin/sh/TOUR @@ -1,4 +1,3 @@ - NOTE -- This is the original TOUR paper distributed with ash and does not represent the current state of the shell. It is provided anyway since it provides helpful information for how the shell is structured, diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= builtins diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/bin/sh/tests/builtins/alias4.0 b/bin/sh/tests/builtins/alias4.0 --- a/bin/sh/tests/builtins/alias4.0 +++ b/bin/sh/tests/builtins/alias4.0 @@ -1,3 +1,2 @@ - unalias -a alias -- diff --git a/bin/sh/tests/builtins/break1.0 b/bin/sh/tests/builtins/break1.0 --- a/bin/sh/tests/builtins/break1.0 +++ b/bin/sh/tests/builtins/break1.0 @@ -1,4 +1,3 @@ - if [ "$1" != nested ]; then while :; do set -- nested diff --git a/bin/sh/tests/builtins/break2.0 b/bin/sh/tests/builtins/break2.0 --- a/bin/sh/tests/builtins/break2.0 +++ b/bin/sh/tests/builtins/break2.0 @@ -1,4 +1,3 @@ - # It is not immediately obvious that this should work, and someone probably # relies on it. diff --git a/bin/sh/tests/builtins/break3.0 b/bin/sh/tests/builtins/break3.0 --- a/bin/sh/tests/builtins/break3.0 +++ b/bin/sh/tests/builtins/break3.0 @@ -1,4 +1,3 @@ - # We accept this and people might rely on it. # However, various other shells do not accept it. diff --git a/bin/sh/tests/builtins/break4.4 b/bin/sh/tests/builtins/break4.4 --- a/bin/sh/tests/builtins/break4.4 +++ b/bin/sh/tests/builtins/break4.4 @@ -1,4 +1,3 @@ - # Although this is not specified by POSIX, some configure scripts (gawk 4.1.0) # appear to depend on it. diff --git a/bin/sh/tests/builtins/break5.4 b/bin/sh/tests/builtins/break5.4 --- a/bin/sh/tests/builtins/break5.4 +++ b/bin/sh/tests/builtins/break5.4 @@ -1,4 +1,3 @@ - # Although this is not specified by POSIX, some configure scripts (gawk 4.1.0) # appear to depend on it. # In some uncommitted code, the subshell environment corrupted the outer diff --git a/bin/sh/tests/builtins/builtin1.0 b/bin/sh/tests/builtins/builtin1.0 --- a/bin/sh/tests/builtins/builtin1.0 +++ b/bin/sh/tests/builtins/builtin1.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/case10.0 b/bin/sh/tests/builtins/case10.0 --- a/bin/sh/tests/builtins/case10.0 +++ b/bin/sh/tests/builtins/case10.0 @@ -1,4 +1,3 @@ - case ! in [\!!]) ;; *) echo Failed at $LINENO ;; diff --git a/bin/sh/tests/builtins/case11.0 b/bin/sh/tests/builtins/case11.0 --- a/bin/sh/tests/builtins/case11.0 +++ b/bin/sh/tests/builtins/case11.0 @@ -1,4 +1,3 @@ - false case x in *) diff --git a/bin/sh/tests/builtins/case12.0 b/bin/sh/tests/builtins/case12.0 --- a/bin/sh/tests/builtins/case12.0 +++ b/bin/sh/tests/builtins/case12.0 @@ -1,4 +1,3 @@ - false case x in y) diff --git a/bin/sh/tests/builtins/case13.0 b/bin/sh/tests/builtins/case13.0 --- a/bin/sh/tests/builtins/case13.0 +++ b/bin/sh/tests/builtins/case13.0 @@ -1,4 +1,3 @@ - case ^ in [\^^]) ;; *) echo Failed at $LINENO ;; diff --git a/bin/sh/tests/builtins/case14.0 b/bin/sh/tests/builtins/case14.0 --- a/bin/sh/tests/builtins/case14.0 +++ b/bin/sh/tests/builtins/case14.0 @@ -1,4 +1,3 @@ - case `false` in no) exit 3 ;; esac diff --git a/bin/sh/tests/builtins/case15.0 b/bin/sh/tests/builtins/case15.0 --- a/bin/sh/tests/builtins/case15.0 +++ b/bin/sh/tests/builtins/case15.0 @@ -1,4 +1,3 @@ - case x in `false`) exit 3 ;; esac diff --git a/bin/sh/tests/builtins/case16.0 b/bin/sh/tests/builtins/case16.0 --- a/bin/sh/tests/builtins/case16.0 +++ b/bin/sh/tests/builtins/case16.0 @@ -1,4 +1,3 @@ - f() { return 42; } f case x in diff --git a/bin/sh/tests/builtins/case17.0 b/bin/sh/tests/builtins/case17.0 --- a/bin/sh/tests/builtins/case17.0 +++ b/bin/sh/tests/builtins/case17.0 @@ -1,2 +1 @@ - ! case x in x) false ;& y) esac diff --git a/bin/sh/tests/builtins/case18.0 b/bin/sh/tests/builtins/case18.0 --- a/bin/sh/tests/builtins/case18.0 +++ b/bin/sh/tests/builtins/case18.0 @@ -1,4 +1,3 @@ - case x$(false) in x) ;& y) [ $? != 0 ] ;; diff --git a/bin/sh/tests/builtins/case19.0 b/bin/sh/tests/builtins/case19.0 --- a/bin/sh/tests/builtins/case19.0 +++ b/bin/sh/tests/builtins/case19.0 @@ -1,4 +1,3 @@ - [ "`case x in x) false ;& y) ;& diff --git a/bin/sh/tests/builtins/case20.0 b/bin/sh/tests/builtins/case20.0 --- a/bin/sh/tests/builtins/case20.0 +++ b/bin/sh/tests/builtins/case20.0 @@ -1,4 +1,3 @@ - # Shells do not agree about what this pattern should match, but it is # certain that it must not crash and the missing close bracket must not # be simply ignored. diff --git a/bin/sh/tests/builtins/case21.0 b/bin/sh/tests/builtins/case21.0 --- a/bin/sh/tests/builtins/case21.0 +++ b/bin/sh/tests/builtins/case21.0 @@ -1,4 +1,3 @@ - case 5 in [0$((-9))]) ;; *) echo bad1 ;; diff --git a/bin/sh/tests/builtins/case22.0 b/bin/sh/tests/builtins/case22.0 --- a/bin/sh/tests/builtins/case22.0 +++ b/bin/sh/tests/builtins/case22.0 @@ -1,4 +1,3 @@ - case 5 in [0"$((-9))"]) echo bad1 ;; esac diff --git a/bin/sh/tests/builtins/case23.0 b/bin/sh/tests/builtins/case23.0 --- a/bin/sh/tests/builtins/case23.0 +++ b/bin/sh/tests/builtins/case23.0 @@ -1,4 +1,3 @@ - case [ in [[:alpha:]]) echo bad esac diff --git a/bin/sh/tests/builtins/case4.0 b/bin/sh/tests/builtins/case4.0 --- a/bin/sh/tests/builtins/case4.0 +++ b/bin/sh/tests/builtins/case4.0 @@ -1,4 +1,3 @@ - set -- "*" case x in "$1") echo failed ;; diff --git a/bin/sh/tests/builtins/case5.0 b/bin/sh/tests/builtins/case5.0 --- a/bin/sh/tests/builtins/case5.0 +++ b/bin/sh/tests/builtins/case5.0 @@ -1,4 +1,3 @@ - unset LC_ALL LC_CTYPE=en_US.UTF-8 export LC_CTYPE diff --git a/bin/sh/tests/builtins/case6.0 b/bin/sh/tests/builtins/case6.0 --- a/bin/sh/tests/builtins/case6.0 +++ b/bin/sh/tests/builtins/case6.0 @@ -1,4 +1,3 @@ - unset LC_ALL LC_CTYPE=de_DE.ISO8859-1 export LC_CTYPE diff --git a/bin/sh/tests/builtins/case7.0 b/bin/sh/tests/builtins/case7.0 --- a/bin/sh/tests/builtins/case7.0 +++ b/bin/sh/tests/builtins/case7.0 @@ -1,4 +1,3 @@ - # Character ranges in a locale other than the POSIX locale, not specified # by POSIX. diff --git a/bin/sh/tests/builtins/case8.0 b/bin/sh/tests/builtins/case8.0 --- a/bin/sh/tests/builtins/case8.0 +++ b/bin/sh/tests/builtins/case8.0 @@ -1,4 +1,3 @@ - case aZ_ in [[:alpha:]_][[:upper:]_][[:alpha:]_]) ;; *) echo Failed at $LINENO ;; diff --git a/bin/sh/tests/builtins/case9.0 b/bin/sh/tests/builtins/case9.0 --- a/bin/sh/tests/builtins/case9.0 +++ b/bin/sh/tests/builtins/case9.0 @@ -1,4 +1,3 @@ - errors=0 f() { diff --git a/bin/sh/tests/builtins/cd10.0 b/bin/sh/tests/builtins/cd10.0 --- a/bin/sh/tests/builtins/cd10.0 +++ b/bin/sh/tests/builtins/cd10.0 @@ -1,4 +1,3 @@ - # Precondition (cd /bin) || exit # Verify write error is ignored. diff --git a/bin/sh/tests/builtins/cd11.0 b/bin/sh/tests/builtins/cd11.0 --- a/bin/sh/tests/builtins/cd11.0 +++ b/bin/sh/tests/builtins/cd11.0 @@ -1,4 +1,3 @@ - set -e T=$(mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXX") trap 'rm -rf "$T"' 0 diff --git a/bin/sh/tests/builtins/cd3.0 b/bin/sh/tests/builtins/cd3.0 --- a/bin/sh/tests/builtins/cd3.0 +++ b/bin/sh/tests/builtins/cd3.0 @@ -1,4 +1,3 @@ - # If fully successful, cd -Pe must be like cd -P. set -e diff --git a/bin/sh/tests/builtins/cd4.0 b/bin/sh/tests/builtins/cd4.0 --- a/bin/sh/tests/builtins/cd4.0 +++ b/bin/sh/tests/builtins/cd4.0 @@ -1,4 +1,3 @@ - # This test assumes that whatever mechanism cd -P uses to determine the # pathname to the current directory if it is longer than PATH_MAX requires # read permission on all parent directories. It also works if this diff --git a/bin/sh/tests/builtins/cd5.0 b/bin/sh/tests/builtins/cd5.0 --- a/bin/sh/tests/builtins/cd5.0 +++ b/bin/sh/tests/builtins/cd5.0 @@ -1,4 +1,3 @@ - set -e T=$(mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXX") trap 'rm -rf "$T"' 0 diff --git a/bin/sh/tests/builtins/cd6.0 b/bin/sh/tests/builtins/cd6.0 --- a/bin/sh/tests/builtins/cd6.0 +++ b/bin/sh/tests/builtins/cd6.0 @@ -1,4 +1,3 @@ - set -e cd -P /bin d=$PWD diff --git a/bin/sh/tests/builtins/cd7.0 b/bin/sh/tests/builtins/cd7.0 --- a/bin/sh/tests/builtins/cd7.0 +++ b/bin/sh/tests/builtins/cd7.0 @@ -1,4 +1,3 @@ - set -e cd /usr/bin [ "$PWD" = /usr/bin ] diff --git a/bin/sh/tests/builtins/cd8.0 b/bin/sh/tests/builtins/cd8.0 --- a/bin/sh/tests/builtins/cd8.0 +++ b/bin/sh/tests/builtins/cd8.0 @@ -1,4 +1,3 @@ - # The exact wording of the error message is not standardized, but giving # a description of the errno is useful. diff --git a/bin/sh/tests/builtins/cd9.0 b/bin/sh/tests/builtins/cd9.0 --- a/bin/sh/tests/builtins/cd9.0 +++ b/bin/sh/tests/builtins/cd9.0 @@ -1,4 +1,3 @@ - cd /dev cd /bin cd - >/dev/null diff --git a/bin/sh/tests/builtins/command10.0 b/bin/sh/tests/builtins/command10.0 --- a/bin/sh/tests/builtins/command10.0 +++ b/bin/sh/tests/builtins/command10.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/command11.0 b/bin/sh/tests/builtins/command11.0 --- a/bin/sh/tests/builtins/command11.0 +++ b/bin/sh/tests/builtins/command11.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/command12.0 b/bin/sh/tests/builtins/command12.0 --- a/bin/sh/tests/builtins/command12.0 +++ b/bin/sh/tests/builtins/command12.0 @@ -1,4 +1,3 @@ - alias aa=echo\ \'\"\' cmd=$(command -v aa) alias aa=echo\ bad diff --git a/bin/sh/tests/builtins/command13.0 b/bin/sh/tests/builtins/command13.0 --- a/bin/sh/tests/builtins/command13.0 +++ b/bin/sh/tests/builtins/command13.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/command14.0 b/bin/sh/tests/builtins/command14.0 --- a/bin/sh/tests/builtins/command14.0 +++ b/bin/sh/tests/builtins/command14.0 @@ -1,4 +1,3 @@ - r=`cd /bin && PATH=. command -V ls` case $r in */bin/ls*|*/bin/./ls*) ;; diff --git a/bin/sh/tests/builtins/command7.0 b/bin/sh/tests/builtins/command7.0 --- a/bin/sh/tests/builtins/command7.0 +++ b/bin/sh/tests/builtins/command7.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/command9.0 b/bin/sh/tests/builtins/command9.0 --- a/bin/sh/tests/builtins/command9.0 +++ b/bin/sh/tests/builtins/command9.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/dot1.0 b/bin/sh/tests/builtins/dot1.0 --- a/bin/sh/tests/builtins/dot1.0 +++ b/bin/sh/tests/builtins/dot1.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/dot2.0 b/bin/sh/tests/builtins/dot2.0 --- a/bin/sh/tests/builtins/dot2.0 +++ b/bin/sh/tests/builtins/dot2.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/dot3.0 b/bin/sh/tests/builtins/dot3.0 --- a/bin/sh/tests/builtins/dot3.0 +++ b/bin/sh/tests/builtins/dot3.0 @@ -1,4 +1,3 @@ - # . should return 0 if no command was executed. if false; then diff --git a/bin/sh/tests/builtins/dot4.0 b/bin/sh/tests/builtins/dot4.0 --- a/bin/sh/tests/builtins/dot4.0 +++ b/bin/sh/tests/builtins/dot4.0 @@ -1,4 +1,3 @@ - v=abcd v=$v$v$v$v v=$v$v$v$v diff --git a/bin/sh/tests/builtins/echo1.0 b/bin/sh/tests/builtins/echo1.0 --- a/bin/sh/tests/builtins/echo1.0 +++ b/bin/sh/tests/builtins/echo1.0 @@ -1,4 +1,3 @@ - # Not specified by POSIX. [ "`echo -n a b; echo c d; echo e f`" = "a bc d diff --git a/bin/sh/tests/builtins/echo2.0 b/bin/sh/tests/builtins/echo2.0 --- a/bin/sh/tests/builtins/echo2.0 +++ b/bin/sh/tests/builtins/echo2.0 @@ -1,4 +1,3 @@ - # Not specified by POSIX. a=`echo -e '\a\b\e\f\n\r\t\v\\\\\0041\c'; echo .` diff --git a/bin/sh/tests/builtins/echo3.0 b/bin/sh/tests/builtins/echo3.0 --- a/bin/sh/tests/builtins/echo3.0 +++ b/bin/sh/tests/builtins/echo3.0 @@ -1,4 +1,3 @@ - # Not specified by POSIX. [ "`echo -e 'a\cb' c; echo d`" = "ad" ] diff --git a/bin/sh/tests/builtins/eval2.0 b/bin/sh/tests/builtins/eval2.0 --- a/bin/sh/tests/builtins/eval2.0 +++ b/bin/sh/tests/builtins/eval2.0 @@ -1,4 +1,3 @@ - eval ' false diff --git a/bin/sh/tests/builtins/eval3.0 b/bin/sh/tests/builtins/eval3.0 --- a/bin/sh/tests/builtins/eval3.0 +++ b/bin/sh/tests/builtins/eval3.0 @@ -1,4 +1,3 @@ - eval 'false;' && exit 1 eval 'true;' || exit 1 eval 'false; diff --git a/bin/sh/tests/builtins/eval4.0 b/bin/sh/tests/builtins/eval4.0 --- a/bin/sh/tests/builtins/eval4.0 +++ b/bin/sh/tests/builtins/eval4.0 @@ -1,4 +1,3 @@ - # eval should preserve $? from command substitutions when starting # the parsed command. [ $(eval 'echo $?' $(false)) = 1 ] diff --git a/bin/sh/tests/builtins/eval5.0 b/bin/sh/tests/builtins/eval5.0 --- a/bin/sh/tests/builtins/eval5.0 +++ b/bin/sh/tests/builtins/eval5.0 @@ -1,3 +1,2 @@ - # eval should return 0 if no command was executed. eval $(false) diff --git a/bin/sh/tests/builtins/eval6.0 b/bin/sh/tests/builtins/eval6.0 --- a/bin/sh/tests/builtins/eval6.0 +++ b/bin/sh/tests/builtins/eval6.0 @@ -1,4 +1,3 @@ - # eval should preserve $? from command substitutions when starting # the parsed command. [ $(false; eval 'echo $?' $(:)) = 0 ] diff --git a/bin/sh/tests/builtins/eval8.7 b/bin/sh/tests/builtins/eval8.7 --- a/bin/sh/tests/builtins/eval8.7 +++ b/bin/sh/tests/builtins/eval8.7 @@ -1,4 +1,3 @@ - f() { eval "return 7 echo bad2" diff --git a/bin/sh/tests/builtins/exec1.0 b/bin/sh/tests/builtins/exec1.0 --- a/bin/sh/tests/builtins/exec1.0 +++ b/bin/sh/tests/builtins/exec1.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/exec2.0 b/bin/sh/tests/builtins/exec2.0 --- a/bin/sh/tests/builtins/exec2.0 +++ b/bin/sh/tests/builtins/exec2.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/exit1.0 b/bin/sh/tests/builtins/exit1.0 --- a/bin/sh/tests/builtins/exit1.0 +++ b/bin/sh/tests/builtins/exit1.0 @@ -1,4 +1,3 @@ - # exit with an argument should overwrite the exit status in an EXIT trap. trap 'true; exit $?' 0 diff --git a/bin/sh/tests/builtins/exit2.8 b/bin/sh/tests/builtins/exit2.8 --- a/bin/sh/tests/builtins/exit2.8 +++ b/bin/sh/tests/builtins/exit2.8 @@ -1,4 +1,3 @@ - # exit without arguments is the same as exit $? outside a trap. trap 'true; true' 0 diff --git a/bin/sh/tests/builtins/exit3.0 b/bin/sh/tests/builtins/exit3.0 --- a/bin/sh/tests/builtins/exit3.0 +++ b/bin/sh/tests/builtins/exit3.0 @@ -1,4 +1,3 @@ - # exit without arguments differs from exit $? in an EXIT trap. trap 'false; exit' 0 diff --git a/bin/sh/tests/builtins/export1.0 b/bin/sh/tests/builtins/export1.0 --- a/bin/sh/tests/builtins/export1.0 +++ b/bin/sh/tests/builtins/export1.0 @@ -1,2 +1 @@ - env @badness=1 ${SH} -c 'v=`export -p`; eval "$v"' diff --git a/bin/sh/tests/builtins/for1.0 b/bin/sh/tests/builtins/for1.0 --- a/bin/sh/tests/builtins/for1.0 +++ b/bin/sh/tests/builtins/for1.0 @@ -1,3 +1,2 @@ - false for i in `false`; do exit 3; done diff --git a/bin/sh/tests/builtins/for2.0 b/bin/sh/tests/builtins/for2.0 --- a/bin/sh/tests/builtins/for2.0 +++ b/bin/sh/tests/builtins/for2.0 @@ -1,4 +1,3 @@ - r=x f() { return 42; } f diff --git a/bin/sh/tests/builtins/for3.0 b/bin/sh/tests/builtins/for3.0 --- a/bin/sh/tests/builtins/for3.0 +++ b/bin/sh/tests/builtins/for3.0 @@ -1,4 +1,3 @@ - r=x f() { return 42; } for i in x`f`; do diff --git a/bin/sh/tests/builtins/getopts1.0 b/bin/sh/tests/builtins/getopts1.0 --- a/bin/sh/tests/builtins/getopts1.0 +++ b/bin/sh/tests/builtins/getopts1.0 @@ -1,4 +1,3 @@ - printf -- '-1-\n' set -- -abc getopts "ab:" OPTION diff --git a/bin/sh/tests/builtins/getopts10.0 b/bin/sh/tests/builtins/getopts10.0 --- a/bin/sh/tests/builtins/getopts10.0 +++ b/bin/sh/tests/builtins/getopts10.0 @@ -1,4 +1,3 @@ - set -- -x arg opt=not getopts x opt diff --git a/bin/sh/tests/builtins/getopts3.0 b/bin/sh/tests/builtins/getopts3.0 --- a/bin/sh/tests/builtins/getopts3.0 +++ b/bin/sh/tests/builtins/getopts3.0 @@ -1,4 +1,3 @@ - shift $# getopts x opt r=$? diff --git a/bin/sh/tests/builtins/getopts4.0 b/bin/sh/tests/builtins/getopts4.0 --- a/bin/sh/tests/builtins/getopts4.0 +++ b/bin/sh/tests/builtins/getopts4.0 @@ -1,4 +1,3 @@ - set -- -x opt=not getopts x opt diff --git a/bin/sh/tests/builtins/getopts5.0 b/bin/sh/tests/builtins/getopts5.0 --- a/bin/sh/tests/builtins/getopts5.0 +++ b/bin/sh/tests/builtins/getopts5.0 @@ -1,4 +1,3 @@ - set -- -x arg opt=not getopts x opt diff --git a/bin/sh/tests/builtins/getopts6.0 b/bin/sh/tests/builtins/getopts6.0 --- a/bin/sh/tests/builtins/getopts6.0 +++ b/bin/sh/tests/builtins/getopts6.0 @@ -1,4 +1,3 @@ - set -- -x -y getopts :x var || echo "First getopts bad: $?" getopts :x var diff --git a/bin/sh/tests/builtins/getopts7.0 b/bin/sh/tests/builtins/getopts7.0 --- a/bin/sh/tests/builtins/getopts7.0 +++ b/bin/sh/tests/builtins/getopts7.0 @@ -1,4 +1,3 @@ - set -- -x getopts :x: var r=$? diff --git a/bin/sh/tests/builtins/getopts8.0 b/bin/sh/tests/builtins/getopts8.0 --- a/bin/sh/tests/builtins/getopts8.0 +++ b/bin/sh/tests/builtins/getopts8.0 @@ -1,4 +1,3 @@ - set -- -yz -wx opt=wrong1 OPTARG=wrong2 while getopts :x opt; do diff --git a/bin/sh/tests/builtins/getopts9.0 b/bin/sh/tests/builtins/getopts9.0 --- a/bin/sh/tests/builtins/getopts9.0 +++ b/bin/sh/tests/builtins/getopts9.0 @@ -1,4 +1,3 @@ - args='-ab' getopts ab opt $args printf '%s\n' "$?:$opt:$OPTARG" diff --git a/bin/sh/tests/builtins/hash4.0 b/bin/sh/tests/builtins/hash4.0 --- a/bin/sh/tests/builtins/hash4.0 +++ b/bin/sh/tests/builtins/hash4.0 @@ -1,4 +1,3 @@ - exec 3>&1 m=`hash nosuchtool 2>&1 >&3` r=$? diff --git a/bin/sh/tests/builtins/jobid2.0 b/bin/sh/tests/builtins/jobid2.0 --- a/bin/sh/tests/builtins/jobid2.0 +++ b/bin/sh/tests/builtins/jobid2.0 @@ -1,4 +1,3 @@ - : & p1=$(jobid) p2=$(jobid --) diff --git a/bin/sh/tests/builtins/kill1.0 b/bin/sh/tests/builtins/kill1.0 --- a/bin/sh/tests/builtins/kill1.0 +++ b/bin/sh/tests/builtins/kill1.0 @@ -1,4 +1,3 @@ - : & p1=$! : & diff --git a/bin/sh/tests/builtins/kill2.0 b/bin/sh/tests/builtins/kill2.0 --- a/bin/sh/tests/builtins/kill2.0 +++ b/bin/sh/tests/builtins/kill2.0 @@ -1,4 +1,3 @@ - sleep 1 | sleep 1 & kill %+ wait "$!" diff --git a/bin/sh/tests/builtins/lineno2.0 b/bin/sh/tests/builtins/lineno2.0 --- a/bin/sh/tests/builtins/lineno2.0 +++ b/bin/sh/tests/builtins/lineno2.0 @@ -1,4 +1,3 @@ - f() { : ${LINENO+${x?}} } diff --git a/bin/sh/tests/builtins/lineno3.0 b/bin/sh/tests/builtins/lineno3.0 --- a/bin/sh/tests/builtins/lineno3.0 +++ b/bin/sh/tests/builtins/lineno3.0 @@ -1,4 +1,3 @@ - echo before: $LINENO dummy=$'a\0 ' diff --git a/bin/sh/tests/builtins/local2.0 b/bin/sh/tests/builtins/local2.0 --- a/bin/sh/tests/builtins/local2.0 +++ b/bin/sh/tests/builtins/local2.0 @@ -1,4 +1,3 @@ - f() { local - set -a diff --git a/bin/sh/tests/builtins/local3.0 b/bin/sh/tests/builtins/local3.0 --- a/bin/sh/tests/builtins/local3.0 +++ b/bin/sh/tests/builtins/local3.0 @@ -1,4 +1,3 @@ - f() { local "$@" set -a diff --git a/bin/sh/tests/builtins/local4.0 b/bin/sh/tests/builtins/local4.0 --- a/bin/sh/tests/builtins/local4.0 +++ b/bin/sh/tests/builtins/local4.0 @@ -1,4 +1,3 @@ - f() { local -- x x=2 diff --git a/bin/sh/tests/builtins/local5.0 b/bin/sh/tests/builtins/local5.0 --- a/bin/sh/tests/builtins/local5.0 +++ b/bin/sh/tests/builtins/local5.0 @@ -1,4 +1,3 @@ - f() { local PATH IFS elem IFS=: diff --git a/bin/sh/tests/builtins/local6.0 b/bin/sh/tests/builtins/local6.0 --- a/bin/sh/tests/builtins/local6.0 +++ b/bin/sh/tests/builtins/local6.0 @@ -1,4 +1,3 @@ - f() { local x readonly x=2 diff --git a/bin/sh/tests/builtins/local7.0 b/bin/sh/tests/builtins/local7.0 --- a/bin/sh/tests/builtins/local7.0 +++ b/bin/sh/tests/builtins/local7.0 @@ -1,4 +1,3 @@ - f() { local x readonly x=2 diff --git a/bin/sh/tests/builtins/locale2.0 b/bin/sh/tests/builtins/locale2.0 --- a/bin/sh/tests/builtins/locale2.0 +++ b/bin/sh/tests/builtins/locale2.0 @@ -1,4 +1,3 @@ - $SH -c 'LC_ALL=C true; kill -INT $$; echo continued' r=$? [ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ] diff --git a/bin/sh/tests/builtins/printf1.0 b/bin/sh/tests/builtins/printf1.0 --- a/bin/sh/tests/builtins/printf1.0 +++ b/bin/sh/tests/builtins/printf1.0 @@ -1,2 +1 @@ - [ "$(printf '%c\0%s%d' x '\' 010 | tr '\0' Z)" = 'xZ\8' ] diff --git a/bin/sh/tests/builtins/printf2.0 b/bin/sh/tests/builtins/printf2.0 --- a/bin/sh/tests/builtins/printf2.0 +++ b/bin/sh/tests/builtins/printf2.0 @@ -1,2 +1 @@ - [ "$(printf '%cZ%s%d' x '\' 010)" = 'xZ\8' ] diff --git a/bin/sh/tests/builtins/printf3.0 b/bin/sh/tests/builtins/printf3.0 --- a/bin/sh/tests/builtins/printf3.0 +++ b/bin/sh/tests/builtins/printf3.0 @@ -1,4 +1,3 @@ - set -e v=$(! printf "%d" @wrong 2>/dev/null) [ "$v" = "0" ] diff --git a/bin/sh/tests/builtins/printf4.0 b/bin/sh/tests/builtins/printf4.0 --- a/bin/sh/tests/builtins/printf4.0 +++ b/bin/sh/tests/builtins/printf4.0 @@ -1,4 +1,3 @@ - set -e v=$(! printf "%d" 4wrong 2>/dev/null) [ "$v" = "4" ] diff --git a/bin/sh/tests/builtins/read10.0 b/bin/sh/tests/builtins/read10.0 --- a/bin/sh/tests/builtins/read10.0 +++ b/bin/sh/tests/builtins/read10.0 @@ -1,4 +1,3 @@ - set -e v=original_value diff --git a/bin/sh/tests/builtins/read11.0 b/bin/sh/tests/builtins/read11.0 --- a/bin/sh/tests/builtins/read11.0 +++ b/bin/sh/tests/builtins/read11.0 @@ -1,4 +1,3 @@ - set -e T=$(mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX) diff --git a/bin/sh/tests/builtins/read2.0 b/bin/sh/tests/builtins/read2.0 --- a/bin/sh/tests/builtins/read2.0 +++ b/bin/sh/tests/builtins/read2.0 @@ -1,4 +1,3 @@ - set -e { echo 1 diff --git a/bin/sh/tests/builtins/read3.0 b/bin/sh/tests/builtins/read3.0 --- a/bin/sh/tests/builtins/read3.0 +++ b/bin/sh/tests/builtins/read3.0 @@ -1,4 +1,3 @@ - printf '%s\n' 'a\ b c' | { read a b; printf '%s\n' "x${a}x${b}x"; } printf '%s\n' 'a b\ c' | { read a b; printf '%s\n' "x${a}x${b}x"; } printf '%s\n' 'a\:b:c' | { IFS=: read a b; printf '%s\n' "x${a}x${b}x"; } diff --git a/bin/sh/tests/builtins/read4.0 b/bin/sh/tests/builtins/read4.0 --- a/bin/sh/tests/builtins/read4.0 +++ b/bin/sh/tests/builtins/read4.0 @@ -1,4 +1,3 @@ - printf '%s\n' '\a\ b c' | { read a b; printf '%s\n' "x${a}x${b}x"; } printf '%s\n' '\a b\ c' | { read a b; printf '%s\n' "x${a}x${b}x"; } printf '%s\n' '\a\:b:c' | { IFS=: read a b; printf '%s\n' "x${a}x${b}x"; } diff --git a/bin/sh/tests/builtins/read5.0 b/bin/sh/tests/builtins/read5.0 --- a/bin/sh/tests/builtins/read5.0 +++ b/bin/sh/tests/builtins/read5.0 @@ -1,4 +1,3 @@ - unset LC_ALL LC_CTYPE=en_US.ISO8859-1 export LC_CTYPE diff --git a/bin/sh/tests/builtins/read6.0 b/bin/sh/tests/builtins/read6.0 --- a/bin/sh/tests/builtins/read6.0 +++ b/bin/sh/tests/builtins/read6.0 @@ -1,4 +1,3 @@ - : | read x r=$? [ "$r" = 1 ] diff --git a/bin/sh/tests/builtins/read7.0 b/bin/sh/tests/builtins/read7.0 --- a/bin/sh/tests/builtins/read7.0 +++ b/bin/sh/tests/builtins/read7.0 @@ -1,4 +1,3 @@ - { errmsg=`read x <&- 2>&1 >&3`; } 3>&1 r=$? [ "$r" -ge 2 ] && [ "$r" -le 128 ] && [ -n "$errmsg" ] diff --git a/bin/sh/tests/builtins/read8.0 b/bin/sh/tests/builtins/read8.0 --- a/bin/sh/tests/builtins/read8.0 +++ b/bin/sh/tests/builtins/read8.0 @@ -1,4 +1,3 @@ - read a b c <<\EOF \ A\ diff --git a/bin/sh/tests/builtins/read9.0 b/bin/sh/tests/builtins/read9.0 --- a/bin/sh/tests/builtins/read9.0 +++ b/bin/sh/tests/builtins/read9.0 @@ -1,4 +1,3 @@ - empty='' read a b c <&2 diff --git a/bin/sh/tests/builtins/return5.0 b/bin/sh/tests/builtins/return5.0 --- a/bin/sh/tests/builtins/return5.0 +++ b/bin/sh/tests/builtins/return5.0 @@ -1,4 +1,3 @@ - if [ "$1" != nested ]; then f() { set -- nested diff --git a/bin/sh/tests/builtins/return6.4 b/bin/sh/tests/builtins/return6.4 --- a/bin/sh/tests/builtins/return6.4 +++ b/bin/sh/tests/builtins/return6.4 @@ -1,2 +1 @@ - while return 4; do exit 3; done diff --git a/bin/sh/tests/builtins/return7.4 b/bin/sh/tests/builtins/return7.4 --- a/bin/sh/tests/builtins/return7.4 +++ b/bin/sh/tests/builtins/return7.4 @@ -1,4 +1,3 @@ - f() { while return 4; do exit 3; done } diff --git a/bin/sh/tests/builtins/return8.0 b/bin/sh/tests/builtins/return8.0 --- a/bin/sh/tests/builtins/return8.0 +++ b/bin/sh/tests/builtins/return8.0 @@ -1,4 +1,3 @@ - if [ "$1" = nested ]; then return 17 fi diff --git a/bin/sh/tests/builtins/set1.0 b/bin/sh/tests/builtins/set1.0 --- a/bin/sh/tests/builtins/set1.0 +++ b/bin/sh/tests/builtins/set1.0 @@ -1,4 +1,3 @@ - set +C set +f set -e diff --git a/bin/sh/tests/builtins/set2.0 b/bin/sh/tests/builtins/set2.0 --- a/bin/sh/tests/builtins/set2.0 +++ b/bin/sh/tests/builtins/set2.0 @@ -1,2 +1 @@ - ! env @badness=1 ${SH} -c 'v=`set`; eval "$v"' 2>&1 | grep @badness diff --git a/bin/sh/tests/builtins/set3.0 b/bin/sh/tests/builtins/set3.0 --- a/bin/sh/tests/builtins/set3.0 +++ b/bin/sh/tests/builtins/set3.0 @@ -1,3 +1,2 @@ - settings1=$(set +o) && set -o nolog && settings2=$(set +o) && [ "$settings1" != "$settings2" ] diff --git a/bin/sh/tests/builtins/trap1.0 b/bin/sh/tests/builtins/trap1.0 --- a/bin/sh/tests/builtins/trap1.0 +++ b/bin/sh/tests/builtins/trap1.0 @@ -1,4 +1,3 @@ - test "$(trap 'echo trapped' EXIT; :)" = trapped || exit 1 test "$(trap 'echo trapped' EXIT; /usr/bin/true)" = trapped || exit 1 diff --git a/bin/sh/tests/builtins/trap10.0 b/bin/sh/tests/builtins/trap10.0 --- a/bin/sh/tests/builtins/trap10.0 +++ b/bin/sh/tests/builtins/trap10.0 @@ -1,4 +1,3 @@ - # Check that the return statement will not break the EXIT trap, ie. all # trap commands are executed before the script exits. diff --git a/bin/sh/tests/builtins/trap11.0 b/bin/sh/tests/builtins/trap11.0 --- a/bin/sh/tests/builtins/trap11.0 +++ b/bin/sh/tests/builtins/trap11.0 @@ -1,4 +1,3 @@ - # Check that the return statement will not break the USR1 trap, ie. all # trap commands are executed before the script resumes. diff --git a/bin/sh/tests/builtins/trap12.0 b/bin/sh/tests/builtins/trap12.0 --- a/bin/sh/tests/builtins/trap12.0 +++ b/bin/sh/tests/builtins/trap12.0 @@ -1,4 +1,3 @@ - f() { trap 'return 42' USR1 kill -USR1 $$ diff --git a/bin/sh/tests/builtins/trap13.0 b/bin/sh/tests/builtins/trap13.0 --- a/bin/sh/tests/builtins/trap13.0 +++ b/bin/sh/tests/builtins/trap13.0 @@ -1,4 +1,3 @@ - { trap 'exit 0' INT ${SH} -c 'kill -INT $PPID' diff --git a/bin/sh/tests/builtins/trap14.0 b/bin/sh/tests/builtins/trap14.0 --- a/bin/sh/tests/builtins/trap14.0 +++ b/bin/sh/tests/builtins/trap14.0 @@ -1,4 +1,3 @@ - { trap - INT ${SH} -c 'kill -INT $PPID' & diff --git a/bin/sh/tests/builtins/trap15.0 b/bin/sh/tests/builtins/trap15.0 --- a/bin/sh/tests/builtins/trap15.0 +++ b/bin/sh/tests/builtins/trap15.0 @@ -1,4 +1,3 @@ - (${SH} -c 'term(){ exit 5;}; trap term TERM; kill -TERM $$') & wait >/dev/null 2>&1 $! [ $? -eq 5 ] diff --git a/bin/sh/tests/builtins/trap16.0 b/bin/sh/tests/builtins/trap16.0 --- a/bin/sh/tests/builtins/trap16.0 +++ b/bin/sh/tests/builtins/trap16.0 @@ -1,4 +1,3 @@ - traps=$(${SH} -c 'trap "echo bad" 0; trap - 0; trap') [ -z "$traps" ] || exit 1 traps=$(${SH} -c 'trap "echo bad" 0; trap "" 0; trap') diff --git a/bin/sh/tests/builtins/trap3.0 b/bin/sh/tests/builtins/trap3.0 --- a/bin/sh/tests/builtins/trap3.0 +++ b/bin/sh/tests/builtins/trap3.0 @@ -1,4 +1,3 @@ - { trap '' garbage && exit 3 trap - garbage && exit 3 diff --git a/bin/sh/tests/builtins/trap4.0 b/bin/sh/tests/builtins/trap4.0 --- a/bin/sh/tests/builtins/trap4.0 +++ b/bin/sh/tests/builtins/trap4.0 @@ -1,4 +1,3 @@ - T=$(mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX) trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/builtins/trap5.0 b/bin/sh/tests/builtins/trap5.0 --- a/bin/sh/tests/builtins/trap5.0 +++ b/bin/sh/tests/builtins/trap5.0 @@ -1,4 +1,3 @@ - set -e trap - USR1 initial=$(trap) diff --git a/bin/sh/tests/builtins/trap6.0 b/bin/sh/tests/builtins/trap6.0 --- a/bin/sh/tests/builtins/trap6.0 +++ b/bin/sh/tests/builtins/trap6.0 @@ -1,4 +1,3 @@ - v=$( ${SH} -c 'trap "echo ok; exit" USR1; kill -USR1 $$' & # Suppress possible message about exit on signal diff --git a/bin/sh/tests/builtins/trap7.0 b/bin/sh/tests/builtins/trap7.0 --- a/bin/sh/tests/builtins/trap7.0 +++ b/bin/sh/tests/builtins/trap7.0 @@ -1,2 +1 @@ - [ "$(trap 'echo trapped' EXIT)" = trapped ] diff --git a/bin/sh/tests/builtins/trap8.0 b/bin/sh/tests/builtins/trap8.0 --- a/bin/sh/tests/builtins/trap8.0 +++ b/bin/sh/tests/builtins/trap8.0 @@ -1,4 +1,3 @@ - # I am not sure if POSIX requires the shell to continue processing # further trap names in the same trap command after an invalid one. diff --git a/bin/sh/tests/builtins/trap9.0 b/bin/sh/tests/builtins/trap9.0 --- a/bin/sh/tests/builtins/trap9.0 +++ b/bin/sh/tests/builtins/trap9.0 @@ -1,2 +1 @@ - test "$(trap 'printf trap; echo ped' EXIT; f() { :; }; f)" = trapped || exit 1 diff --git a/bin/sh/tests/builtins/type2.0 b/bin/sh/tests/builtins/type2.0 --- a/bin/sh/tests/builtins/type2.0 +++ b/bin/sh/tests/builtins/type2.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/builtins/type3.0 b/bin/sh/tests/builtins/type3.0 --- a/bin/sh/tests/builtins/type3.0 +++ b/bin/sh/tests/builtins/type3.0 @@ -1,2 +1 @@ - [ "$(type type)" = "$(type -- type)" ] diff --git a/bin/sh/tests/builtins/type4.0 b/bin/sh/tests/builtins/type4.0 --- a/bin/sh/tests/builtins/type4.0 +++ b/bin/sh/tests/builtins/type4.0 @@ -1,4 +1,3 @@ - r=`cd /bin && PATH=. type ls` case $r in */bin/ls*|*/bin/./ls*) ;; diff --git a/bin/sh/tests/builtins/wait1.0 b/bin/sh/tests/builtins/wait1.0 --- a/bin/sh/tests/builtins/wait1.0 +++ b/bin/sh/tests/builtins/wait1.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/wait2.0 b/bin/sh/tests/builtins/wait2.0 --- a/bin/sh/tests/builtins/wait2.0 +++ b/bin/sh/tests/builtins/wait2.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/wait3.0 b/bin/sh/tests/builtins/wait3.0 --- a/bin/sh/tests/builtins/wait3.0 +++ b/bin/sh/tests/builtins/wait3.0 @@ -1,4 +1,3 @@ - failures= failure() { echo "Error at line $1" >&2 diff --git a/bin/sh/tests/builtins/wait4.0 b/bin/sh/tests/builtins/wait4.0 --- a/bin/sh/tests/builtins/wait4.0 +++ b/bin/sh/tests/builtins/wait4.0 @@ -1,4 +1,3 @@ - T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/builtins/wait5.0 b/bin/sh/tests/builtins/wait5.0 --- a/bin/sh/tests/builtins/wait5.0 +++ b/bin/sh/tests/builtins/wait5.0 @@ -1,4 +1,3 @@ - T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/builtins/wait6.0 b/bin/sh/tests/builtins/wait6.0 --- a/bin/sh/tests/builtins/wait6.0 +++ b/bin/sh/tests/builtins/wait6.0 @@ -1,2 +1 @@ - wait -- diff --git a/bin/sh/tests/builtins/wait7.0 b/bin/sh/tests/builtins/wait7.0 --- a/bin/sh/tests/builtins/wait7.0 +++ b/bin/sh/tests/builtins/wait7.0 @@ -1,3 +1,2 @@ - : & wait -- $! diff --git a/bin/sh/tests/builtins/wait8.0 b/bin/sh/tests/builtins/wait8.0 --- a/bin/sh/tests/builtins/wait8.0 +++ b/bin/sh/tests/builtins/wait8.0 @@ -1,4 +1,3 @@ - exit 44 & p44=$! exit 45 & p45=$! exit 7 & p7=$! diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile --- a/bin/sh/tests/errors/Makefile +++ b/bin/sh/tests/errors/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/errors/assignment-error2.0 b/bin/sh/tests/errors/assignment-error2.0 --- a/bin/sh/tests/errors/assignment-error2.0 +++ b/bin/sh/tests/errors/assignment-error2.0 @@ -1,4 +1,3 @@ - set -e HOME=/ readonly HOME diff --git a/bin/sh/tests/errors/backquote-error1.0 b/bin/sh/tests/errors/backquote-error1.0 --- a/bin/sh/tests/errors/backquote-error1.0 +++ b/bin/sh/tests/errors/backquote-error1.0 @@ -1,3 +1,2 @@ - echo 'echo `for` echo ".BAD"CODE.' | ${SH} +m -i 2>&1 | grep -q BADCODE && exit 1 exit 0 diff --git a/bin/sh/tests/errors/backquote-error2.0 b/bin/sh/tests/errors/backquote-error2.0 --- a/bin/sh/tests/errors/backquote-error2.0 +++ b/bin/sh/tests/errors/backquote-error2.0 @@ -1,4 +1,3 @@ - ${SH} -c 'echo `echo .BA"DCODE.` echo ".BAD"CODE.' 2>&1 | grep -q BADCODE && exit 1 echo '`"`' | ${SH} -n 2>/dev/null && exit 1 diff --git a/bin/sh/tests/errors/bad-keyword1.0 b/bin/sh/tests/errors/bad-keyword1.0 --- a/bin/sh/tests/errors/bad-keyword1.0 +++ b/bin/sh/tests/errors/bad-keyword1.0 @@ -1,3 +1,2 @@ - echo ':; fi' | ${SH} -n 2>/dev/null && exit 1 exit 0 diff --git a/bin/sh/tests/errors/bad-parm-exp7.0 b/bin/sh/tests/errors/bad-parm-exp7.0 --- a/bin/sh/tests/errors/bad-parm-exp7.0 +++ b/bin/sh/tests/errors/bad-parm-exp7.0 @@ -1,3 +1,2 @@ - v=1 eval ": $(printf '${v-${\372}}')" diff --git a/bin/sh/tests/errors/bad-parm-exp8.0 b/bin/sh/tests/errors/bad-parm-exp8.0 --- a/bin/sh/tests/errors/bad-parm-exp8.0 +++ b/bin/sh/tests/errors/bad-parm-exp8.0 @@ -1,3 +1,2 @@ - v=1 eval ": $(printf '${v-${w\372}}')" diff --git a/bin/sh/tests/errors/redirection-error2.2 b/bin/sh/tests/errors/redirection-error2.2 --- a/bin/sh/tests/errors/redirection-error2.2 +++ b/bin/sh/tests/errors/redirection-error2.2 @@ -1,3 +1,2 @@ - # sh should fail gracefully on this bad redirect ${SH} -c 'echo 1 >&$a' 2>/dev/null diff --git a/bin/sh/tests/errors/redirection-error7.0 b/bin/sh/tests/errors/redirection-error7.0 --- a/bin/sh/tests/errors/redirection-error7.0 +++ b/bin/sh/tests/errors/redirection-error7.0 @@ -1,4 +1,3 @@ - ! dummy=$( exec 3>&1 >&2 2>&3 ulimit -n 9 diff --git a/bin/sh/tests/errors/redirection-error8.0 b/bin/sh/tests/errors/redirection-error8.0 --- a/bin/sh/tests/errors/redirection-error8.0 +++ b/bin/sh/tests/errors/redirection-error8.0 @@ -1,4 +1,3 @@ - $SH -c '{ { :; } /dev/null || kill -INT $$; echo continued' r=$? [ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ] diff --git a/bin/sh/tests/errors/script-error1.0 b/bin/sh/tests/errors/script-error1.0 --- a/bin/sh/tests/errors/script-error1.0 +++ b/bin/sh/tests/errors/script-error1.0 @@ -1,4 +1,3 @@ - { stderr=$(${SH} /var/empty/nosuchscript 2>&1 >&3); } 3>&1 r=$? [ -n "$stderr" ] && [ "$r" = 127 ] diff --git a/bin/sh/tests/errors/write-error1.0 b/bin/sh/tests/errors/write-error1.0 --- a/bin/sh/tests/errors/write-error1.0 +++ b/bin/sh/tests/errors/write-error1.0 @@ -1,2 +1 @@ - ! echo >&- 2>/dev/null diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile --- a/bin/sh/tests/execution/Makefile +++ b/bin/sh/tests/execution/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/execution/bg1.0 b/bin/sh/tests/execution/bg1.0 --- a/bin/sh/tests/execution/bg1.0 +++ b/bin/sh/tests/execution/bg1.0 @@ -1,2 +1 @@ - : `false` & diff --git a/bin/sh/tests/execution/bg11.0 b/bin/sh/tests/execution/bg11.0 --- a/bin/sh/tests/execution/bg11.0 +++ b/bin/sh/tests/execution/bg11.0 @@ -1,4 +1,3 @@ - T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/execution/bg12.0 b/bin/sh/tests/execution/bg12.0 --- a/bin/sh/tests/execution/bg12.0 +++ b/bin/sh/tests/execution/bg12.0 @@ -1,4 +1,3 @@ - T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/execution/bg13.0 b/bin/sh/tests/execution/bg13.0 --- a/bin/sh/tests/execution/bg13.0 +++ b/bin/sh/tests/execution/bg13.0 @@ -1,4 +1,3 @@ - T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXXXX` trap 'rm -rf $T' 0 cd $T || exit 3 diff --git a/bin/sh/tests/execution/bg2.0 b/bin/sh/tests/execution/bg2.0 --- a/bin/sh/tests/execution/bg2.0 +++ b/bin/sh/tests/execution/bg2.0 @@ -1,4 +1,3 @@ - f() { return 42; } f : | : & diff --git a/bin/sh/tests/execution/bg3.0 b/bin/sh/tests/execution/bg3.0 --- a/bin/sh/tests/execution/bg3.0 +++ b/bin/sh/tests/execution/bg3.0 @@ -1,4 +1,3 @@ - f() { return 42; } f (:) & diff --git a/bin/sh/tests/execution/bg4.0 b/bin/sh/tests/execution/bg4.0 --- a/bin/sh/tests/execution/bg4.0 +++ b/bin/sh/tests/execution/bg4.0 @@ -1,4 +1,3 @@ - x='' : ${x:=1} & wait diff --git a/bin/sh/tests/execution/env1.0 b/bin/sh/tests/execution/env1.0 --- a/bin/sh/tests/execution/env1.0 +++ b/bin/sh/tests/execution/env1.0 @@ -1,4 +1,3 @@ - unset somestrangevar export somestrangevar [ "`$SH -c 'echo ${somestrangevar-unset}'`" = unset ] diff --git a/bin/sh/tests/execution/fork1.0 b/bin/sh/tests/execution/fork1.0 --- a/bin/sh/tests/execution/fork1.0 +++ b/bin/sh/tests/execution/fork1.0 @@ -1,4 +1,3 @@ - shname=${SH%% *} shname=${shname##*/} diff --git a/bin/sh/tests/execution/fork2.0 b/bin/sh/tests/execution/fork2.0 --- a/bin/sh/tests/execution/fork2.0 +++ b/bin/sh/tests/execution/fork2.0 @@ -1,4 +1,3 @@ - result=$(${SH} -c '(/bin/sleep 1)& sleep 0.1; ps -p $! -o comm=; kill $!') test "$result" = sleep || exit 1 diff --git a/bin/sh/tests/execution/fork3.0 b/bin/sh/tests/execution/fork3.0 --- a/bin/sh/tests/execution/fork3.0 +++ b/bin/sh/tests/execution/fork3.0 @@ -1,3 +1,2 @@ - result=$(${SH} -c 'f() { ps -p $$ -o comm=; }; f') test "$result" = "ps" diff --git a/bin/sh/tests/execution/func1.0 b/bin/sh/tests/execution/func1.0 --- a/bin/sh/tests/execution/func1.0 +++ b/bin/sh/tests/execution/func1.0 @@ -1,3 +1,2 @@ - MALLOC_OPTIONS=J ${SH} -c 'g() { g() { :; }; :; }; g' && MALLOC_OPTIONS=J ${SH} -c 'g() { unset -f g; :; }; g' diff --git a/bin/sh/tests/execution/func3.0 b/bin/sh/tests/execution/func3.0 --- a/bin/sh/tests/execution/func3.0 +++ b/bin/sh/tests/execution/func3.0 @@ -1,4 +1,3 @@ - # This may fail when parsing or when defining the function, or the definition # may silently do nothing. In no event may the function be executed. diff --git a/bin/sh/tests/execution/hash1.0 b/bin/sh/tests/execution/hash1.0 --- a/bin/sh/tests/execution/hash1.0 +++ b/bin/sh/tests/execution/hash1.0 @@ -1,4 +1,3 @@ - T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit trap 'rm -rf "${T}"' 0 PATH=$T:$PATH diff --git a/bin/sh/tests/execution/int-cmd1.0 b/bin/sh/tests/execution/int-cmd1.0 --- a/bin/sh/tests/execution/int-cmd1.0 +++ b/bin/sh/tests/execution/int-cmd1.0 @@ -1,2 +1 @@ - ! echo echo bad | ENV= $SH -ic 'fi' 2>/dev/null diff --git a/bin/sh/tests/execution/not1.0 b/bin/sh/tests/execution/not1.0 --- a/bin/sh/tests/execution/not1.0 +++ b/bin/sh/tests/execution/not1.0 @@ -1,3 +1,2 @@ - f() { ! return $1; } f 0 && ! f 1 diff --git a/bin/sh/tests/execution/not2.0 b/bin/sh/tests/execution/not2.0 --- a/bin/sh/tests/execution/not2.0 +++ b/bin/sh/tests/execution/not2.0 @@ -1,4 +1,3 @@ - while :; do ! break exit 3 diff --git a/bin/sh/tests/execution/pipefail1.0 b/bin/sh/tests/execution/pipefail1.0 --- a/bin/sh/tests/execution/pipefail1.0 +++ b/bin/sh/tests/execution/pipefail1.0 @@ -1,3 +1,2 @@ - set -o pipefail : && : | : && : | : | : && : | : | : | : diff --git a/bin/sh/tests/execution/pipefail2.42 b/bin/sh/tests/execution/pipefail2.42 --- a/bin/sh/tests/execution/pipefail2.42 +++ b/bin/sh/tests/execution/pipefail2.42 @@ -1,3 +1,2 @@ - set -o pipefail (exit 42) | : diff --git a/bin/sh/tests/execution/pipefail3.42 b/bin/sh/tests/execution/pipefail3.42 --- a/bin/sh/tests/execution/pipefail3.42 +++ b/bin/sh/tests/execution/pipefail3.42 @@ -1,3 +1,2 @@ - set -o pipefail : | (exit 42) diff --git a/bin/sh/tests/execution/pipefail4.42 b/bin/sh/tests/execution/pipefail4.42 --- a/bin/sh/tests/execution/pipefail4.42 +++ b/bin/sh/tests/execution/pipefail4.42 @@ -1,3 +1,2 @@ - set -o pipefail (exit 43) | (exit 42) diff --git a/bin/sh/tests/execution/pipefail5.42 b/bin/sh/tests/execution/pipefail5.42 --- a/bin/sh/tests/execution/pipefail5.42 +++ b/bin/sh/tests/execution/pipefail5.42 @@ -1,4 +1,3 @@ - set -o pipefail (exit 42) | : & wait %+ diff --git a/bin/sh/tests/execution/pipefail6.42 b/bin/sh/tests/execution/pipefail6.42 --- a/bin/sh/tests/execution/pipefail6.42 +++ b/bin/sh/tests/execution/pipefail6.42 @@ -1,4 +1,3 @@ - set -o pipefail (exit 42) | : & set +o pipefail diff --git a/bin/sh/tests/execution/pipefail7.0 b/bin/sh/tests/execution/pipefail7.0 --- a/bin/sh/tests/execution/pipefail7.0 +++ b/bin/sh/tests/execution/pipefail7.0 @@ -1,4 +1,3 @@ - (exit 42) | : & set -o pipefail wait %+ diff --git a/bin/sh/tests/execution/redir3.0 b/bin/sh/tests/execution/redir3.0 --- a/bin/sh/tests/execution/redir3.0 +++ b/bin/sh/tests/execution/redir3.0 @@ -1,2 +1 @@ - 3>&- 3>&- diff --git a/bin/sh/tests/execution/redir4.0 b/bin/sh/tests/execution/redir4.0 --- a/bin/sh/tests/execution/redir4.0 +++ b/bin/sh/tests/execution/redir4.0 @@ -1,3 +1,2 @@ - { echo bad 0>&3; } 2>/dev/null 3>/dev/null 3>&- exit 0 diff --git a/bin/sh/tests/execution/redir5.0 b/bin/sh/tests/execution/redir5.0 --- a/bin/sh/tests/execution/redir5.0 +++ b/bin/sh/tests/execution/redir5.0 @@ -1,2 +1 @@ - { (echo bad) >/dev/null; } &1 >/dev/null) [ $? -ne 0 ] && [ -n "$v" ] diff --git a/bin/sh/tests/execution/set-n4.0 b/bin/sh/tests/execution/set-n4.0 --- a/bin/sh/tests/execution/set-n4.0 +++ b/bin/sh/tests/execution/set-n4.0 @@ -1,2 +1 @@ - $SH -nc 'echo bad' diff --git a/bin/sh/tests/execution/set-x1.0 b/bin/sh/tests/execution/set-x1.0 --- a/bin/sh/tests/execution/set-x1.0 +++ b/bin/sh/tests/execution/set-x1.0 @@ -1,4 +1,3 @@ - key='must_contain_this' { r=`set -x; { : "$key"; } 2>&1 >/dev/null`; } 2>/dev/null case $r in diff --git a/bin/sh/tests/execution/set-x2.0 b/bin/sh/tests/execution/set-x2.0 --- a/bin/sh/tests/execution/set-x2.0 +++ b/bin/sh/tests/execution/set-x2.0 @@ -1,4 +1,3 @@ - key='must contain this' PS4="$key+ " { r=`set -x; { :; } 2>&1 >/dev/null`; } 2>/dev/null diff --git a/bin/sh/tests/execution/set-x3.0 b/bin/sh/tests/execution/set-x3.0 --- a/bin/sh/tests/execution/set-x3.0 +++ b/bin/sh/tests/execution/set-x3.0 @@ -1,4 +1,3 @@ - key='must contain this' PS4='$key+ ' { r=`set -x; { :; } 2>&1 >/dev/null`; } 2>/dev/null diff --git a/bin/sh/tests/execution/set-x4.0 b/bin/sh/tests/execution/set-x4.0 --- a/bin/sh/tests/execution/set-x4.0 +++ b/bin/sh/tests/execution/set-x4.0 @@ -1,4 +1,3 @@ - key=`printf '\r\t\001\200\300'` r=`{ set -x; : "$key"; } 2>&1 >/dev/null` case $r in diff --git a/bin/sh/tests/execution/shellproc1.0 b/bin/sh/tests/execution/shellproc1.0 --- a/bin/sh/tests/execution/shellproc1.0 +++ b/bin/sh/tests/execution/shellproc1.0 @@ -1,4 +1,3 @@ - T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit trap 'rm -rf "${T}"' 0 cat <"$T/testshellproc" diff --git a/bin/sh/tests/execution/shellproc6.0 b/bin/sh/tests/execution/shellproc6.0 --- a/bin/sh/tests/execution/shellproc6.0 +++ b/bin/sh/tests/execution/shellproc6.0 @@ -1,4 +1,3 @@ - T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit trap 'rm -rf "${T}"' 0 printf 'printf "this "\necho is a test\nexit\n\0' >"$T/testshellproc" diff --git a/bin/sh/tests/execution/subshell1.0 b/bin/sh/tests/execution/subshell1.0 --- a/bin/sh/tests/execution/subshell1.0 +++ b/bin/sh/tests/execution/subshell1.0 @@ -1,4 +1,3 @@ - (eval "cd / v=$(printf %0100000d 1) echo \${#v}") diff --git a/bin/sh/tests/execution/subshell2.0 b/bin/sh/tests/execution/subshell2.0 --- a/bin/sh/tests/execution/subshell2.0 +++ b/bin/sh/tests/execution/subshell2.0 @@ -1,4 +1,3 @@ - f() { x=2 } diff --git a/bin/sh/tests/execution/subshell3.0 b/bin/sh/tests/execution/subshell3.0 --- a/bin/sh/tests/execution/subshell3.0 +++ b/bin/sh/tests/execution/subshell3.0 @@ -1,3 +1,2 @@ - (false; exit) && exit 3 exit 0 diff --git a/bin/sh/tests/execution/subshell4.0 b/bin/sh/tests/execution/subshell4.0 --- a/bin/sh/tests/execution/subshell4.0 +++ b/bin/sh/tests/execution/subshell4.0 @@ -1,2 +1 @@ - (eval "set v=1"; false) && echo bad; : diff --git a/bin/sh/tests/execution/unknown1.0 b/bin/sh/tests/execution/unknown1.0 --- a/bin/sh/tests/execution/unknown1.0 +++ b/bin/sh/tests/execution/unknown1.0 @@ -1,4 +1,3 @@ - nosuchtool 2>/dev/null [ $? -ne 127 ] && exit 1 /var/empty/nosuchtool 2>/dev/null diff --git a/bin/sh/tests/execution/unknown2.0 b/bin/sh/tests/execution/unknown2.0 --- a/bin/sh/tests/execution/unknown2.0 +++ b/bin/sh/tests/execution/unknown2.0 @@ -1,4 +1,3 @@ - { : $(/var/empty/nosuchtool) : $(:) diff --git a/bin/sh/tests/execution/var-assign1.0 b/bin/sh/tests/execution/var-assign1.0 --- a/bin/sh/tests/execution/var-assign1.0 +++ b/bin/sh/tests/execution/var-assign1.0 @@ -1,2 +1 @@ - [ "$(HOME=/etc HOME=/ cd && pwd)" = / ] diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile --- a/bin/sh/tests/expansion/Makefile +++ b/bin/sh/tests/expansion/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/expansion/arith1.0 b/bin/sh/tests/expansion/arith1.0 --- a/bin/sh/tests/expansion/arith1.0 +++ b/bin/sh/tests/expansion/arith1.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith10.0 b/bin/sh/tests/expansion/arith10.0 --- a/bin/sh/tests/expansion/arith10.0 +++ b/bin/sh/tests/expansion/arith10.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith12.0 b/bin/sh/tests/expansion/arith12.0 --- a/bin/sh/tests/expansion/arith12.0 +++ b/bin/sh/tests/expansion/arith12.0 @@ -1,3 +1,2 @@ - _x=4 y_=5 z_z=6 [ "$((_x*100+y_*10+z_z))" = 456 ] diff --git a/bin/sh/tests/expansion/arith15.0 b/bin/sh/tests/expansion/arith15.0 --- a/bin/sh/tests/expansion/arith15.0 +++ b/bin/sh/tests/expansion/arith15.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith16.0 b/bin/sh/tests/expansion/arith16.0 --- a/bin/sh/tests/expansion/arith16.0 +++ b/bin/sh/tests/expansion/arith16.0 @@ -1,4 +1,3 @@ - failures=0 for x in \ diff --git a/bin/sh/tests/expansion/arith17.0 b/bin/sh/tests/expansion/arith17.0 --- a/bin/sh/tests/expansion/arith17.0 +++ b/bin/sh/tests/expansion/arith17.0 @@ -1,2 +1 @@ - [ $((9223372036854775809)) -gt 0 ] diff --git a/bin/sh/tests/expansion/arith2.0 b/bin/sh/tests/expansion/arith2.0 --- a/bin/sh/tests/expansion/arith2.0 +++ b/bin/sh/tests/expansion/arith2.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith3.0 b/bin/sh/tests/expansion/arith3.0 --- a/bin/sh/tests/expansion/arith3.0 +++ b/bin/sh/tests/expansion/arith3.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith4.0 b/bin/sh/tests/expansion/arith4.0 --- a/bin/sh/tests/expansion/arith4.0 +++ b/bin/sh/tests/expansion/arith4.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith5.0 b/bin/sh/tests/expansion/arith5.0 --- a/bin/sh/tests/expansion/arith5.0 +++ b/bin/sh/tests/expansion/arith5.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/arith6.0 b/bin/sh/tests/expansion/arith6.0 --- a/bin/sh/tests/expansion/arith6.0 +++ b/bin/sh/tests/expansion/arith6.0 @@ -1,4 +1,3 @@ - v1=1\ +\ 1 v2=D v3=C123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 diff --git a/bin/sh/tests/expansion/arith7.0 b/bin/sh/tests/expansion/arith7.0 --- a/bin/sh/tests/expansion/arith7.0 +++ b/bin/sh/tests/expansion/arith7.0 @@ -1,4 +1,3 @@ - v=1+ v=$v$v$v$v v=$v$v$v$v diff --git a/bin/sh/tests/expansion/arith8.0 b/bin/sh/tests/expansion/arith8.0 --- a/bin/sh/tests/expansion/arith8.0 +++ b/bin/sh/tests/expansion/arith8.0 @@ -1,3 +1,2 @@ - v=$( (eval ': $((08))') 2>&1 >/dev/null) [ $? -ne 0 ] && [ -n "$v" ] diff --git a/bin/sh/tests/expansion/arith9.0 b/bin/sh/tests/expansion/arith9.0 --- a/bin/sh/tests/expansion/arith9.0 +++ b/bin/sh/tests/expansion/arith9.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/assign1.0 b/bin/sh/tests/expansion/assign1.0 --- a/bin/sh/tests/expansion/assign1.0 +++ b/bin/sh/tests/expansion/assign1.0 @@ -1,4 +1,3 @@ - e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}' h='##' failures='' diff --git a/bin/sh/tests/expansion/cmdsubst1.0 b/bin/sh/tests/expansion/cmdsubst1.0 --- a/bin/sh/tests/expansion/cmdsubst1.0 +++ b/bin/sh/tests/expansion/cmdsubst1.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/cmdsubst10.0 b/bin/sh/tests/expansion/cmdsubst10.0 --- a/bin/sh/tests/expansion/cmdsubst10.0 +++ b/bin/sh/tests/expansion/cmdsubst10.0 @@ -1,4 +1,3 @@ - a1=$(alias) : $(alias testalias=abcd) a2=$(alias) diff --git a/bin/sh/tests/expansion/cmdsubst11.0 b/bin/sh/tests/expansion/cmdsubst11.0 --- a/bin/sh/tests/expansion/cmdsubst11.0 +++ b/bin/sh/tests/expansion/cmdsubst11.0 @@ -1,4 +1,3 @@ - # Not required by POSIX but useful for efficiency. [ $$ = $(eval '${SH} -c echo\ \$PPID') ] diff --git a/bin/sh/tests/expansion/cmdsubst12.0 b/bin/sh/tests/expansion/cmdsubst12.0 --- a/bin/sh/tests/expansion/cmdsubst12.0 +++ b/bin/sh/tests/expansion/cmdsubst12.0 @@ -1,4 +1,3 @@ - f() { echo x$(printf foo >&2)y } diff --git a/bin/sh/tests/expansion/cmdsubst13.0 b/bin/sh/tests/expansion/cmdsubst13.0 --- a/bin/sh/tests/expansion/cmdsubst13.0 +++ b/bin/sh/tests/expansion/cmdsubst13.0 @@ -1,4 +1,3 @@ - x=1 y=2 [ "$( case $((x+=1)) in diff --git a/bin/sh/tests/expansion/cmdsubst14.0 b/bin/sh/tests/expansion/cmdsubst14.0 --- a/bin/sh/tests/expansion/cmdsubst14.0 +++ b/bin/sh/tests/expansion/cmdsubst14.0 @@ -1,4 +1,3 @@ - ! v=`false ` diff --git a/bin/sh/tests/expansion/cmdsubst15.0 b/bin/sh/tests/expansion/cmdsubst15.0 --- a/bin/sh/tests/expansion/cmdsubst15.0 +++ b/bin/sh/tests/expansion/cmdsubst15.0 @@ -1,4 +1,3 @@ - ! v=`false; ` diff --git a/bin/sh/tests/expansion/cmdsubst16.0 b/bin/sh/tests/expansion/cmdsubst16.0 --- a/bin/sh/tests/expansion/cmdsubst16.0 +++ b/bin/sh/tests/expansion/cmdsubst16.0 @@ -1,4 +1,3 @@ - f() { return 3; } f [ `echo $?` = 3 ] diff --git a/bin/sh/tests/expansion/cmdsubst17.0 b/bin/sh/tests/expansion/cmdsubst17.0 --- a/bin/sh/tests/expansion/cmdsubst17.0 +++ b/bin/sh/tests/expansion/cmdsubst17.0 @@ -1,4 +1,3 @@ - f() { return 3; } f [ `echo $?; :` = 3 ] diff --git a/bin/sh/tests/expansion/cmdsubst18.0 b/bin/sh/tests/expansion/cmdsubst18.0 --- a/bin/sh/tests/expansion/cmdsubst18.0 +++ b/bin/sh/tests/expansion/cmdsubst18.0 @@ -1,4 +1,3 @@ - x=X unset n r=${x+$(echo a)}${x-$(echo b)}${n+$(echo c)}${n-$(echo d)}$(echo e) diff --git a/bin/sh/tests/expansion/cmdsubst19.0 b/bin/sh/tests/expansion/cmdsubst19.0 --- a/bin/sh/tests/expansion/cmdsubst19.0 +++ b/bin/sh/tests/expansion/cmdsubst19.0 @@ -1,4 +1,3 @@ - b=200 c=30 d=5 x=4 r=$(echo a)$(($(echo b) + ${x+$(echo c)} + ${x-$(echo d)}))$(echo e) [ "$r" = a234e ] diff --git a/bin/sh/tests/expansion/cmdsubst2.0 b/bin/sh/tests/expansion/cmdsubst2.0 --- a/bin/sh/tests/expansion/cmdsubst2.0 +++ b/bin/sh/tests/expansion/cmdsubst2.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/expansion/cmdsubst20.0 b/bin/sh/tests/expansion/cmdsubst20.0 --- a/bin/sh/tests/expansion/cmdsubst20.0 +++ b/bin/sh/tests/expansion/cmdsubst20.0 @@ -1,4 +1,3 @@ - set -T trapped='' trap "trapped=x$trapped" USR1 diff --git a/bin/sh/tests/expansion/cmdsubst21.0 b/bin/sh/tests/expansion/cmdsubst21.0 --- a/bin/sh/tests/expansion/cmdsubst21.0 +++ b/bin/sh/tests/expansion/cmdsubst21.0 @@ -1,4 +1,3 @@ - set -T trapped='' trap "trapped=x$trapped" TERM diff --git a/bin/sh/tests/expansion/cmdsubst22.0 b/bin/sh/tests/expansion/cmdsubst22.0 --- a/bin/sh/tests/expansion/cmdsubst22.0 +++ b/bin/sh/tests/expansion/cmdsubst22.0 @@ -1,4 +1,3 @@ - set -T trapped='' trap "trapped=x$trapped" TERM diff --git a/bin/sh/tests/expansion/cmdsubst23.0 b/bin/sh/tests/expansion/cmdsubst23.0 --- a/bin/sh/tests/expansion/cmdsubst23.0 +++ b/bin/sh/tests/expansion/cmdsubst23.0 @@ -1,4 +1,3 @@ - unset n x=abcd [ "X${n#$(echo a)}X${x#$(echo ab)}X$(echo abc)X" = XXcdXabcX ] diff --git a/bin/sh/tests/expansion/cmdsubst25.0 b/bin/sh/tests/expansion/cmdsubst25.0 --- a/bin/sh/tests/expansion/cmdsubst25.0 +++ b/bin/sh/tests/expansion/cmdsubst25.0 @@ -1,4 +1,3 @@ - IFS=' ' set -- `printf '\n '` IFS=: diff --git a/bin/sh/tests/expansion/cmdsubst26.0 b/bin/sh/tests/expansion/cmdsubst26.0 --- a/bin/sh/tests/expansion/cmdsubst26.0 +++ b/bin/sh/tests/expansion/cmdsubst26.0 @@ -1,4 +1,3 @@ - nl=' ' v=$nl`printf '\n'` diff --git a/bin/sh/tests/expansion/cmdsubst3.0 b/bin/sh/tests/expansion/cmdsubst3.0 --- a/bin/sh/tests/expansion/cmdsubst3.0 +++ b/bin/sh/tests/expansion/cmdsubst3.0 @@ -1,4 +1,3 @@ - unset LC_ALL export LC_CTYPE=en_US.ISO8859-1 diff --git a/bin/sh/tests/expansion/cmdsubst4.0 b/bin/sh/tests/expansion/cmdsubst4.0 --- a/bin/sh/tests/expansion/cmdsubst4.0 +++ b/bin/sh/tests/expansion/cmdsubst4.0 @@ -1,3 +1,2 @@ - exec 2>/dev/null ! y=$(: /dev/null ! y=$(: ${v?}) diff --git a/bin/sh/tests/expansion/cmdsubst7.0 b/bin/sh/tests/expansion/cmdsubst7.0 --- a/bin/sh/tests/expansion/cmdsubst7.0 +++ b/bin/sh/tests/expansion/cmdsubst7.0 @@ -1,4 +1,3 @@ - failures='' ok='' diff --git a/bin/sh/tests/expansion/cmdsubst9.0 b/bin/sh/tests/expansion/cmdsubst9.0 --- a/bin/sh/tests/expansion/cmdsubst9.0 +++ b/bin/sh/tests/expansion/cmdsubst9.0 @@ -1,4 +1,3 @@ - set -e cd / diff --git a/bin/sh/tests/expansion/export1.0 b/bin/sh/tests/expansion/export1.0 --- a/bin/sh/tests/expansion/export1.0 +++ b/bin/sh/tests/expansion/export1.0 @@ -1,4 +1,3 @@ - w='@ vv=6' v=0 vv=0 diff --git a/bin/sh/tests/expansion/export2.0 b/bin/sh/tests/expansion/export2.0 --- a/bin/sh/tests/expansion/export2.0 +++ b/bin/sh/tests/expansion/export2.0 @@ -1,4 +1,3 @@ - w='@ @' check() { [ "$v" = "$w" ] || echo "Expected $w got $v" diff --git a/bin/sh/tests/expansion/export3.0 b/bin/sh/tests/expansion/export3.0 --- a/bin/sh/tests/expansion/export3.0 +++ b/bin/sh/tests/expansion/export3.0 @@ -1,4 +1,3 @@ - w='@ @' check() { [ "$v" = "$w" ] || echo "Expected $w got $v" diff --git a/bin/sh/tests/expansion/heredoc1.0 b/bin/sh/tests/expansion/heredoc1.0 --- a/bin/sh/tests/expansion/heredoc1.0 +++ b/bin/sh/tests/expansion/heredoc1.0 @@ -1,4 +1,3 @@ - f() { return $1; } [ `f 42; { cat; } <&1` r=$? diff --git a/bin/sh/tests/expansion/readonly1.0 b/bin/sh/tests/expansion/readonly1.0 --- a/bin/sh/tests/expansion/readonly1.0 +++ b/bin/sh/tests/expansion/readonly1.0 @@ -1,4 +1,3 @@ - w='@ @' v=0 HOME=/known/value diff --git a/bin/sh/tests/expansion/redir1.0 b/bin/sh/tests/expansion/redir1.0 --- a/bin/sh/tests/expansion/redir1.0 +++ b/bin/sh/tests/expansion/redir1.0 @@ -1,4 +1,3 @@ - bad=0 for i in 0 1 2 3; do for j in 0 1 2 3 4 5 6 7; do diff --git a/bin/sh/tests/expansion/set-u1.0 b/bin/sh/tests/expansion/set-u1.0 --- a/bin/sh/tests/expansion/set-u1.0 +++ b/bin/sh/tests/expansion/set-u1.0 @@ -1,4 +1,3 @@ - ${SH} -uc 'unset foo; echo $foo' 2>/dev/null && exit 1 ${SH} -uc 'foo=; echo $foo' >/dev/null || exit 1 ${SH} -uc 'foo=1; echo $foo' >/dev/null || exit 1 diff --git a/bin/sh/tests/expansion/set-u2.0 b/bin/sh/tests/expansion/set-u2.0 --- a/bin/sh/tests/expansion/set-u2.0 +++ b/bin/sh/tests/expansion/set-u2.0 @@ -1,4 +1,3 @@ - set -u : $* $@ "$@" "$*" set -- x diff --git a/bin/sh/tests/expansion/set-u3.0 b/bin/sh/tests/expansion/set-u3.0 --- a/bin/sh/tests/expansion/set-u3.0 +++ b/bin/sh/tests/expansion/set-u3.0 @@ -1,4 +1,3 @@ - set -u unset x v=$( (eval ': $((x))') 2>&1 >/dev/null) diff --git a/bin/sh/tests/expansion/tilde1.0 b/bin/sh/tests/expansion/tilde1.0 --- a/bin/sh/tests/expansion/tilde1.0 +++ b/bin/sh/tests/expansion/tilde1.0 @@ -1,4 +1,3 @@ - HOME=/tmp roothome=~root if [ "$roothome" = "~root" ]; then diff --git a/bin/sh/tests/expansion/tilde2.0 b/bin/sh/tests/expansion/tilde2.0 --- a/bin/sh/tests/expansion/tilde2.0 +++ b/bin/sh/tests/expansion/tilde2.0 @@ -1,4 +1,3 @@ - HOME=/tmp roothome=~root if [ "$roothome" = "~root" ]; then diff --git a/bin/sh/tests/expansion/trim1.0 b/bin/sh/tests/expansion/trim1.0 --- a/bin/sh/tests/expansion/trim1.0 +++ b/bin/sh/tests/expansion/trim1.0 @@ -1,4 +1,3 @@ - e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}' h='##' failures='' diff --git a/bin/sh/tests/expansion/trim10.0 b/bin/sh/tests/expansion/trim10.0 --- a/bin/sh/tests/expansion/trim10.0 +++ b/bin/sh/tests/expansion/trim10.0 @@ -1,4 +1,3 @@ - a='z ' b=${a% diff --git a/bin/sh/tests/expansion/trim11.0 b/bin/sh/tests/expansion/trim11.0 --- a/bin/sh/tests/expansion/trim11.0 +++ b/bin/sh/tests/expansion/trim11.0 @@ -1,4 +1,3 @@ - a='z ' b="${a% diff --git a/bin/sh/tests/expansion/trim2.0 b/bin/sh/tests/expansion/trim2.0 --- a/bin/sh/tests/expansion/trim2.0 +++ b/bin/sh/tests/expansion/trim2.0 @@ -1,4 +1,3 @@ - e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}' h='##' failures='' diff --git a/bin/sh/tests/expansion/trim3.0 b/bin/sh/tests/expansion/trim3.0 --- a/bin/sh/tests/expansion/trim3.0 +++ b/bin/sh/tests/expansion/trim3.0 @@ -1,4 +1,3 @@ - e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}' h='##' c='\\\\' failures='' diff --git a/bin/sh/tests/expansion/trim4.0 b/bin/sh/tests/expansion/trim4.0 --- a/bin/sh/tests/expansion/trim4.0 +++ b/bin/sh/tests/expansion/trim4.0 @@ -1,4 +1,3 @@ - v1=/homes/SOME_USER v2= v3=C123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 diff --git a/bin/sh/tests/expansion/trim5.0 b/bin/sh/tests/expansion/trim5.0 --- a/bin/sh/tests/expansion/trim5.0 +++ b/bin/sh/tests/expansion/trim5.0 @@ -1,4 +1,3 @@ - e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}' h='##' failures='' diff --git a/bin/sh/tests/expansion/trim6.0 b/bin/sh/tests/expansion/trim6.0 --- a/bin/sh/tests/expansion/trim6.0 +++ b/bin/sh/tests/expansion/trim6.0 @@ -1,4 +1,3 @@ - e= for i in 0 1 2 3; do for j in 0 1 2 3 4 5 6 7; do diff --git a/bin/sh/tests/expansion/trim7.0 b/bin/sh/tests/expansion/trim7.0 --- a/bin/sh/tests/expansion/trim7.0 +++ b/bin/sh/tests/expansion/trim7.0 @@ -1,4 +1,3 @@ - set -- 1 2 3 4 5 6 7 8 9 10 11 12 13 [ "${##1}" = 3 ] || echo '${##1} wrong' [ "${###1}" = 3 ] || echo '${###1} wrong' diff --git a/bin/sh/tests/expansion/trim8.0 b/bin/sh/tests/expansion/trim8.0 --- a/bin/sh/tests/expansion/trim8.0 +++ b/bin/sh/tests/expansion/trim8.0 @@ -1,4 +1,3 @@ - unset LC_ALL LC_CTYPE=en_US.UTF-8 export LC_CTYPE diff --git a/bin/sh/tests/expansion/trim9.0 b/bin/sh/tests/expansion/trim9.0 --- a/bin/sh/tests/expansion/trim9.0 +++ b/bin/sh/tests/expansion/trim9.0 @@ -1,4 +1,3 @@ - # POSIX does not specify these but they occasionally occur in the wild. # This just serves to keep working what currently works. diff --git a/bin/sh/tests/invocation/Makefile b/bin/sh/tests/invocation/Makefile --- a/bin/sh/tests/invocation/Makefile +++ b/bin/sh/tests/invocation/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/invocation/sh-c-missing1.0 b/bin/sh/tests/invocation/sh-c-missing1.0 --- a/bin/sh/tests/invocation/sh-c-missing1.0 +++ b/bin/sh/tests/invocation/sh-c-missing1.0 @@ -1,2 +1 @@ - ! echo echo bad | ${SH} -c 2>/dev/null diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile --- a/bin/sh/tests/parameters/Makefile +++ b/bin/sh/tests/parameters/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/parameters/env1.0 b/bin/sh/tests/parameters/env1.0 --- a/bin/sh/tests/parameters/env1.0 +++ b/bin/sh/tests/parameters/env1.0 @@ -1,4 +1,3 @@ - export key='must contain this' unset x r=$(ENV="\${x?\$key}" ${SH} -i +m 2>&1 >/dev/null <<\EOF diff --git a/bin/sh/tests/parameters/ifs1.0 b/bin/sh/tests/parameters/ifs1.0 --- a/bin/sh/tests/parameters/ifs1.0 +++ b/bin/sh/tests/parameters/ifs1.0 @@ -1,4 +1,3 @@ - env IFS=_ ${SH} -c ' rc=2 nosuchtool_function() { diff --git a/bin/sh/tests/parameters/optind1.0 b/bin/sh/tests/parameters/optind1.0 --- a/bin/sh/tests/parameters/optind1.0 +++ b/bin/sh/tests/parameters/optind1.0 @@ -1,2 +1 @@ - unset OPTIND && [ -z "$OPTIND" ] diff --git a/bin/sh/tests/parameters/optind2.0 b/bin/sh/tests/parameters/optind2.0 --- a/bin/sh/tests/parameters/optind2.0 +++ b/bin/sh/tests/parameters/optind2.0 @@ -1,2 +1 @@ - [ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ] diff --git a/bin/sh/tests/parameters/positional1.0 b/bin/sh/tests/parameters/positional1.0 --- a/bin/sh/tests/parameters/positional1.0 +++ b/bin/sh/tests/parameters/positional1.0 @@ -1,4 +1,3 @@ - set -- a b c d e f g h i j [ "$1" = a ] || echo "error at line $LINENO" [ "${1}" = a ] || echo "error at line $LINENO" diff --git a/bin/sh/tests/parameters/positional2.0 b/bin/sh/tests/parameters/positional2.0 --- a/bin/sh/tests/parameters/positional2.0 +++ b/bin/sh/tests/parameters/positional2.0 @@ -1,4 +1,3 @@ - failures='' ok='' diff --git a/bin/sh/tests/parameters/positional3.0 b/bin/sh/tests/parameters/positional3.0 --- a/bin/sh/tests/parameters/positional3.0 +++ b/bin/sh/tests/parameters/positional3.0 @@ -1,3 +1,2 @@ - r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b) [ "$r" = yesyes ] diff --git a/bin/sh/tests/parameters/positional4.0 b/bin/sh/tests/parameters/positional4.0 --- a/bin/sh/tests/parameters/positional4.0 +++ b/bin/sh/tests/parameters/positional4.0 @@ -1,3 +1,2 @@ - set -- "x$0" 2 3 4 5 6 7 8 9 "y$0" [ "${01}.${010}" = "$1.${10}" ] diff --git a/bin/sh/tests/parameters/positional5.0 b/bin/sh/tests/parameters/positional5.0 --- a/bin/sh/tests/parameters/positional5.0 +++ b/bin/sh/tests/parameters/positional5.0 @@ -1,4 +1,3 @@ - i=1 r=0 while [ $i -lt $((0x100000000)) ]; do diff --git a/bin/sh/tests/parameters/positional6.0 b/bin/sh/tests/parameters/positional6.0 --- a/bin/sh/tests/parameters/positional6.0 +++ b/bin/sh/tests/parameters/positional6.0 @@ -1,4 +1,3 @@ - IFS=? set p r v=pqrs diff --git a/bin/sh/tests/parameters/positional7.0 b/bin/sh/tests/parameters/positional7.0 --- a/bin/sh/tests/parameters/positional7.0 +++ b/bin/sh/tests/parameters/positional7.0 @@ -1,4 +1,3 @@ - set -- / '' IFS=* set -- "$*" diff --git a/bin/sh/tests/parameters/positional8.0 b/bin/sh/tests/parameters/positional8.0 --- a/bin/sh/tests/parameters/positional8.0 +++ b/bin/sh/tests/parameters/positional8.0 @@ -1,4 +1,3 @@ - failures='' ok='' diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile --- a/bin/sh/tests/parser/Makefile +++ b/bin/sh/tests/parser/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/parser/alias1.0 b/bin/sh/tests/parser/alias1.0 --- a/bin/sh/tests/parser/alias1.0 +++ b/bin/sh/tests/parser/alias1.0 @@ -1,4 +1,3 @@ - alias alias0=exit eval 'alias0 0' exit 1 diff --git a/bin/sh/tests/parser/alias10.0 b/bin/sh/tests/parser/alias10.0 --- a/bin/sh/tests/parser/alias10.0 +++ b/bin/sh/tests/parser/alias10.0 @@ -1,4 +1,3 @@ - # This test may start consuming memory indefinitely if it fails. ulimit -t 5 2>/dev/null ulimit -v 100000 2>/dev/null diff --git a/bin/sh/tests/parser/alias11.0 b/bin/sh/tests/parser/alias11.0 --- a/bin/sh/tests/parser/alias11.0 +++ b/bin/sh/tests/parser/alias11.0 @@ -1,4 +1,3 @@ - alias alias0=alias1 alias alias1=exit eval 'alias0 0' diff --git a/bin/sh/tests/parser/alias12.0 b/bin/sh/tests/parser/alias12.0 --- a/bin/sh/tests/parser/alias12.0 +++ b/bin/sh/tests/parser/alias12.0 @@ -1,4 +1,3 @@ - unalias -a alias alias0=command alias true='echo bad' diff --git a/bin/sh/tests/parser/alias13.0 b/bin/sh/tests/parser/alias13.0 --- a/bin/sh/tests/parser/alias13.0 +++ b/bin/sh/tests/parser/alias13.0 @@ -1,4 +1,3 @@ - unalias -a alias command=command alias true='echo bad' diff --git a/bin/sh/tests/parser/alias14.0 b/bin/sh/tests/parser/alias14.0 --- a/bin/sh/tests/parser/alias14.0 +++ b/bin/sh/tests/parser/alias14.0 @@ -1,4 +1,3 @@ - alias command='command ' alias alias0=exit eval 'command alias0 0' diff --git a/bin/sh/tests/parser/alias15.0 b/bin/sh/tests/parser/alias15.0 --- a/bin/sh/tests/parser/alias15.0 +++ b/bin/sh/tests/parser/alias15.0 @@ -1,4 +1,3 @@ - f_echoanddo() { printf '%s\n' "$*" "$@" diff --git a/bin/sh/tests/parser/alias16.0 b/bin/sh/tests/parser/alias16.0 --- a/bin/sh/tests/parser/alias16.0 +++ b/bin/sh/tests/parser/alias16.0 @@ -1,4 +1,3 @@ - v=1 alias a='unalias a v=2' diff --git a/bin/sh/tests/parser/alias17.0 b/bin/sh/tests/parser/alias17.0 --- a/bin/sh/tests/parser/alias17.0 +++ b/bin/sh/tests/parser/alias17.0 @@ -1,4 +1,3 @@ - v=1 alias a='unalias -a v=2' diff --git a/bin/sh/tests/parser/alias18.0 b/bin/sh/tests/parser/alias18.0 --- a/bin/sh/tests/parser/alias18.0 +++ b/bin/sh/tests/parser/alias18.0 @@ -1,4 +1,3 @@ - v=1 alias a='alias a=v=2 v=3 diff --git a/bin/sh/tests/parser/alias19.0 b/bin/sh/tests/parser/alias19.0 --- a/bin/sh/tests/parser/alias19.0 +++ b/bin/sh/tests/parser/alias19.0 @@ -1,4 +1,3 @@ - alias begin={ end=} begin cat </dev/null diff --git a/bin/sh/tests/parser/for1.0 b/bin/sh/tests/parser/for1.0 --- a/bin/sh/tests/parser/for1.0 +++ b/bin/sh/tests/parser/for1.0 @@ -1,4 +1,3 @@ - nl=' ' list=' a b c' diff --git a/bin/sh/tests/parser/for2.0 b/bin/sh/tests/parser/for2.0 --- a/bin/sh/tests/parser/for2.0 +++ b/bin/sh/tests/parser/for2.0 @@ -1,4 +1,3 @@ - # Common extensions to the 'for' syntax. nl=' diff --git a/bin/sh/tests/parser/func2.0 b/bin/sh/tests/parser/func2.0 --- a/bin/sh/tests/parser/func2.0 +++ b/bin/sh/tests/parser/func2.0 @@ -1,4 +1,3 @@ - f() { return 42; } f() { return 3; } & f diff --git a/bin/sh/tests/parser/func3.0 b/bin/sh/tests/parser/func3.0 --- a/bin/sh/tests/parser/func3.0 +++ b/bin/sh/tests/parser/func3.0 @@ -1,4 +1,3 @@ - name=/var/empty/nosuch f() { true; } <$name name=/dev/null diff --git a/bin/sh/tests/parser/heredoc1.0 b/bin/sh/tests/parser/heredoc1.0 --- a/bin/sh/tests/parser/heredoc1.0 +++ b/bin/sh/tests/parser/heredoc1.0 @@ -1,4 +1,3 @@ - failures=0 check() { diff --git a/bin/sh/tests/parser/heredoc10.0 b/bin/sh/tests/parser/heredoc10.0 --- a/bin/sh/tests/parser/heredoc10.0 +++ b/bin/sh/tests/parser/heredoc10.0 @@ -1,4 +1,3 @@ - # It may be argued that # x=$(cat </dev/null; command eval : hi \${r:=0} exit ${r:-3} diff --git a/bin/sh/tests/parser/heredoc7.0 b/bin/sh/tests/parser/heredoc7.0 --- a/bin/sh/tests/parser/heredoc7.0 +++ b/bin/sh/tests/parser/heredoc7.0 @@ -1,4 +1,3 @@ - # Some of these created malformed parse trees with null pointers for here # documents, causing the here document writing process to segfault. eval ': <&2 set -v diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile --- a/bin/sh/tests/set-e/Makefile +++ b/bin/sh/tests/set-e/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile --- a/bin/sleep/Makefile +++ b/bin/sleep/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile --- a/bin/sleep/tests/Makefile +++ b/bin/sleep/tests/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_SH= sleep_test diff --git a/bin/stty/Makefile b/bin/stty/Makefile --- a/bin/stty/Makefile +++ b/bin/stty/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= stty SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c diff --git a/bin/sync/Makefile b/bin/sync/Makefile --- a/bin/sync/Makefile +++ b/bin/sync/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= sync MAN= sync.8 diff --git a/bin/test/Makefile b/bin/test/Makefile --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile --- a/bin/test/tests/Makefile +++ b/bin/test/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= legacy_test diff --git a/bin/tests/Makefile b/bin/tests/Makefile --- a/bin/tests/Makefile +++ b/bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/bin/timeout/Makefile b/bin/timeout/Makefile --- a/bin/timeout/Makefile +++ b/bin/timeout/Makefile @@ -1,4 +1,3 @@ - .include PROG= timeout diff --git a/bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile --- a/bin/timeout/tests/Makefile +++ b/bin/timeout/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= timeout_test .include diff --git a/bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh --- a/bin/timeout/tests/timeout_test.sh +++ b/bin/timeout/tests/timeout_test.sh @@ -1,4 +1,3 @@ - atf_test_case nominal nominal_head() { diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile --- a/bin/uuidgen/Makefile +++ b/bin/uuidgen/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= uuidgen diff --git a/cddl/Makefile b/cddl/Makefile --- a/cddl/Makefile +++ b/cddl/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -1,4 +1,3 @@ - OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h --- a/cddl/compat/opensolaris/include/libintl.h +++ b/cddl/compat/opensolaris/include/libintl.h @@ -1,4 +1,3 @@ - #ifndef _LIBINTL_H_ #define _LIBINTL_H_ diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h --- a/cddl/compat/opensolaris/include/priv.h +++ b/cddl/compat/opensolaris/include/priv.h @@ -1,4 +1,3 @@ - #ifndef _OPENSOLARIS_PRIV_H_ #define _OPENSOLARIS_PRIV_H_ diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h --- a/cddl/compat/opensolaris/include/solaris.h +++ b/cddl/compat/opensolaris/include/solaris.h @@ -1,4 +1,3 @@ - #ifndef _SOLARIS_H_ #define _SOLARIS_H_ diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h --- a/cddl/compat/opensolaris/include/zone.h +++ b/cddl/compat/opensolaris/include/zone.h @@ -1,4 +1,3 @@ - #ifndef _ZONE_H_ #define _ZONE_H_ diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/README b/cddl/contrib/opensolaris/cmd/dtrace/test/README --- a/cddl/contrib/opensolaris/cmd/dtrace/test/README +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/README @@ -1,4 +1,3 @@ - CDDL HEADER START The contents of this file are subject to the terms of the diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_DTRACE} == yes || ${MK_ZFS} == yes diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc --- a/cddl/lib/Makefile.inc +++ b/cddl/lib/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib SHLIB_MAJOR?= 2 diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common PACKAGE= dtrace diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl PACKAGE= zfs diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= zfs diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= utilities diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem PACKAGE= zfs diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil PACKAGE= zfs diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core .PATH: ${SRCTOP}/sys/contrib/openzfs/include .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs # ZFS_COMMON_SRCS diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile --- a/cddl/lib/tests/Makefile +++ b/cddl/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile --- a/cddl/sbin/Makefile +++ b/cddl/sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_TESTS}+= tests diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc --- a/cddl/sbin/Makefile.inc +++ b/cddl/sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /sbin .include "../Makefile.inc" diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile --- a/cddl/sbin/tests/Makefile +++ b/cddl/sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zfs diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/man/man4 diff --git a/cddl/share/Makefile b/cddl/share/Makefile --- a/cddl/share/Makefile +++ b/cddl/share/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_ZFS}+= zfs diff --git a/cddl/share/zfs/Makefile b/cddl/share/zfs/Makefile --- a/cddl/share/zfs/Makefile +++ b/cddl/share/zfs/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= compatibility.d diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile --- a/cddl/tests/Makefile +++ b/cddl/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DTRACE}+= \ diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc --- a/cddl/usr.bin/Makefile.inc +++ b/cddl/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile --- a/cddl/usr.bin/ctfconvert/Makefile +++ b/cddl/usr.bin/ctfconvert/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common diff --git a/cddl/usr.bin/ctfconvert/tests/Makefile b/cddl/usr.bin/ctfconvert/tests/Makefile --- a/cddl/usr.bin/ctfconvert/tests/Makefile +++ b/cddl/usr.bin/ctfconvert/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ctfconvert_test .include diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile --- a/cddl/usr.bin/ctfdump/Makefile +++ b/cddl/usr.bin/ctfdump/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile --- a/cddl/usr.bin/ctfmerge/Makefile +++ b/cddl/usr.bin/ctfmerge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile --- a/cddl/usr.bin/tests/Makefile +++ b/cddl/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zinject diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zstream diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,4 +1,3 @@ - .include ZFSTOP= ${SRCTOP}/sys/contrib/openzfs diff --git a/cddl/usr.bin/ztest/tests/Makefile b/cddl/usr.bin/ztest/tests/Makefile --- a/cddl/usr.bin/ztest/tests/Makefile +++ b/cddl/usr.bin/ztest/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_SH+= ztest diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile --- a/cddl/usr.libexec/Makefile +++ b/cddl/usr.libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_ZFS}+= \ diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile --- a/cddl/usr.libexec/zfs_prepare_disk/Makefile +++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/scripts diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile --- a/cddl/usr.libexec/zpool_influxdb/Makefile +++ b/cddl/usr.libexec/zpool_influxdb/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool_influxdb diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DTRACE}+= \ diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc --- a/cddl/usr.sbin/Makefile.inc +++ b/cddl/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin .include "../Makefile.inc" diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile --- a/cddl/usr.sbin/dtrace/tests/Makefile +++ b/cddl/usr.sbin/dtrace/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= common diff --git a/cddl/usr.sbin/dtrace/tests/amd64/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/Makefile --- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile +++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/amd64 TESTS_SUBDIRS+= arrays diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile --- a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/Makefile @@ -1,4 +1,3 @@ - # We exclude several subdirectories: nfs and sysevent do not compile on # FreeBSD, and docsExamples doesn't seem amenable to automated testing. diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/env/Makefile b/cddl/usr.sbin/dtrace/tests/common/env/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/env/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/env/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile --- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk --- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk +++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk @@ -1,4 +1,3 @@ - TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} TESTBASE= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst TESTSRC= ${TESTBASE}/${TESTGROUP} diff --git a/cddl/usr.sbin/dtrace/tests/i386/Makefile b/cddl/usr.sbin/dtrace/tests/i386/Makefile --- a/cddl/usr.sbin/dtrace/tests/i386/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/i386 TESTS_SUBDIRS+= arrays \ funcs \ diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile --- a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile --- a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile --- a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile --- a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh --- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh @@ -1,4 +1,3 @@ - # This file lists DTrace tests which are known to fail or hang/crash the # system. They were pulled from the legacy DTrace test infrastructure in # tools/tests/dtrace and may be out of date. diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh --- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh @@ -1,4 +1,3 @@ - usage() { cat <<__EOF__ >&2 diff --git a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh --- a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh @@ -1,4 +1,3 @@ - usage() { cat <<__EOF__ >&2 diff --git a/cddl/usr.sbin/dwatch/Makefile b/cddl/usr.sbin/dwatch/Makefile --- a/cddl/usr.sbin/dwatch/Makefile +++ b/cddl/usr.sbin/dwatch/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= dwatch diff --git a/cddl/usr.sbin/dwatch/examples/Makefile b/cddl/usr.sbin/dwatch/examples/Makefile --- a/cddl/usr.sbin/dwatch/examples/Makefile +++ b/cddl/usr.sbin/dwatch/examples/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dwatch FILESDIR= ${SHAREDIR}/examples/dwatch FILES= profile_template diff --git a/cddl/usr.sbin/dwatch/libexec/Makefile b/cddl/usr.sbin/dwatch/libexec/Makefile --- a/cddl/usr.sbin/dwatch/libexec/Makefile +++ b/cddl/usr.sbin/dwatch/libexec/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dwatch FILESDIR= ${LIBEXECDIR}/dwatch FILES= chmod \ diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile --- a/cddl/usr.sbin/tests/Makefile +++ b/cddl/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zdb diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -1,4 +1,3 @@ - .include .include "Makefile.common" diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -1,4 +1,3 @@ - SRCS= callout.cc \ case_file.cc \ zfsd_event.cc \ diff --git a/cddl/usr.sbin/zfsd/tests/Makefile b/cddl/usr.sbin/zfsd/tests/Makefile --- a/cddl/usr.sbin/zfsd/tests/Makefile +++ b/cddl/usr.sbin/zfsd/tests/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR:H} diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/cmd PACKAGE= zfs diff --git a/etc/Makefile b/etc/Makefile --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/etc/gss/Makefile b/etc/gss/Makefile --- a/etc/gss/Makefile +++ b/etc/gss/Makefile @@ -1,4 +1,3 @@ - FILES= mech qop NO_OBJ= FILESDIR= /etc/gss diff --git a/etc/mail/README b/etc/mail/README --- a/etc/mail/README +++ b/etc/mail/README @@ -1,4 +1,3 @@ - Sendmail Processes As of sendmail 8.12, in order to improve security, the sendmail binary no diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -1,4 +1,3 @@ - M4= m4 CHMOD= chmod ROMODE= 444 diff --git a/gnu/Makefile b/gnu/Makefile --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc --- a/gnu/Makefile.inc +++ b/gnu/Makefile.inc @@ -1,4 +1,3 @@ - # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc --- a/gnu/lib/Makefile.inc +++ b/gnu/lib/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -1,4 +1,3 @@ - DIALOG= ${SRCTOP}/contrib/dialog LIB= dialog diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile --- a/gnu/tests/Makefile +++ b/gnu/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DIALOG}+= dialog diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc --- a/gnu/usr.bin/Makefile.inc +++ b/gnu/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -1,4 +1,3 @@ - DIALOG= ${SRCTOP}/contrib/dialog PROG= dialog diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -1,4 +1,3 @@ - DIFFSRC=${SRCTOP}/contrib/diff/src .PATH: ${DIFFSRC} \ ${SRCTOP}/contrib/diff/lib \ diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile --- a/gnu/usr.bin/tests/Makefile +++ b/gnu/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/include/arpa/Makefile b/include/arpa/Makefile --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -1,4 +1,3 @@ - .include INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h diff --git a/include/gssapi/Makefile b/include/gssapi/Makefile --- a/include/gssapi/Makefile +++ b/include/gssapi/Makefile @@ -1,4 +1,3 @@ - INCS= gssapi.h INCSDIR= ${INCLUDEDIR}/gssapi diff --git a/include/ifaddrs.h b/include/ifaddrs.h --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-1-Clause * diff --git a/include/protocols/Makefile b/include/protocols/Makefile --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,4 +1,3 @@ - INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols diff --git a/include/rpc/Makefile b/include/rpc/Makefile --- a/include/rpc/Makefile +++ b/include/rpc/Makefile @@ -1,4 +1,3 @@ - .SUFFIXES: .x RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,4 +1,3 @@ - .SUFFIXES: .x RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C diff --git a/include/xlocale/Makefile b/include/xlocale/Makefile --- a/include/xlocale/Makefile +++ b/include/xlocale/Makefile @@ -1,4 +1,3 @@ - INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h INCSDIR=${INCLUDEDIR}/xlocale diff --git a/kerberos5/Makefile b/kerberos5/Makefile --- a/kerberos5/Makefile +++ b/kerberos5/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib .WAIT \ libexec tools usr.bin usr.sbin SUBDIR_PARALLEL= diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,4 +1,3 @@ - .include NO_LINT= diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libasn1 libhdb \ diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc --- a/kerberos5/lib/Makefile.inc +++ b/kerberos5/lib/Makefile.inc @@ -1,4 +1,3 @@ - SHLIB_MAJOR?= 11 .include "../Makefile.inc" diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= asn1 diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_krb5 diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_ntlm diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_spnego diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= hdb diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile --- a/kerberos5/lib/libheimbase/Makefile +++ b/kerberos5/lib/libheimbase/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimbase diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimipcc diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile --- a/kerberos5/lib/libheimipcs/Makefile +++ b/kerberos5/lib/libheimipcs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimipcs diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimntlm diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= hx509 diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kadm5clnt diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kadm5srv diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kafs5 diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kdc diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= krb5 diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= roken diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile --- a/kerberos5/lib/libsl/Makefile +++ b/kerberos5/lib/libsl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= sl diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile --- a/kerberos5/lib/libvers/Makefile +++ b/kerberos5/lib/libvers/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= vers diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile --- a/kerberos5/lib/libwind/Makefile +++ b/kerberos5/lib/libwind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= wind diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile --- a/kerberos5/libexec/Makefile +++ b/kerberos5/libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= digest-service ipropd-master ipropd-slave hprop hpropd kdc \ diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc --- a/kerberos5/libexec/Makefile.inc +++ b/kerberos5/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/libexec .include "../Makefile.inc" diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= digest-service diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hprop diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hpropd diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ipropd-master diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ipropd-slave diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kadmind diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kcm diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdc diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile --- a/kerberos5/libexec/kdigest/Makefile +++ b/kerberos5/libexec/kdigest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdigest diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile --- a/kerberos5/libexec/kfd/Makefile +++ b/kerberos5/libexec/kfd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kfd diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile --- a/kerberos5/libexec/kimpersonate/Makefile +++ b/kerberos5/libexec/kimpersonate/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kimpersonate diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kpasswdd diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile --- a/kerberos5/tools/Makefile +++ b/kerberos5/tools/Makefile @@ -1,4 +1,3 @@ - SUBDIR= make-roken asn1_compile slc SUBDIR_PARALLEL= diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc --- a/kerberos5/tools/Makefile.inc +++ b/kerberos5/tools/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile --- a/kerberos5/tools/asn1_compile/Makefile +++ b/kerberos5/tools/asn1_compile/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= asn1_compile diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile --- a/kerberos5/tools/make-roken/Makefile +++ b/kerberos5/tools/make-roken/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= make-roken diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile --- a/kerberos5/tools/slc/Makefile +++ b/kerberos5/tools/slc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= slc diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,4 +1,3 @@ - SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd krb5-config ksu \ string2key verify_krb5_conf SUBDIR_PARALLEL= diff --git a/kerberos5/usr.bin/Makefile.inc b/kerberos5/usr.bin/Makefile.inc --- a/kerberos5/usr.bin/Makefile.inc +++ b/kerberos5/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/bin .include "../Makefile.inc" diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hxtool diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kadmin diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile --- a/kerberos5/usr.bin/kcc/Makefile +++ b/kerberos5/usr.bin/kcc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kcc diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdestroy diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile --- a/kerberos5/usr.bin/kf/Makefile +++ b/kerberos5/usr.bin/kf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kf diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile --- a/kerberos5/usr.bin/kgetcred/Makefile +++ b/kerberos5/usr.bin/kgetcred/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kgetcred diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kinit diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kpasswd diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile --- a/kerberos5/usr.bin/krb5-config/Makefile +++ b/kerberos5/usr.bin/krb5-config/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos SCRIPTS=krb5-config diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ksu diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile --- a/kerberos5/usr.bin/string2key/Makefile +++ b/kerberos5/usr.bin/string2key/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= string2key diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile --- a/kerberos5/usr.bin/verify_krb5_conf/Makefile +++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= verify_krb5_conf diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile --- a/kerberos5/usr.sbin/Makefile +++ b/kerberos5/usr.sbin/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iprop-log kstash ktutil SUBDIR_PARALLEL= diff --git a/kerberos5/usr.sbin/Makefile.inc b/kerberos5/usr.sbin/Makefile.inc --- a/kerberos5/usr.sbin/Makefile.inc +++ b/kerberos5/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/sbin .include "../Makefile.inc" diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= iprop-log diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kstash diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ktutil diff --git a/lib/Makefile b/lib/Makefile --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,3 @@ - .include # The SUBDIR_BOOTSTRAP list is a small set of libraries which are used by many diff --git a/lib/atf/libatf-c++/Makefile.inc b/lib/atf/libatf-c++/Makefile.inc --- a/lib/atf/libatf-c++/Makefile.inc +++ b/lib/atf/libatf-c++/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/atf/libatf-c++/tests/Makefile.inc b/lib/atf/libatf-c++/tests/Makefile.inc --- a/lib/atf/libatf-c++/tests/Makefile.inc +++ b/lib/atf/libatf-c++/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail diff --git a/lib/atf/libatf-c/Makefile.inc b/lib/atf/libatf-c/Makefile.inc --- a/lib/atf/libatf-c/Makefile.inc +++ b/lib/atf/libatf-c/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" CFLAGS+= -DATF_BUILD_CC='"cc"' diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/atf/libatf-c/tests/Makefile.inc b/lib/atf/libatf-c/tests/Makefile.inc --- a/lib/atf/libatf-c/tests/Makefile.inc +++ b/lib/atf/libatf-c/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/test-programs diff --git a/lib/clang/Makefile b/lib/clang/Makefile --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -1,4 +1,3 @@ - .include # These have to be built in order. diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,4 +1,3 @@ - .include PACKAGE= clang diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -1,4 +1,3 @@ - .include .ifndef CLANG_SRCS diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -1,4 +1,3 @@ - .include "llvm.pre.mk" CLANG_SRCS= ${LLVM_BASE}/clang diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -1,4 +1,3 @@ - .include "../clang.pre.mk" .PATH: ${CLANG_SRCS}/lib/Headers diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,4 +1,3 @@ - .include .include "../clang.pre.mk" diff --git a/lib/clang/libclangminimal/Makefile b/lib/clang/libclangminimal/Makefile --- a/lib/clang/libclangminimal/Makefile +++ b/lib/clang/libclangminimal/Makefile @@ -1,4 +1,3 @@ - .include "../clang.pre.mk" LIB= clangminimal diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,4 +1,3 @@ - .include "../lldb.pre.mk" LIB= lldb diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,4 +1,3 @@ - .include .include "../llvm.pre.mk" diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile --- a/lib/clang/libllvmminimal/Makefile +++ b/lib/clang/libllvmminimal/Makefile @@ -1,4 +1,3 @@ - .include "../llvm.pre.mk" LIB= llvmminimal diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk --- a/lib/clang/lldb.pre.mk +++ b/lib/clang/lldb.pre.mk @@ -1,4 +1,3 @@ - .include "clang.pre.mk" LLDB_SRCS= ${LLVM_BASE}/lldb diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -1,4 +1,3 @@ - .include .ifndef LLVM_BASE diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -1,4 +1,3 @@ - LLVM_BASE= ${SRCTOP}/contrib/llvm-project LLVM_SRCS= ${LLVM_BASE}/llvm diff --git a/lib/csu/Makefile b/lib/csu/Makefile --- a/lib/csu/Makefile +++ b/lib/csu/Makefile @@ -1,4 +1,3 @@ - .include .if exists(${.CURDIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile --- a/lib/csu/aarch64/Makefile +++ b/lib/csu/aarch64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CRT1OBJS+= crt1_s.o diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common OBJS+= crtsavres.o diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile --- a/lib/csu/powerpc64/Makefile +++ b/lib/csu/powerpc64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common OBJS+= crtsavres.o diff --git a/lib/csu/riscv/Makefile b/lib/csu/riscv/Makefile --- a/lib/csu/riscv/Makefile +++ b/lib/csu/riscv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CRT1OBJS+= crt1_s.o diff --git a/lib/csu/riscv/crt.h b/lib/csu/riscv/crt.h --- a/lib/csu/riscv/crt.h +++ b/lib/csu/riscv/crt.h @@ -1,4 +1,3 @@ - #ifndef _CRT_H_ #define _CRT_H_ diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile --- a/lib/csu/tests/Makefile +++ b/lib/csu/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dso TESTS_SUBDIRS= dynamic TESTS_SUBDIRS+= dynamiclib diff --git a/lib/csu/tests/Makefile.inc b/lib/csu/tests/Makefile.inc --- a/lib/csu/tests/Makefile.inc +++ b/lib/csu/tests/Makefile.inc @@ -1,2 +1 @@ - TESTSDIR:= ${TESTSBASE}/${RELDIR:C/csu\/tests/csu/} diff --git a/lib/csu/tests/Makefile.tests b/lib/csu/tests/Makefile.tests --- a/lib/csu/tests/Makefile.tests +++ b/lib/csu/tests/Makefile.tests @@ -1,4 +1,3 @@ - ATF_TESTS_C+= init_test ATF_TESTS_C+= fini_test ATF_TESTS_CXX+= cxx_constructors diff --git a/lib/csu/tests/dso/Makefile b/lib/csu/tests/dso/Makefile --- a/lib/csu/tests/dso/Makefile +++ b/lib/csu/tests/dso/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} SHLIB= h_csu SHLIB_NAME= libh_csu.so diff --git a/lib/csu/tests/dynamic/Makefile b/lib/csu/tests/dynamic/Makefile --- a/lib/csu/tests/dynamic/Makefile +++ b/lib/csu/tests/dynamic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} .include diff --git a/lib/csu/tests/dynamiclib/Makefile b/lib/csu/tests/dynamiclib/Makefile --- a/lib/csu/tests/dynamiclib/Makefile +++ b/lib/csu/tests/dynamiclib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} CFLAGS+= -DDSO_BASE DPADD+= ${.OBJDIR:H}/dso/libh_csu.so diff --git a/lib/csu/tests/dynamicpie/Makefile b/lib/csu/tests/dynamicpie/Makefile --- a/lib/csu/tests/dynamicpie/Makefile +++ b/lib/csu/tests/dynamicpie/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} .include diff --git a/lib/csu/tests/static/Makefile b/lib/csu/tests/static/Makefile --- a/lib/csu/tests/static/Makefile +++ b/lib/csu/tests/static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} NO_SHARED= diff --git a/lib/flua/Makefile b/lib/flua/Makefile --- a/lib/flua/Makefile +++ b/lib/flua/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libjail .include diff --git a/lib/flua/libjail/Makefile b/lib/flua/libjail/Makefile --- a/lib/flua/libjail/Makefile +++ b/lib/flua/libjail/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= jail.so SHLIBDIR= ${LIBDIR}/flua diff --git a/lib/geom/Makefile b/lib/geom/Makefile --- a/lib/geom/Makefile +++ b/lib/geom/Makefile @@ -1,4 +1,3 @@ - SUBDIR=${GEOM_CLASSES} .include "Makefile.inc" diff --git a/lib/geom/Makefile.classes b/lib/geom/Makefile.classes --- a/lib/geom/Makefile.classes +++ b/lib/geom/Makefile.classes @@ -1,4 +1,3 @@ - .if !defined(COMPAT_libcompat) GEOM_CLASS_DIR?=/lib/geom .else diff --git a/lib/geom/Makefile.inc b/lib/geom/Makefile.inc --- a/lib/geom/Makefile.inc +++ b/lib/geom/Makefile.inc @@ -1,4 +1,3 @@ - .include SHLIBDIR=${GEOM_CLASS_DIR} diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile --- a/lib/geom/cache/Makefile +++ b/lib/geom/cache/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile --- a/lib/geom/concat/Makefile +++ b/lib/geom/concat/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile --- a/lib/geom/eli/Makefile +++ b/lib/geom/eli/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile --- a/lib/geom/label/Makefile +++ b/lib/geom/label/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile --- a/lib/geom/mirror/Makefile +++ b/lib/geom/mirror/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile --- a/lib/geom/mountver/Makefile +++ b/lib/geom/mountver/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile --- a/lib/geom/multipath/Makefile +++ b/lib/geom/multipath/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile --- a/lib/geom/nop/Makefile +++ b/lib/geom/nop/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile --- a/lib/geom/part/Makefile +++ b/lib/geom/part/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile --- a/lib/geom/raid/Makefile +++ b/lib/geom/raid/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile --- a/lib/geom/raid3/Makefile +++ b/lib/geom/raid3/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile --- a/lib/geom/shsec/Makefile +++ b/lib/geom/shsec/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile --- a/lib/geom/stripe/Makefile +++ b/lib/geom/stripe/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile --- a/lib/geom/union/Makefile +++ b/lib/geom/union/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile --- a/lib/geom/virstor/Makefile +++ b/lib/geom/virstor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor diff --git a/lib/googletest/Makefile b/lib/googletest/Makefile --- a/lib/googletest/Makefile +++ b/lib/googletest/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR+= gtest diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc --- a/lib/googletest/Makefile.inc +++ b/lib/googletest/Makefile.inc @@ -1,4 +1,3 @@ - .include GTEST_DIR= ${SRCTOP}/contrib/googletest diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile --- a/lib/googletest/gmock/Makefile +++ b/lib/googletest/gmock/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src diff --git a/lib/googletest/gmock/Makefile.inc b/lib/googletest/gmock/Makefile.inc --- a/lib/googletest/gmock/Makefile.inc +++ b/lib/googletest/gmock/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile --- a/lib/googletest/gmock_main/Makefile +++ b/lib/googletest/gmock_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src diff --git a/lib/googletest/gmock_main/Makefile.inc b/lib/googletest/gmock_main/Makefile.inc --- a/lib/googletest/gmock_main/Makefile.inc +++ b/lib/googletest/gmock_main/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile --- a/lib/googletest/gtest/Makefile +++ b/lib/googletest/gtest/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src diff --git a/lib/googletest/gtest/Makefile.inc b/lib/googletest/gtest/Makefile.inc --- a/lib/googletest/gtest/Makefile.inc +++ b/lib/googletest/gtest/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile --- a/lib/googletest/gtest_main/Makefile +++ b/lib/googletest/gtest_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src diff --git a/lib/googletest/gtest_main/Makefile.inc b/lib/googletest/gtest_main/Makefile.inc --- a/lib/googletest/gtest_main/Makefile.inc +++ b/lib/googletest/gtest_main/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile --- a/lib/googletest/tests/Makefile +++ b/lib/googletest/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc --- a/lib/googletest/tests/Makefile.inc +++ b/lib/googletest/tests/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" # Keep the existing tests directory structure (with subdirs per component) # rather than installing all of them to /usr/tests/lib/googletest diff --git a/lib/googletest/tests/gmock/Makefile b/lib/googletest/tests/gmock/Makefile --- a/lib/googletest/tests/gmock/Makefile +++ b/lib/googletest/tests/gmock/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test diff --git a/lib/googletest/tests/gmock_main/Makefile b/lib/googletest/tests/gmock_main/Makefile --- a/lib/googletest/tests/gmock_main/Makefile +++ b/lib/googletest/tests/gmock_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile --- a/lib/googletest/tests/gtest/Makefile +++ b/lib/googletest/tests/gtest/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile --- a/lib/googletest/tests/gtest_main/Makefile +++ b/lib/googletest/tests/gtest_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test diff --git a/lib/lib80211/Makefile b/lib/lib80211/Makefile --- a/lib/lib80211/Makefile +++ b/lib/lib80211/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= regdomain.xml LIB= 80211 diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile --- a/lib/lib9p/Makefile +++ b/lib/lib9p/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/../../contrib/lib9p diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile --- a/lib/libalias/Makefile +++ b/lib/libalias/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libalias modules .include diff --git a/lib/libalias/Makefile.inc b/lib/libalias/Makefile.inc --- a/lib/libalias/Makefile.inc +++ b/lib/libalias/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile --- a/lib/libalias/libalias/Makefile +++ b/lib/libalias/libalias/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias PACKAGE= natd diff --git a/lib/libalias/modules/Makefile b/lib/libalias/modules/Makefile --- a/lib/libalias/modules/Makefile +++ b/lib/libalias/modules/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/sys/modules/libalias/modules/modules.inc" SUBDIR= ${MODULES} diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc --- a/lib/libalias/modules/Makefile.inc +++ b/lib/libalias/modules/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias SHLIBDIR?= /lib diff --git a/lib/libalias/modules/dummy/Makefile b/lib/libalias/modules/dummy/Makefile --- a/lib/libalias/modules/dummy/Makefile +++ b/lib/libalias/modules/dummy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= dummy SRCS= alias_dummy.c diff --git a/lib/libalias/modules/ftp/Makefile b/lib/libalias/modules/ftp/Makefile --- a/lib/libalias/modules/ftp/Makefile +++ b/lib/libalias/modules/ftp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= ftp SRCS= alias_ftp.c diff --git a/lib/libalias/modules/irc/Makefile b/lib/libalias/modules/irc/Makefile --- a/lib/libalias/modules/irc/Makefile +++ b/lib/libalias/modules/irc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= irc SRCS= alias_irc.c diff --git a/lib/libalias/modules/nbt/Makefile b/lib/libalias/modules/nbt/Makefile --- a/lib/libalias/modules/nbt/Makefile +++ b/lib/libalias/modules/nbt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= nbt SRCS= alias_nbt.c diff --git a/lib/libalias/modules/pptp/Makefile b/lib/libalias/modules/pptp/Makefile --- a/lib/libalias/modules/pptp/Makefile +++ b/lib/libalias/modules/pptp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= pptp SRCS= alias_pptp.c diff --git a/lib/libalias/modules/skinny/Makefile b/lib/libalias/modules/skinny/Makefile --- a/lib/libalias/modules/skinny/Makefile +++ b/lib/libalias/modules/skinny/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= skinny SRCS= alias_skinny.c diff --git a/lib/libalias/modules/smedia/Makefile b/lib/libalias/modules/smedia/Makefile --- a/lib/libalias/modules/smedia/Makefile +++ b/lib/libalias/modules/smedia/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= smedia SRCS= alias_smedia.c diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= be_create diff --git a/lib/libbearssl/Makefile b/lib/libbearssl/Makefile --- a/lib/libbearssl/Makefile +++ b/lib/libbearssl/Makefile @@ -1,4 +1,3 @@ - # This is a reach over build of BearSSL (www.BearSSL.org) .include diff --git a/lib/libbearssl/Makefile.inc b/lib/libbearssl/Makefile.inc --- a/lib/libbearssl/Makefile.inc +++ b/lib/libbearssl/Makefile.inc @@ -1,4 +1,3 @@ - BEARSSL?= ${SRCTOP}/contrib/bearssl BEARSSL_SRC= ${BEARSSL}/src BEARSSL_TOOLS= ${BEARSSL}/tools diff --git a/lib/libbearssl/Makefile.libsa.inc b/lib/libbearssl/Makefile.libsa.inc --- a/lib/libbearssl/Makefile.libsa.inc +++ b/lib/libbearssl/Makefile.libsa.inc @@ -1,4 +1,3 @@ - # This file is included by libsa # It contains SRCS needed for loader diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile --- a/lib/libbegemot/Makefile +++ b/lib/libbegemot/Makefile @@ -1,4 +1,3 @@ - LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot PACKAGE=lib${LIB} diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile --- a/lib/libblacklist/Makefile +++ b/lib/libblacklist/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include diff --git a/lib/libblocksruntime/Makefile b/lib/libblocksruntime/Makefile --- a/lib/libblocksruntime/Makefile +++ b/lib/libblocksruntime/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB:tl} LIB= BlocksRuntime SHLIB_MAJOR=0 diff --git a/lib/libblocksruntime/config.h b/lib/libblocksruntime/config.h --- a/lib/libblocksruntime/config.h +++ b/lib/libblocksruntime/config.h @@ -1,4 +1,3 @@ - /* #undef HAVE_SYS_BYTEORDER_H */ /* #undef HAVE_AVAILABILITY_MACROS_H */ /* #undef HAVE_TARGET_CONDITIONALS_H */ diff --git a/lib/libbsdstat/Makefile b/lib/libbsdstat/Makefile --- a/lib/libbsdstat/Makefile +++ b/lib/libbsdstat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= bsdstat SHLIB_MAJOR= 1 diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile --- a/lib/libbsnmp/Makefile +++ b/lib/libbsnmp/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libbsnmp diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -1,4 +1,3 @@ - INCSDIR= ${INCLUDEDIR}/bsnmp PACKAGE= bsnmp diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile --- a/lib/libbsnmp/tests/Makefile +++ b/lib/libbsnmp/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= bsnmpd_test diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile --- a/lib/libc++experimental/Makefile +++ b/lib/libc++experimental/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= clibs diff --git a/lib/libc/Makefile b/lib/libc/Makefile --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def --- a/lib/libc/Versions.def +++ b/lib/libc/Versions.def @@ -1,4 +1,3 @@ - # # Note: Whenever bumping the FBSD version, always make # FBSDprivate_1.0 depend on the new FBSD version. diff --git a/lib/libc/aarch64/gen/Makefile.inc b/lib/libc/aarch64/gen/Makefile.inc --- a/lib/libc/aarch64/gen/Makefile.inc +++ b/lib/libc/aarch64/gen/Makefile.inc @@ -1,4 +1,3 @@ - CFLAGS+= -DNO_COMPAT7 SRCS+= _ctx_start.S \ diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc --- a/lib/libc/amd64/gen/Makefile.inc +++ b/lib/libc/amd64/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S \ infinity.c ldexp.c makecontext.c signalcontext.c \ diff --git a/lib/libc/amd64/stdlib/Makefile.inc b/lib/libc/amd64/stdlib/Makefile.inc --- a/lib/libc/amd64/stdlib/Makefile.inc +++ b/lib/libc/amd64/stdlib/Makefile.inc @@ -1,2 +1 @@ - MDSRCS+=div.S ldiv.S lldiv.S diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc --- a/lib/libc/arm/aeabi/Makefile.inc +++ b/lib/libc/arm/aeabi/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/arm/aeabi SRCS+= aeabi_atexit.c \ diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc --- a/lib/libc/arm/gen/Makefile.inc +++ b/lib/libc/arm/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= \ __aeabi_read_tp.S \ _ctx_start.S \ diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc --- a/lib/libc/arm/string/Makefile.inc +++ b/lib/libc/arm/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcopy.S \ bzero.S \ diff --git a/lib/libc/capability/Makefile.inc b/lib/libc/capability/Makefile.inc --- a/lib/libc/capability/Makefile.inc +++ b/lib/libc/capability/Makefile.inc @@ -1,4 +1,3 @@ - # capability sources .PATH: ${SRCTOP}/sys/kern ${LIBC_SRCTOP}/capability diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc --- a/lib/libc/compat-43/Makefile.inc +++ b/lib/libc/compat-43/Makefile.inc @@ -1,4 +1,3 @@ - # compat-43 sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43 diff --git a/lib/libc/db/README b/lib/libc/db/README --- a/lib/libc/db/README +++ b/lib/libc/db/README @@ -1,4 +1,3 @@ - This is version 1.85 of the Berkeley DB code. For information on compiling and installing this software, see the file diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc --- a/lib/libc/db/btree/Makefile.inc +++ b/lib/libc/db/btree/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc --- a/lib/libc/db/db/Makefile.inc +++ b/lib/libc/db/db/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/db SRCS+= db.c diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc --- a/lib/libc/db/hash/Makefile.inc +++ b/lib/libc/db/hash/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ diff --git a/lib/libc/db/hash/README b/lib/libc/db/hash/README --- a/lib/libc/db/hash/README +++ b/lib/libc/db/hash/README @@ -1,4 +1,3 @@ - This package implements a superset of the hsearch and dbm/ndbm libraries. Test Programs: diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc --- a/lib/libc/db/man/Makefile.inc +++ b/lib/libc/db/man/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/man MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc --- a/lib/libc/db/mpool/Makefile.inc +++ b/lib/libc/db/mpool/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/mpool SRCS+= mpool.c \ diff --git a/lib/libc/db/mpool/README b/lib/libc/db/mpool/README --- a/lib/libc/db/mpool/README +++ b/lib/libc/db/mpool/README @@ -1,4 +1,3 @@ - These are the current memory pool routines. They aren't ready for prime time, yet, and the interface is expected to change. diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc --- a/lib/libc/db/recno/Makefile.inc +++ b/lib/libc/db/recno/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ diff --git a/lib/libc/db/test/Makefile b/lib/libc/db/test/Makefile --- a/lib/libc/db/test/Makefile +++ b/lib/libc/db/test/Makefile @@ -1,4 +1,3 @@ - PROG= dbtest OBJS= dbtest.o strerror.o diff --git a/lib/libc/db/test/README b/lib/libc/db/test/README --- a/lib/libc/db/test/README +++ b/lib/libc/db/test/README @@ -1,4 +1,3 @@ - To build this portably, try something like: make PORTDIR="../PORT/MACH" diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc --- a/lib/libc/gdtoa/Makefile.inc +++ b/lib/libc/gdtoa/Makefile.inc @@ -1,4 +1,3 @@ - # netlib gdtoa sources .PATH: ${LIBC_SRCTOP}/gdtoa diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent gen sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen ${SRCTOP}/etc diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc --- a/lib/libc/gmon/Makefile.inc +++ b/lib/libc/gmon/Makefile.inc @@ -1,4 +1,3 @@ - # gmon sources .PATH: ${LIBC_SRCTOP}/gmon diff --git a/lib/libc/i386/Makefile.inc b/lib/libc/i386/Makefile.inc --- a/lib/libc/i386/Makefile.inc +++ b/lib/libc/i386/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 80 bits GDTOASRCS+=strtorx.c SRCS+=machdep_ldisx.c diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc --- a/lib/libc/i386/gen/Makefile.inc +++ b/lib/libc/i386/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _ctx_start.S _setjmp.S fabs.S \ flt_rounds.c infinity.c ldexp.c makecontext.c \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc --- a/lib/libc/i386/stdlib/Makefile.inc +++ b/lib/libc/i386/stdlib/Makefile.inc @@ -1,2 +1 @@ - MDSRCS+=div.S ldiv.S diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc --- a/lib/libc/i386/string/Makefile.inc +++ b/lib/libc/i386/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcmp.S \ bcopy.S \ diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc --- a/lib/libc/iconv/Makefile.inc +++ b/lib/libc/iconv/Makefile.inc @@ -1,4 +1,3 @@ - # iconv sources .PATH: ${LIBC_SRCTOP}/iconv diff --git a/lib/libc/include/port_after.h b/lib/libc/include/port_after.h --- a/lib/libc/include/port_after.h +++ b/lib/libc/include/port_after.h @@ -1,4 +1,3 @@ - #ifndef _PORT_AFTER_H_ #define _PORT_AFTER_H_ diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h --- a/lib/libc/include/port_before.h +++ b/lib/libc/include/port_before.h @@ -1,4 +1,3 @@ - #ifndef _PORT_BEFORE_H_ #define _PORT_BEFORE_H_ diff --git a/lib/libc/inet/Makefile.inc b/lib/libc/inet/Makefile.inc --- a/lib/libc/inet/Makefile.inc +++ b/lib/libc/inet/Makefile.inc @@ -1,4 +1,3 @@ - # inet sources .PATH: ${LIBC_SRCTOP}/inet diff --git a/lib/libc/isc/Makefile.inc b/lib/libc/isc/Makefile.inc --- a/lib/libc/isc/Makefile.inc +++ b/lib/libc/isc/Makefile.inc @@ -1,4 +1,3 @@ - # isc sources .PATH: ${LIBC_SRCTOP}/isc diff --git a/lib/libc/locale/DESIGN.xlocale b/lib/libc/locale/DESIGN.xlocale --- a/lib/libc/locale/DESIGN.xlocale +++ b/lib/libc/locale/DESIGN.xlocale @@ -1,4 +1,3 @@ - Design of xlocale ================= diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -1,4 +1,3 @@ - # locale sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/locale ${LIBC_SRCTOP}/locale diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc --- a/lib/libc/md/Makefile.inc +++ b/lib/libc/md/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libmd SRCS+= md5c.c diff --git a/lib/libc/nameser/Makefile.inc b/lib/libc/nameser/Makefile.inc --- a/lib/libc/nameser/Makefile.inc +++ b/lib/libc/nameser/Makefile.inc @@ -1,4 +1,3 @@ - # nameser sources .PATH: ${LIBC_SRCTOP}/nameser diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent net sources .PATH: ${LIBC_SRCTOP}/net diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h --- a/lib/libc/net/res_config.h +++ b/lib/libc/net/res_config.h @@ -1,4 +1,3 @@ - #define DEBUG 1 /* enable debugging code (needed for dig) */ #define RESOLVSORT /* allow sorting of addresses in gethostbyname */ #undef SUNSECURITY /* verify gethostbyaddr() calls - WE DON'T NEED IT */ diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/posix1e CFLAGS+=-D_ACL_PRIVATE diff --git a/lib/libc/powerpc/Makefile.inc b/lib/libc/powerpc/Makefile.inc --- a/lib/libc/powerpc/Makefile.inc +++ b/lib/libc/powerpc/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 64-bits SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map diff --git a/lib/libc/powerpc/gen/Makefile.common b/lib/libc/powerpc/gen/Makefile.common --- a/lib/libc/powerpc/gen/Makefile.common +++ b/lib/libc/powerpc/gen/Makefile.common @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/powerpc/gen SRCS += _ctx_start.S eabi.S infinity.c ldexp.c makecontext.c \ diff --git a/lib/libc/powerpc/gen/Makefile.inc b/lib/libc/powerpc/gen/Makefile.inc --- a/lib/libc/powerpc/gen/Makefile.inc +++ b/lib/libc/powerpc/gen/Makefile.inc @@ -1,4 +1,3 @@ - .include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ diff --git a/lib/libc/powerpc64/Makefile.inc b/lib/libc/powerpc64/Makefile.inc --- a/lib/libc/powerpc64/Makefile.inc +++ b/lib/libc/powerpc64/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 64-bits SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc64/Symbol.map diff --git a/lib/libc/powerpc64/gen/Makefile.inc b/lib/libc/powerpc64/gen/Makefile.inc --- a/lib/libc/powerpc64/gen/Makefile.inc +++ b/lib/libc/powerpc64/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c \ infinity.c ldexp.c makecontext.c _setjmp.S \ diff --git a/lib/libc/powerpc64/string/Makefile.inc b/lib/libc/powerpc64/string/Makefile.inc --- a/lib/libc/powerpc64/string/Makefile.inc +++ b/lib/libc/powerpc64/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcopy.S \ bcopy_vsx.S \ diff --git a/lib/libc/powerpc64/string/memcpy_resolver.c b/lib/libc/powerpc64/string/memcpy_resolver.c --- a/lib/libc/powerpc64/string/memcpy_resolver.c +++ b/lib/libc/powerpc64/string/memcpy_resolver.c @@ -1,3 +1,2 @@ - #define MEMCOPY #include "bcopy_resolver.c" diff --git a/lib/libc/powerpc64/string/memmove.S b/lib/libc/powerpc64/string/memmove.S --- a/lib/libc/powerpc64/string/memmove.S +++ b/lib/libc/powerpc64/string/memmove.S @@ -1,3 +1,2 @@ - #define MEMMOVE #include "bcopy.S" diff --git a/lib/libc/powerpc64/string/memmove_resolver.c b/lib/libc/powerpc64/string/memmove_resolver.c --- a/lib/libc/powerpc64/string/memmove_resolver.c +++ b/lib/libc/powerpc64/string/memmove_resolver.c @@ -1,3 +1,2 @@ - #define MEMMOVE #include "bcopy_resolver.c" diff --git a/lib/libc/powerpc64/string/memmove_vsx.S b/lib/libc/powerpc64/string/memmove_vsx.S --- a/lib/libc/powerpc64/string/memmove_vsx.S +++ b/lib/libc/powerpc64/string/memmove_vsx.S @@ -1,4 +1,3 @@ - #define MEMMOVE #define FN_NAME __memmove_vsx #include "bcopy_vsx.S" diff --git a/lib/libc/powerpcspe/Makefile.inc b/lib/libc/powerpcspe/Makefile.inc --- a/lib/libc/powerpcspe/Makefile.inc +++ b/lib/libc/powerpcspe/Makefile.inc @@ -1,4 +1,3 @@ - CFLAGS+= -I${LIBC_SRCTOP}/powerpc # Long double is 64-bits diff --git a/lib/libc/powerpcspe/gen/Makefile.inc b/lib/libc/powerpcspe/gen/Makefile.inc --- a/lib/libc/powerpcspe/gen/Makefile.inc +++ b/lib/libc/powerpcspe/gen/Makefile.inc @@ -1,4 +1,3 @@ - .include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc --- a/lib/libc/quad/Makefile.inc +++ b/lib/libc/quad/Makefile.inc @@ -1,4 +1,3 @@ - # Quad support, if needed .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/quad ${LIBC_SRCTOP}/quad diff --git a/lib/libc/quad/TESTS/Makefile b/lib/libc/quad/TESTS/Makefile --- a/lib/libc/quad/TESTS/Makefile +++ b/lib/libc/quad/TESTS/Makefile @@ -1,4 +1,3 @@ - all: mul divrem MUL= mul.c ../muldi3.c diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc --- a/lib/libc/regex/Makefile.inc +++ b/lib/libc/regex/Makefile.inc @@ -1,4 +1,3 @@ - # regex sources .PATH: ${LIBC_SRCTOP}/regex diff --git a/lib/libc/regex/WHATSNEW b/lib/libc/regex/WHATSNEW --- a/lib/libc/regex/WHATSNEW +++ b/lib/libc/regex/WHATSNEW @@ -1,4 +1,3 @@ - New in alpha3.4: The complex bug alluded to below has been fixed (in a slightly kludgey temporary way that may hurt efficiency a bit; this is another "get it out the door for 4.4" release). The tests at the end of diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc --- a/lib/libc/resolv/Makefile.inc +++ b/lib/libc/resolv/Makefile.inc @@ -1,4 +1,3 @@ - # resolv sources .PATH: ${LIBC_SRCTOP}/resolv diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c --- a/lib/libc/resolv/res_findzonecut.c +++ b/lib/libc/resolv/res_findzonecut.c @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: ISC * diff --git a/lib/libc/resolv/res_private.h b/lib/libc/resolv/res_private.h --- a/lib/libc/resolv/res_private.h +++ b/lib/libc/resolv/res_private.h @@ -1,4 +1,3 @@ - #ifndef res_private_h #define res_private_h diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c --- a/lib/libc/resolv/res_update.c +++ b/lib/libc/resolv/res_update.c @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: ISC * diff --git a/lib/libc/riscv/gen/Makefile.inc b/lib/libc/riscv/gen/Makefile.inc --- a/lib/libc/riscv/gen/Makefile.inc +++ b/lib/libc/riscv/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _ctx_start.S \ fabs.S \ flt_rounds.c \ diff --git a/lib/libc/riscv/softfloat/milieu.h b/lib/libc/riscv/softfloat/milieu.h --- a/lib/libc/riscv/softfloat/milieu.h +++ b/lib/libc/riscv/softfloat/milieu.h @@ -1,4 +1,3 @@ - /* =============================================================================== diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/. CONFS+= rpc/netconfig rpc/rpc SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README --- a/lib/libc/rpc/README +++ b/lib/libc/rpc/README @@ -1,4 +1,3 @@ - PLEASE READ THE DISCLAIMER FILE. DO NOT CALL THE SUN MICROSYSTEMS SUPPORT LINE WITH QUESTIONS ON THIS RELEASE. THEY CANNOT ANSWER QUESTIONS ABOUT THIS UNSUPPORTED SOURCE RELEASE. diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c --- a/lib/libc/rpc/svc_auth_des.c +++ b/lib/libc/rpc/svc_auth_des.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 1988 by Sun Microsystems, Inc. */ diff --git a/lib/libc/softfloat/bits32/softfloat-macros b/lib/libc/softfloat/bits32/softfloat-macros --- a/lib/libc/softfloat/bits32/softfloat-macros +++ b/lib/libc/softfloat/bits32/softfloat-macros @@ -1,4 +1,3 @@ - /* =============================================================================== diff --git a/lib/libc/softfloat/templates/milieu.h b/lib/libc/softfloat/templates/milieu.h --- a/lib/libc/softfloat/templates/milieu.h +++ b/lib/libc/softfloat/templates/milieu.h @@ -1,4 +1,3 @@ - /* =============================================================================== diff --git a/lib/libc/softfloat/templates/softfloat-specialize b/lib/libc/softfloat/templates/softfloat-specialize --- a/lib/libc/softfloat/templates/softfloat-specialize +++ b/lib/libc/softfloat/templates/softfloat-specialize @@ -1,4 +1,3 @@ - /* =============================================================================== diff --git a/lib/libc/softfloat/templates/softfloat.h b/lib/libc/softfloat/templates/softfloat.h --- a/lib/libc/softfloat/templates/softfloat.h +++ b/lib/libc/softfloat/templates/softfloat.h @@ -1,4 +1,3 @@ - /* =============================================================================== diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -1,4 +1,3 @@ - # stdio sources .PATH: ${LIBC_SRCTOP}/stdio diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent stdlib sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc --- a/lib/libc/string/Makefile.inc +++ b/lib/libc/string/Makefile.inc @@ -1,4 +1,3 @@ - .if ${MK_MACHDEP_OPTIMIZATIONS} != "no" .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string .endif diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -1,4 +1,3 @@ - # sys sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys ${LIBC_SRCTOP}/sys diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile --- a/lib/libc/tests/Makefile +++ b/lib/libc/tests/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= tls_dso diff --git a/lib/libc/tests/Makefile.netbsd-tests b/lib/libc/tests/Makefile.netbsd-tests --- a/lib/libc/tests/Makefile.netbsd-tests +++ b/lib/libc/tests/Makefile.netbsd-tests @@ -1,4 +1,3 @@ - TESTSRC:= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:C/libc\/tests/libc/} TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/} diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile --- a/lib/libc/tests/c063/Makefile +++ b/lib/libc/tests/c063/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_C= faccessat_test NETBSD_ATF_TESTS_C+= fchmodat_test NETBSD_ATF_TESTS_C+= fchownat_test diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile --- a/lib/libc/tests/db/Makefile +++ b/lib/libc/tests/db/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests BINDIR= ${TESTSDIR} diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile --- a/lib/libc/tests/gen/Makefile +++ b/lib/libc/tests/gen/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= arc4random_test diff --git a/lib/libc/tests/gen/execve/Makefile b/lib/libc/tests/gen/execve/Makefile --- a/lib/libc/tests/gen/execve/Makefile +++ b/lib/libc/tests/gen/execve/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= execve_test diff --git a/lib/libc/tests/gen/posix_spawn/Makefile b/lib/libc/tests/gen/posix_spawn/Makefile --- a/lib/libc/tests/gen/posix_spawn/Makefile +++ b/lib/libc/tests/gen/posix_spawn/Makefile @@ -1,4 +1,3 @@ - .include BINDIR= ${TESTSDIR} diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile --- a/lib/libc/tests/hash/Makefile +++ b/lib/libc/tests/hash/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/lib/libc/tests/iconv/Makefile b/lib/libc/tests/iconv/Makefile --- a/lib/libc/tests/iconv/Makefile +++ b/lib/libc/tests/iconv/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/lib/libc/iconv ATF_TESTS_C+= iconvctl_test diff --git a/lib/libc/tests/inet/Makefile b/lib/libc/tests/inet/Makefile --- a/lib/libc/tests/inet/Makefile +++ b/lib/libc/tests/inet/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C+= inet_addr_test diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile --- a/lib/libc/tests/locale/Makefile +++ b/lib/libc/tests/locale/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= btowc_test diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile --- a/lib/libc/tests/net/Makefile +++ b/lib/libc/tests/net/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_C+= ether_test diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile --- a/lib/libc/tests/net/getaddrinfo/Makefile +++ b/lib/libc/tests/net/getaddrinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T} diff --git a/lib/libc/tests/nss/Makefile b/lib/libc/tests/nss/Makefile --- a/lib/libc/tests/nss/Makefile +++ b/lib/libc/tests/nss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/resolv PACKAGE= tests diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile --- a/lib/libc/tests/regex/Makefile +++ b/lib/libc/tests/regex/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests # local test cases diff --git a/lib/libc/tests/regex/Makefile.inc b/lib/libc/tests/regex/Makefile.inc --- a/lib/libc/tests/regex/Makefile.inc +++ b/lib/libc/tests/regex/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= ${TESTSDIR} diff --git a/lib/libc/tests/resolv/Makefile b/lib/libc/tests/resolv/Makefile --- a/lib/libc/tests/resolv/Makefile +++ b/lib/libc/tests/resolv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/lib/libc/resolv diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile --- a/lib/libc/tests/rpc/Makefile +++ b/lib/libc/tests/rpc/Makefile @@ -1,4 +1,3 @@ - SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \ h_testbits.h diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile --- a/lib/libc/tests/setjmp/Makefile +++ b/lib/libc/tests/setjmp/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_C= setjmp_test NETBSD_ATF_TESTS_C+= threadjmp_test diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -1,4 +1,3 @@ - .include MK_WERROR= no diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= eintr_test diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= clearenv_test diff --git a/lib/libc/tests/stdlib/dynthr_mod/Makefile b/lib/libc/tests/stdlib/dynthr_mod/Makefile --- a/lib/libc/tests/stdlib/dynthr_mod/Makefile +++ b/lib/libc/tests/stdlib/dynthr_mod/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= dynthr_mod.so SHLIBDIR= ${TESTSDIR} SRCS= dynthr_mod.c diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -1,4 +1,3 @@ - # ensure libc functions are tested, not clang's builtins CFLAGS+= -fno-builtin diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/lib/libc/tests/termios/Makefile b/lib/libc/tests/termios/Makefile --- a/lib/libc/tests/termios/Makefile +++ b/lib/libc/tests/termios/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= tcsetpgrp_test diff --git a/lib/libc/tests/time/Makefile b/lib/libc/tests/time/Makefile --- a/lib/libc/tests/time/Makefile +++ b/lib/libc/tests/time/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= mktime_test diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile --- a/lib/libc/tests/tls/Makefile +++ b/lib/libc/tests/tls/Makefile @@ -1,4 +1,3 @@ - .include .if !defined(NO_PIC) diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile --- a/lib/libc/tests/tls/dso/Makefile +++ b/lib/libc/tests/tls/dso/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T} LIB= h_tls_dlopen diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile --- a/lib/libc/tests/tls_dso/Makefile +++ b/lib/libc/tests/tls_dso/Makefile @@ -1,4 +1,3 @@ - .include LIB= h_tls_dynamic diff --git a/lib/libc/tests/ttyio/Makefile b/lib/libc/tests/ttyio/Makefile --- a/lib/libc/tests/ttyio/Makefile +++ b/lib/libc/tests/ttyio/Makefile @@ -1,4 +1,3 @@ - .include # TODO: ptm_test diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc --- a/lib/libc/uuid/Makefile.inc +++ b/lib/libc/uuid/Makefile.inc @@ -1,4 +1,3 @@ - # DCE 1.1 UUID implementation sources .PATH: ${LIBC_SRCTOP}/uuid diff --git a/lib/libc/x86/gen/Makefile.inc b/lib/libc/x86/gen/Makefile.inc --- a/lib/libc/x86/gen/Makefile.inc +++ b/lib/libc/x86/gen/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/x86/gen SRCS+= \ diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc --- a/lib/libc/xdr/Makefile.inc +++ b/lib/libc/xdr/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/xdr ${LIBC_SRCTOP}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_sizeof.c \ diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc --- a/lib/libc/yp/Makefile.inc +++ b/lib/libc/yp/Makefile.inc @@ -1,4 +1,3 @@ - # yp sources .PATH: ${LIBC_SRCTOP}/yp diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile --- a/lib/libc_nonshared/Makefile +++ b/lib/libc_nonshared/Makefile @@ -1,4 +1,3 @@ - # We're actually creating a libc_noshared.a that is PIC along side libc.so.* # It is used exclusively with libc.so.* - there is no need for any other # compile modes. diff --git a/lib/libc_nonshared/Makefile.iconv b/lib/libc_nonshared/Makefile.iconv --- a/lib/libc_nonshared/Makefile.iconv +++ b/lib/libc_nonshared/Makefile.iconv @@ -1,4 +1,3 @@ - .if ${MK_ICONV} == "yes" LIBC_NONSHARED_SRCS+= \ __iconv.c __iconv_free_list.c __iconv_get_list.c \ diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile --- a/lib/libcalendar/Makefile +++ b/lib/libcalendar/Makefile @@ -1,4 +1,3 @@ - LIB= calendar SRCS= calendar.c easter.c diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile --- a/lib/libcam/Makefile +++ b/lib/libcam/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= cam diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile --- a/lib/libcam/tests/Makefile +++ b/lib/libcam/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= libcam_test ATF_TESTS_C+= cam_test diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile --- a/lib/libcapsicum/Makefile +++ b/lib/libcapsicum/Makefile @@ -1,4 +1,3 @@ - INCS= capsicum_helpers.h MAN+= capsicum_helpers.3 diff --git a/lib/libcasper/Makefile b/lib/libcasper/Makefile --- a/lib/libcasper/Makefile +++ b/lib/libcasper/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libcasper diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc --- a/lib/libcasper/Makefile.inc +++ b/lib/libcasper/Makefile.inc @@ -1,4 +1,3 @@ - .include .if ${MK_CASPER} != "no" diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime SHLIBDIR?= /lib diff --git a/lib/libcasper/services/Makefile b/lib/libcasper/services/Makefile --- a/lib/libcasper/services/Makefile +++ b/lib/libcasper/services/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= cap_dns diff --git a/lib/libcasper/services/Makefile.inc b/lib/libcasper/services/Makefile.inc --- a/lib/libcasper/services/Makefile.inc +++ b/lib/libcasper/services/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_dns/tests/Makefile b/lib/libcasper/services/cap_dns/tests/Makefile --- a/lib/libcasper/services/cap_dns/tests/Makefile +++ b/lib/libcasper/services/cap_dns/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= dns_test diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_fileargs/tests/Makefile b/lib/libcasper/services/cap_fileargs/tests/Makefile --- a/lib/libcasper/services/cap_fileargs/tests/Makefile +++ b/lib/libcasper/services/cap_fileargs/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= fileargs_test diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_grp/tests/Makefile b/lib/libcasper/services/cap_grp/tests/Makefile --- a/lib/libcasper/services/cap_grp/tests/Makefile +++ b/lib/libcasper/services/cap_grp/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_C= grp_test diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_net/tests/Makefile b/lib/libcasper/services/cap_net/tests/Makefile --- a/lib/libcasper/services/cap_net/tests/Makefile +++ b/lib/libcasper/services/cap_net/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= net_test diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_netdb/tests/Makefile b/lib/libcasper/services/cap_netdb/tests/Makefile --- a/lib/libcasper/services/cap_netdb/tests/Makefile +++ b/lib/libcasper/services/cap_netdb/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= netdb_test diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_pwd/tests/Makefile b/lib/libcasper/services/cap_pwd/tests/Makefile --- a/lib/libcasper/services/cap_pwd/tests/Makefile +++ b/lib/libcasper/services/cap_pwd/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_C= pwd_test diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_sysctl/tests/Makefile b/lib/libcasper/services/cap_sysctl/tests/Makefile --- a/lib/libcasper/services/cap_sysctl/tests/Makefile +++ b/lib/libcasper/services/cap_sysctl/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= sysctl_test diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/tests/Makefile b/lib/libcasper/services/tests/Makefile --- a/lib/libcasper/services/tests/Makefile +++ b/lib/libcasper/services/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/libcasper/tests/Makefile b/lib/libcasper/tests/Makefile --- a/lib/libcasper/tests/Makefile +++ b/lib/libcasper/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/libcbor/Makefile b/lib/libcbor/Makefile --- a/lib/libcbor/Makefile +++ b/lib/libcbor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ssh LIB= cbor PRIVATELIB= diff --git a/lib/libcbor/cbor/cbor_export.h b/lib/libcbor/cbor/cbor_export.h --- a/lib/libcbor/cbor/cbor_export.h +++ b/lib/libcbor/cbor/cbor_export.h @@ -1,4 +1,3 @@ - #ifndef CBOR_EXPORT_H #define CBOR_EXPORT_H diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -1,4 +1,3 @@ - SD_ASAN+= asan SD_ASAN+= asan-preinit SD_ASAN+= asan_cxx diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -1,4 +1,3 @@ - .include PACKAGE= clang diff --git a/lib/libclang_rt/asan-preinit/Makefile b/lib/libclang_rt/asan-preinit/Makefile --- a/lib/libclang_rt/asan-preinit/Makefile +++ b/lib/libclang_rt/asan-preinit/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan-preinit-${CRTARCH} diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile --- a/lib/libclang_rt/asan/Makefile +++ b/lib/libclang_rt/asan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan-${CRTARCH} diff --git a/lib/libclang_rt/asan_cxx/Makefile b/lib/libclang_rt/asan_cxx/Makefile --- a/lib/libclang_rt/asan_cxx/Makefile +++ b/lib/libclang_rt/asan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile --- a/lib/libclang_rt/asan_dynamic/Makefile +++ b/lib/libclang_rt/asan_dynamic/Makefile @@ -1,4 +1,3 @@ - .include SHLIB_NAME= libclang_rt.asan-${CRTARCH}.so diff --git a/lib/libclang_rt/asan_static/Makefile b/lib/libclang_rt/asan_static/Makefile --- a/lib/libclang_rt/asan_static/Makefile +++ b/lib/libclang_rt/asan_static/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan_static-${CRTARCH} diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile --- a/lib/libclang_rt/cfi/Makefile +++ b/lib/libclang_rt/cfi/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.cfi-${CRTARCH} diff --git a/lib/libclang_rt/cfi_diag/Makefile b/lib/libclang_rt/cfi_diag/Makefile --- a/lib/libclang_rt/cfi_diag/Makefile +++ b/lib/libclang_rt/cfi_diag/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.cfi_diag-${CRTARCH} diff --git a/lib/libclang_rt/dd/Makefile b/lib/libclang_rt/dd/Makefile --- a/lib/libclang_rt/dd/Makefile +++ b/lib/libclang_rt/dd/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.dd-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer/Makefile b/lib/libclang_rt/fuzzer/Makefile --- a/lib/libclang_rt/fuzzer/Makefile +++ b/lib/libclang_rt/fuzzer/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer_interceptors/Makefile b/lib/libclang_rt/fuzzer_interceptors/Makefile --- a/lib/libclang_rt/fuzzer_interceptors/Makefile +++ b/lib/libclang_rt/fuzzer_interceptors/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer_interceptors-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer_no_main/Makefile b/lib/libclang_rt/fuzzer_no_main/Makefile --- a/lib/libclang_rt/fuzzer_no_main/Makefile +++ b/lib/libclang_rt/fuzzer_no_main/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer_no_main-${CRTARCH} diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile --- a/lib/libclang_rt/include/Makefile +++ b/lib/libclang_rt/include/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${CRTSRC}/include/sanitizer diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile --- a/lib/libclang_rt/msan/Makefile +++ b/lib/libclang_rt/msan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.msan-${CRTARCH} diff --git a/lib/libclang_rt/msan_cxx/Makefile b/lib/libclang_rt/msan_cxx/Makefile --- a/lib/libclang_rt/msan_cxx/Makefile +++ b/lib/libclang_rt/msan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.msan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile --- a/lib/libclang_rt/profile/Makefile +++ b/lib/libclang_rt/profile/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.profile-${CRTARCH} diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile --- a/lib/libclang_rt/safestack/Makefile +++ b/lib/libclang_rt/safestack/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.safestack-${CRTARCH} diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile --- a/lib/libclang_rt/stats/Makefile +++ b/lib/libclang_rt/stats/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.stats-${CRTARCH} diff --git a/lib/libclang_rt/stats_client/Makefile b/lib/libclang_rt/stats_client/Makefile --- a/lib/libclang_rt/stats_client/Makefile +++ b/lib/libclang_rt/stats_client/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.stats_client-${CRTARCH} diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile --- a/lib/libclang_rt/tsan/Makefile +++ b/lib/libclang_rt/tsan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.tsan-${CRTARCH} diff --git a/lib/libclang_rt/tsan_cxx/Makefile b/lib/libclang_rt/tsan_cxx/Makefile --- a/lib/libclang_rt/tsan_cxx/Makefile +++ b/lib/libclang_rt/tsan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.tsan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_minimal/Makefile b/lib/libclang_rt/ubsan_minimal/Makefile --- a/lib/libclang_rt/ubsan_minimal/Makefile +++ b/lib/libclang_rt/ubsan_minimal/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_minimal-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile --- a/lib/libclang_rt/ubsan_standalone/Makefile +++ b/lib/libclang_rt/ubsan_standalone/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_standalone-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile b/lib/libclang_rt/ubsan_standalone_cxx/Makefile --- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile +++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_standalone_cxx-${CRTARCH} diff --git a/lib/libclang_rt/xray-basic/Makefile b/lib/libclang_rt/xray-basic/Makefile --- a/lib/libclang_rt/xray-basic/Makefile +++ b/lib/libclang_rt/xray-basic/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-basic-${CRTARCH} diff --git a/lib/libclang_rt/xray-fdr/Makefile b/lib/libclang_rt/xray-fdr/Makefile --- a/lib/libclang_rt/xray-fdr/Makefile +++ b/lib/libclang_rt/xray-fdr/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-fdr-${CRTARCH} diff --git a/lib/libclang_rt/xray-profiling/Makefile b/lib/libclang_rt/xray-profiling/Makefile --- a/lib/libclang_rt/xray-profiling/Makefile +++ b/lib/libclang_rt/xray-profiling/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-profiling-${CRTARCH} diff --git a/lib/libclang_rt/xray/Makefile b/lib/libclang_rt/xray/Makefile --- a/lib/libclang_rt/xray/Makefile +++ b/lib/libclang_rt/xray/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-${CRTARCH} diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= com_err diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= compat CFLAGS+=-I${SRCTOP}/lib/libc/locale diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= lib${LIB} diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -1,4 +1,3 @@ - CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile --- a/lib/libcrypt/tests/Makefile +++ b/lib/libcrypt/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= crypt_tests NETBSD_ATF_TESTS_C+= crypt_test diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt diff --git a/lib/libdevctl/Makefile b/lib/libdevctl/Makefile --- a/lib/libdevctl/Makefile +++ b/lib/libdevctl/Makefile @@ -1,4 +1,3 @@ - LIB= devctl SRCS= devctl.c INCS= devctl.h diff --git a/lib/libdevdctl/Makefile b/lib/libdevdctl/Makefile --- a/lib/libdevdctl/Makefile +++ b/lib/libdevdctl/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= devdctl INCS= consumer.h \ event.h \ diff --git a/lib/libdevdctl/tests/Makefile b/lib/libdevdctl/tests/Makefile --- a/lib/libdevdctl/tests/Makefile +++ b/lib/libdevdctl/tests/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/lib/libdevdctl .PATH: ${.CURDIR:H} diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile --- a/lib/libdevinfo/Makefile +++ b/lib/libdevinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch LIB= devinfo SRCS= devinfo.c diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile --- a/lib/libdevstat/Makefile +++ b/lib/libdevstat/Makefile @@ -1,4 +1,3 @@ - LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. diff --git a/lib/libdl/Makefile b/lib/libdl/Makefile --- a/lib/libdl/Makefile +++ b/lib/libdl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=clibs LIB=dl SHLIB_MAJOR=1 diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile --- a/lib/libdpv/Makefile +++ b/lib/libdpv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv LIB= dpv SHLIB_MAJOR= 3 diff --git a/lib/libedit/readline/Makefile b/lib/libedit/readline/Makefile --- a/lib/libedit/readline/Makefile +++ b/lib/libedit/readline/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/libedit/readline INCS= readline.h history.h tilde.h diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libelftc/elftc_version.c b/lib/libelftc/elftc_version.c --- a/lib/libelftc/elftc_version.c +++ b/lib/libelftc/elftc_version.c @@ -1,4 +1,3 @@ - #include #include diff --git a/lib/libevent1/Makefile b/lib/libevent1/Makefile --- a/lib/libevent1/Makefile +++ b/lib/libevent1/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} .PATH: ${SRCTOP}/contrib/pf/libevent diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile --- a/lib/libexecinfo/Makefile +++ b/lib/libexecinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} .include diff --git a/lib/libexecinfo/tests/Makefile b/lib/libexecinfo/tests/Makefile --- a/lib/libexecinfo/tests/Makefile +++ b/lib/libexecinfo/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libexecinfo diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile --- a/lib/libexpat/Makefile +++ b/lib/libexpat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime EXPAT= ${SRCTOP}/contrib/expat diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= fetch diff --git a/lib/libfigpar/Makefile b/lib/libfigpar/Makefile --- a/lib/libfigpar/Makefile +++ b/lib/libfigpar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv LIB= figpar SHLIB_MAJOR= 0 diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile --- a/lib/libgcc_eh/Makefile +++ b/lib/libgcc_eh/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= clibs diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -1,4 +1,3 @@ - COMPILERRTDIR= ${SRCTOP}/contrib/llvm-project/compiler-rt UNWINDINCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/include UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/src diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib diff --git a/lib/libgcc_s/Versions.def b/lib/libgcc_s/Versions.def --- a/lib/libgcc_s/Versions.def +++ b/lib/libgcc_s/Versions.def @@ -1,4 +1,3 @@ - GCC_3.0 { }; diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile --- a/lib/libgeom/Makefile +++ b/lib/libgeom/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= geom diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile --- a/lib/libgpio/Makefile +++ b/lib/libgpio/Makefile @@ -1,4 +1,3 @@ - LIB= gpio SHLIB_MAJOR= 0 diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile --- a/lib/libgssapi/Makefile +++ b/lib/libgssapi/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= gssapi SHLIB_MAJOR= 10 diff --git a/lib/libiconv_modules/BIG5/Makefile b/lib/libiconv_modules/BIG5/Makefile --- a/lib/libiconv_modules/BIG5/Makefile +++ b/lib/libiconv_modules/BIG5/Makefile @@ -1,4 +1,3 @@ - SHLIB= BIG5 SRCS+= citrus_big5.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/DECHanyu/Makefile b/lib/libiconv_modules/DECHanyu/Makefile --- a/lib/libiconv_modules/DECHanyu/Makefile +++ b/lib/libiconv_modules/DECHanyu/Makefile @@ -1,4 +1,3 @@ - SHLIB= DECHanyu SRCS+= citrus_dechanyu.c diff --git a/lib/libiconv_modules/EUC/Makefile b/lib/libiconv_modules/EUC/Makefile --- a/lib/libiconv_modules/EUC/Makefile +++ b/lib/libiconv_modules/EUC/Makefile @@ -1,4 +1,3 @@ - SHLIB= EUC SRCS+= citrus_euc.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/EUCTW/Makefile b/lib/libiconv_modules/EUCTW/Makefile --- a/lib/libiconv_modules/EUCTW/Makefile +++ b/lib/libiconv_modules/EUCTW/Makefile @@ -1,4 +1,3 @@ - SHLIB= EUCTW SRCS+= citrus_euctw.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/GBK2K/Makefile b/lib/libiconv_modules/GBK2K/Makefile --- a/lib/libiconv_modules/GBK2K/Makefile +++ b/lib/libiconv_modules/GBK2K/Makefile @@ -1,4 +1,3 @@ - SHLIB= GBK2K SRCS+= citrus_gbk2k.c CFLAGS.gcc+= --param max-inline-insns-single=16 diff --git a/lib/libiconv_modules/HZ/Makefile b/lib/libiconv_modules/HZ/Makefile --- a/lib/libiconv_modules/HZ/Makefile +++ b/lib/libiconv_modules/HZ/Makefile @@ -1,4 +1,3 @@ - SHLIB= HZ SRCS+= citrus_hz.c diff --git a/lib/libiconv_modules/ISO2022/Makefile b/lib/libiconv_modules/ISO2022/Makefile --- a/lib/libiconv_modules/ISO2022/Makefile +++ b/lib/libiconv_modules/ISO2022/Makefile @@ -1,4 +1,3 @@ - SHLIB= ISO2022 SRCS+= citrus_iso2022.c CFLAGS.gcc+= --param max-inline-insns-single=128 diff --git a/lib/libiconv_modules/JOHAB/Makefile b/lib/libiconv_modules/JOHAB/Makefile --- a/lib/libiconv_modules/JOHAB/Makefile +++ b/lib/libiconv_modules/JOHAB/Makefile @@ -1,4 +1,3 @@ - SHLIB= JOHAB SRCS+= citrus_johab.c CFLAGS.gcc+= --param max-inline-insns-single=16 diff --git a/lib/libiconv_modules/MSKanji/Makefile b/lib/libiconv_modules/MSKanji/Makefile --- a/lib/libiconv_modules/MSKanji/Makefile +++ b/lib/libiconv_modules/MSKanji/Makefile @@ -1,4 +1,3 @@ - SHLIB= MSKanji SRCS+= citrus_mskanji.c diff --git a/lib/libiconv_modules/Makefile b/lib/libiconv_modules/Makefile --- a/lib/libiconv_modules/Makefile +++ b/lib/libiconv_modules/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \ diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv SHLIB_MAJOR= 5 diff --git a/lib/libiconv_modules/UES/Makefile b/lib/libiconv_modules/UES/Makefile --- a/lib/libiconv_modules/UES/Makefile +++ b/lib/libiconv_modules/UES/Makefile @@ -1,4 +1,3 @@ - SHLIB= UES SRCS+= citrus_ues.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF1632/Makefile b/lib/libiconv_modules/UTF1632/Makefile --- a/lib/libiconv_modules/UTF1632/Makefile +++ b/lib/libiconv_modules/UTF1632/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF1632 SRCS+= citrus_utf1632.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF7/Makefile b/lib/libiconv_modules/UTF7/Makefile --- a/lib/libiconv_modules/UTF7/Makefile +++ b/lib/libiconv_modules/UTF7/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF7 SRCS+= citrus_utf7.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF8/Makefile b/lib/libiconv_modules/UTF8/Makefile --- a/lib/libiconv_modules/UTF8/Makefile +++ b/lib/libiconv_modules/UTF8/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF8 SRCS+= citrus_utf8.c diff --git a/lib/libiconv_modules/VIQR/Makefile b/lib/libiconv_modules/VIQR/Makefile --- a/lib/libiconv_modules/VIQR/Makefile +++ b/lib/libiconv_modules/VIQR/Makefile @@ -1,4 +1,3 @@ - SHLIB= VIQR SRCS+= citrus_viqr.c diff --git a/lib/libiconv_modules/ZW/Makefile b/lib/libiconv_modules/ZW/Makefile --- a/lib/libiconv_modules/ZW/Makefile +++ b/lib/libiconv_modules/ZW/Makefile @@ -1,4 +1,3 @@ - SHLIB= ZW SRCS+= citrus_zw.c diff --git a/lib/libiconv_modules/iconv_none/Makefile b/lib/libiconv_modules/iconv_none/Makefile --- a/lib/libiconv_modules/iconv_none/Makefile +++ b/lib/libiconv_modules/iconv_none/Makefile @@ -1,4 +1,3 @@ - SHLIB= iconv_none SRCS+= citrus_iconv_none.c diff --git a/lib/libiconv_modules/iconv_std/Makefile b/lib/libiconv_modules/iconv_std/Makefile --- a/lib/libiconv_modules/iconv_std/Makefile +++ b/lib/libiconv_modules/iconv_std/Makefile @@ -1,4 +1,3 @@ - SHLIB= iconv_std SRCS+= citrus_iconv_std.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/mapper_646/Makefile b/lib/libiconv_modules/mapper_646/Makefile --- a/lib/libiconv_modules/mapper_646/Makefile +++ b/lib/libiconv_modules/mapper_646/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_646 SRCS= citrus_mapper_646.c diff --git a/lib/libiconv_modules/mapper_none/Makefile b/lib/libiconv_modules/mapper_none/Makefile --- a/lib/libiconv_modules/mapper_none/Makefile +++ b/lib/libiconv_modules/mapper_none/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_none SRCS+= citrus_mapper_none.c diff --git a/lib/libiconv_modules/mapper_parallel/Makefile b/lib/libiconv_modules/mapper_parallel/Makefile --- a/lib/libiconv_modules/mapper_parallel/Makefile +++ b/lib/libiconv_modules/mapper_parallel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/mapper_serial SHLIB= mapper_parallel diff --git a/lib/libiconv_modules/mapper_serial/Makefile b/lib/libiconv_modules/mapper_serial/Makefile --- a/lib/libiconv_modules/mapper_serial/Makefile +++ b/lib/libiconv_modules/mapper_serial/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_serial SRCS+= citrus_mapper_serial.c CFLAGS.gcc+= --param max-inline-insns-single=32 diff --git a/lib/libiconv_modules/mapper_std/Makefile b/lib/libiconv_modules/mapper_std/Makefile --- a/lib/libiconv_modules/mapper_std/Makefile +++ b/lib/libiconv_modules/mapper_std/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_std SRCS+= citrus_mapper_std.c CFLAGS.gcc+= --param max-inline-insns-single=8 diff --git a/lib/libiconv_modules/mapper_zone/Makefile b/lib/libiconv_modules/mapper_zone/Makefile --- a/lib/libiconv_modules/mapper_zone/Makefile +++ b/lib/libiconv_modules/mapper_zone/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_zone SRCS+= citrus_mapper_zone.c CFLAGS.gcc+= --param max-inline-insns-single=8 diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile --- a/lib/libifconfig/Makefile +++ b/lib/libifconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= ifconfig INTERNALLIB= true diff --git a/lib/libipt/Makefile b/lib/libipt/Makefile --- a/lib/libipt/Makefile +++ b/lib/libipt/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SHLIBDIR?= /lib diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile --- a/lib/libjail/Makefile +++ b/lib/libjail/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= jail SHLIBDIR?= /lib diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -1,4 +1,3 @@ - LIB= kvm PACKAGE= runtime diff --git a/lib/libkvm/tests/Makefile b/lib/libkvm/tests/Makefile --- a/lib/libkvm/tests/Makefile +++ b/lib/libkvm/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= kvm_close_test diff --git a/lib/libldns/Makefile b/lib/libldns/Makefile --- a/lib/libldns/Makefile +++ b/lib/libldns/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR = ${SRCTOP}/contrib/ldns diff --git a/lib/liblua/Makefile b/lib/liblua/Makefile --- a/lib/liblua/Makefile +++ b/lib/liblua/Makefile @@ -1,4 +1,3 @@ - LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} diff --git a/lib/liblutok/Makefile b/lib/liblutok/Makefile --- a/lib/liblutok/Makefile +++ b/lib/liblutok/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= lutok INTERNALLIB= diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= lzma LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma diff --git a/lib/liblzma/Versions.def b/lib/liblzma/Versions.def --- a/lib/liblzma/Versions.def +++ b/lib/liblzma/Versions.def @@ -1,4 +1,3 @@ - XZ_5.0 { }; diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libmd/md5.h b/lib/libmd/md5.h --- a/lib/libmd/md5.h +++ b/lib/libmd/md5.h @@ -1,4 +1,3 @@ - #ifndef _MD5_H_ #define _MD5_H_ diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile --- a/lib/libmemstat/Makefile +++ b/lib/libmemstat/Makefile @@ -1,4 +1,3 @@ - WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/lib/libmixer/Makefile b/lib/libmixer/Makefile --- a/lib/libmixer/Makefile +++ b/lib/libmixer/Makefile @@ -1,4 +1,3 @@ - LIB= mixer SRCS= ${LIB}.c INCS= ${LIB}.h diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile --- a/lib/libmp/Makefile +++ b/lib/libmp/Makefile @@ -1,4 +1,3 @@ - .include LIB= mp diff --git a/lib/libmp/mp.h b/lib/libmp/mp.h --- a/lib/libmp/mp.h +++ b/lib/libmp/mp.h @@ -1,4 +1,3 @@ - #ifndef _MP_H_ #define _MP_H_ diff --git a/lib/libmp/tests/Makefile b/lib/libmp/tests/Makefile --- a/lib/libmp/tests/Makefile +++ b/lib/libmp/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= legacy_test WARNS?= 3 diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile --- a/lib/libmt/Makefile +++ b/lib/libmt/Makefile @@ -1,4 +1,3 @@ - LIB= mt SHLIBDIR?= /lib SRCS= mtlib.c diff --git a/lib/libnetbsd/Makefile b/lib/libnetbsd/Makefile --- a/lib/libnetbsd/Makefile +++ b/lib/libnetbsd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libnetbsd/README b/lib/libnetbsd/README --- a/lib/libnetbsd/README +++ b/lib/libnetbsd/README @@ -1,4 +1,3 @@ - libnetbsd is a thin compatibility layer intended to allow a limited set of NetBSD software to compile as part of the FreeBSD build with little or no modification. It is built as a static library and not diff --git a/lib/libnetbsd/netinet/in.h b/lib/libnetbsd/netinet/in.h --- a/lib/libnetbsd/netinet/in.h +++ b/lib/libnetbsd/netinet/in.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1982, 1986, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/lib/libnetbsd/rmd160.h b/lib/libnetbsd/rmd160.h --- a/lib/libnetbsd/rmd160.h +++ b/lib/libnetbsd/rmd160.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/lib/libnetbsd/sha1.h b/lib/libnetbsd/sha1.h --- a/lib/libnetbsd/sha1.h +++ b/lib/libnetbsd/sha1.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/lib/libnetbsd/sha2.h b/lib/libnetbsd/sha2.h --- a/lib/libnetbsd/sha2.h +++ b/lib/libnetbsd/sha2.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h --- a/lib/libnetbsd/stdlib.h +++ b/lib/libnetbsd/stdlib.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h --- a/lib/libnetbsd/util.h +++ b/lib/libnetbsd/util.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h --- a/lib/libnetgraph/internal.h +++ b/lib/libnetgraph/internal.h @@ -1,4 +1,3 @@ - /* * internal.h * diff --git a/lib/libnetgraph/netgraph.h b/lib/libnetgraph/netgraph.h --- a/lib/libnetgraph/netgraph.h +++ b/lib/libnetgraph/netgraph.h @@ -1,4 +1,3 @@ - /* * netgraph.h * diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile --- a/lib/libnv/Makefile +++ b/lib/libnv/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libnv/Version.map b/lib/libnv/Version.map --- a/lib/libnv/Version.map +++ b/lib/libnv/Version.map @@ -1,4 +1,3 @@ - FBSD_1.7 { global: FreeBSD_cnvlist_free_binary; diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile --- a/lib/libnv/tests/Makefile +++ b/lib/libnv/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C= \ nvlist_send_recv_test diff --git a/lib/libomp/Makefile b/lib/libomp/Makefile --- a/lib/libomp/Makefile +++ b/lib/libomp/Makefile @@ -1,4 +1,3 @@ - .include SHLIB_NAME= libomp.so diff --git a/lib/libopenbsd/Makefile b/lib/libopenbsd/Makefile --- a/lib/libopenbsd/Makefile +++ b/lib/libopenbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= openbsd SRCS= imsg-buffer.c \ diff --git a/lib/libopenbsd/README b/lib/libopenbsd/README --- a/lib/libopenbsd/README +++ b/lib/libopenbsd/README @@ -1,4 +1,3 @@ - libopenbsd is a thin compatibility layer intended to allow a limited set of OpenBSD software to compile as part of the FreeBSD build with little or no modification. It is built as a static library and not diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SHLIBDIR?= /lib diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -1,4 +1,3 @@ - PAMDIR= ${SRCTOP}/contrib/openpam MK_INSTALLLIB= no diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -1,4 +1,3 @@ - .include MODULES = diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile --- a/lib/libpam/modules/pam_chroot/Makefile +++ b/lib/libpam/modules/pam_chroot/Makefile @@ -1,4 +1,3 @@ - LIB= pam_chroot SRCS= pam_chroot.c MAN= pam_chroot.8 diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile --- a/lib/libpam/modules/pam_echo/Makefile +++ b/lib/libpam/modules/pam_echo/Makefile @@ -1,4 +1,3 @@ - LIB= pam_echo SRCS= pam_echo.c MAN= pam_echo.8 diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile --- a/lib/libpam/modules/pam_exec/Makefile +++ b/lib/libpam/modules/pam_exec/Makefile @@ -1,4 +1,3 @@ - LIB= pam_exec SRCS= pam_exec.c MAN= pam_exec.8 diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile --- a/lib/libpam/modules/pam_ftpusers/Makefile +++ b/lib/libpam/modules/pam_ftpusers/Makefile @@ -1,4 +1,3 @@ - LIB= pam_ftpusers SRCS= pam_ftpusers.c MAN= pam_ftpusers.8 diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile --- a/lib/libpam/modules/pam_group/Makefile +++ b/lib/libpam/modules/pam_group/Makefile @@ -1,4 +1,3 @@ - LIB= pam_group SRCS= pam_group.c MAN= pam_group.8 diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile --- a/lib/libpam/modules/pam_guest/Makefile +++ b/lib/libpam/modules/pam_guest/Makefile @@ -1,4 +1,3 @@ - LIB= pam_guest SRCS= pam_guest.c MAN= pam_guest.8 diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,4 +1,3 @@ - SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile --- a/lib/libpam/modules/pam_rhosts/Makefile +++ b/lib/libpam/modules/pam_rhosts/Makefile @@ -1,4 +1,3 @@ - LIB= pam_rhosts SRCS= pam_rhosts.c MAN= pam_rhosts.8 diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libpam/pam.d/README b/lib/libpam/pam.d/README --- a/lib/libpam/pam.d/README +++ b/lib/libpam/pam.d/README @@ -1,4 +1,3 @@ - This directory contains configuration files for the Pluggable Authentication Modules (PAM) library. diff --git a/lib/libpathconv/Makefile b/lib/libpathconv/Makefile --- a/lib/libpathconv/Makefile +++ b/lib/libpathconv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libpathconv/tests/Makefile b/lib/libpathconv/tests/Makefile --- a/lib/libpathconv/tests/Makefile +++ b/lib/libpathconv/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= abs2rel TAP_TESTS_C+= rel2abs diff --git a/lib/libpfctl/Makefile b/lib/libpfctl/Makefile --- a/lib/libpfctl/Makefile +++ b/lib/libpfctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= pfctl INTERNALLIB= true diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= pmc SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc diff --git a/lib/libpmc/Makefile.inc b/lib/libpmc/Makefile.inc --- a/lib/libpmc/Makefile.inc +++ b/lib/libpmc/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 3 diff --git a/lib/libpmc/pmu-events/Makefile b/lib/libpmc/pmu-events/Makefile --- a/lib/libpmc/pmu-events/Makefile +++ b/lib/libpmc/pmu-events/Makefile @@ -1,4 +1,3 @@ - PROG= jevents SRCS= jevents.c jsmn.c json.c CFLAGS+= -Wno-cast-qual diff --git a/lib/libpmc/pmu-events/README b/lib/libpmc/pmu-events/README --- a/lib/libpmc/pmu-events/README +++ b/lib/libpmc/pmu-events/README @@ -1,4 +1,3 @@ - The contents of this directory allow users to specify PMU events in their CPUs by their symbolic names rather than raw event codes (see example below). diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -1,4 +1,3 @@ - .include LIB= proc diff --git a/lib/libproc/Makefile.inc b/lib/libproc/Makefile.inc --- a/lib/libproc/Makefile.inc +++ b/lib/libproc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile --- a/lib/libproc/tests/Makefile +++ b/lib/libproc/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= proc_test PROGS= target_prog diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -1,4 +1,3 @@ - .include LIB= procstat diff --git a/lib/libprocstat/zfs/Makefile b/lib/libprocstat/zfs/Makefile --- a/lib/libprocstat/zfs/Makefile +++ b/lib/libprocstat/zfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} SRCS= zfs_defs.c diff --git a/lib/libregex/Makefile b/lib/libregex/Makefile --- a/lib/libregex/Makefile +++ b/lib/libregex/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libregex/Versions.def b/lib/libregex/Versions.def --- a/lib/libregex/Versions.def +++ b/lib/libregex/Versions.def @@ -1,4 +1,3 @@ - LIBREGEX_1.0 { }; diff --git a/lib/libregex/tests/Makefile b/lib/libregex/tests/Makefile --- a/lib/libregex/tests/Makefile +++ b/lib/libregex/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/regex diff --git a/lib/librpcsec_gss/Makefile b/lib/librpcsec_gss/Makefile --- a/lib/librpcsec_gss/Makefile +++ b/lib/librpcsec_gss/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= rpcsec_gss SHLIB_MAJOR= 1 diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/include/rpcsvc diff --git a/lib/librss/Makefile b/lib/librss/Makefile --- a/lib/librss/Makefile +++ b/lib/librss/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} SHLIBDIR?= /lib diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile --- a/lib/librt/tests/Makefile +++ b/lib/librt/tests/Makefile @@ -1,4 +1,3 @@ - LIBADD= rt NETBSD_ATF_TESTS_C= sched_test diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile --- a/lib/librtld_db/Makefile +++ b/lib/librtld_db/Makefile @@ -1,4 +1,3 @@ - .include LIB= rtld_db diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile --- a/lib/libsbuf/Makefile +++ b/lib/libsbuf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= sbuf diff --git a/lib/libsbuf/Version.def b/lib/libsbuf/Version.def --- a/lib/libsbuf/Version.def +++ b/lib/libsbuf/Version.def @@ -1,4 +1,3 @@ - FBSD_1.2 { }; diff --git a/lib/libsbuf/tests/Makefile b/lib/libsbuf/tests/Makefile --- a/lib/libsbuf/tests/Makefile +++ b/lib/libsbuf/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= sbuf_core_test ATF_TESTS_C+= sbuf_stdio_test ATF_TESTS_C+= sbuf_string_test diff --git a/lib/libsecureboot/Makefile b/lib/libsecureboot/Makefile --- a/lib/libsecureboot/Makefile +++ b/lib/libsecureboot/Makefile @@ -1,4 +1,3 @@ - .include LIB= secureboot diff --git a/lib/libsecureboot/Makefile.inc b/lib/libsecureboot/Makefile.inc --- a/lib/libsecureboot/Makefile.inc +++ b/lib/libsecureboot/Makefile.inc @@ -1,4 +1,3 @@ - .if empty(BEARSSL) .include "../libbearssl/Makefile.inc" .endif diff --git a/lib/libsecureboot/Makefile.libsa.inc b/lib/libsecureboot/Makefile.libsa.inc --- a/lib/libsecureboot/Makefile.libsa.inc +++ b/lib/libsecureboot/Makefile.libsa.inc @@ -1,4 +1,3 @@ - BRSSL_CFLAGS+= -DNO_STDIO .include "Makefile.inc" diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -1,4 +1,3 @@ - # Consider this file an example. # # For Junos this is how we obtain trust anchor .pems diff --git a/lib/libsecureboot/openpgp/Makefile.inc b/lib/libsecureboot/openpgp/Makefile.inc --- a/lib/libsecureboot/openpgp/Makefile.inc +++ b/lib/libsecureboot/openpgp/Makefile.inc @@ -1,4 +1,3 @@ - # decode OpenPGP signatures per rfc4880 .PATH: ${.PARSEDIR} diff --git a/lib/libsecureboot/tests/Makefile b/lib/libsecureboot/tests/Makefile --- a/lib/libsecureboot/tests/Makefile +++ b/lib/libsecureboot/tests/Makefile @@ -1,4 +1,3 @@ - .include PROG= tvo diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -1,4 +1,3 @@ - .include CONFS= nsmb.conf diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libsqlite3/Makefile b/lib/libsqlite3/Makefile --- a/lib/libsqlite3/Makefile +++ b/lib/libsqlite3/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} PRIVATELIB= yes LIB= sqlite3 diff --git a/lib/libssp/Makefile b/lib/libssp/Makefile --- a/lib/libssp/Makefile +++ b/lib/libssp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib SHLIB= ssp diff --git a/lib/libssp/Versions.def b/lib/libssp/Versions.def --- a/lib/libssp/Versions.def +++ b/lib/libssp/Versions.def @@ -1,3 +1,2 @@ - LIBSSP_1.0 { }; diff --git a/lib/libssp_nonshared/Makefile b/lib/libssp_nonshared/Makefile --- a/lib/libssp_nonshared/Makefile +++ b/lib/libssp_nonshared/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs LIB= ssp_nonshared NO_PIC= diff --git a/lib/libstats/Makefile b/lib/libstats/Makefile --- a/lib/libstats/Makefile +++ b/lib/libstats/Makefile @@ -1,4 +1,3 @@ - LIB= stats SHLIBDIR?= /lib SHLIB_MAJOR= 0 diff --git a/lib/libstdbuf/Makefile b/lib/libstdbuf/Makefile --- a/lib/libstdbuf/Makefile +++ b/lib/libstdbuf/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libstdthreads/Makefile b/lib/libstdthreads/Makefile --- a/lib/libstdthreads/Makefile +++ b/lib/libstdthreads/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= stdthreads SHLIB_MAJOR= 0 diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -1,4 +1,3 @@ - .include LIB= sysdecode diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libthr/arch/aarch64/Makefile.inc b/lib/libthr/arch/aarch64/Makefile.inc --- a/lib/libthr/arch/aarch64/Makefile.inc +++ b/lib/libthr/arch/aarch64/Makefile.inc @@ -1 +0,0 @@ - diff --git a/lib/libthr/arch/amd64/Makefile.inc b/lib/libthr/arch/amd64/Makefile.inc --- a/lib/libthr/arch/amd64/Makefile.inc +++ b/lib/libthr/arch/amd64/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _umtx_op_err.S # With the current compiler and libthr code, using SSE in libthr diff --git a/lib/libthr/arch/i386/Makefile.inc b/lib/libthr/arch/i386/Makefile.inc --- a/lib/libthr/arch/i386/Makefile.inc +++ b/lib/libthr/arch/i386/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _umtx_op_err.S # With the current compiler and libthr code, using SSE in libthr diff --git a/lib/libthr/arch/powerpc/Makefile.inc b/lib/libthr/arch/powerpc/Makefile.inc --- a/lib/libthr/arch/powerpc/Makefile.inc +++ b/lib/libthr/arch/powerpc/Makefile.inc @@ -1,2 +1 @@ - SRCS+= _umtx_op_err.S diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc --- a/lib/libthr/sys/Makefile.inc +++ b/lib/libthr/sys/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/sys SRCS+= thr_error.c diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile --- a/lib/libthr/tests/Makefile +++ b/lib/libthr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 3 diff --git a/lib/libthr/tests/dlopen/Makefile b/lib/libthr/tests/dlopen/Makefile --- a/lib/libthr/tests/dlopen/Makefile +++ b/lib/libthr/tests/dlopen/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen WARNS?= 2 diff --git a/lib/libthr/tests/dlopen/dso/Makefile b/lib/libthr/tests/dlopen/dso/Makefile --- a/lib/libthr/tests/dlopen/dso/Makefile +++ b/lib/libthr/tests/dlopen/dso/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso WARNS?= 3 diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc --- a/lib/libthr/thread/Makefile.inc +++ b/lib/libthr/thread/Makefile.inc @@ -1,4 +1,3 @@ - # thr sources .PATH: ${.CURDIR}/thread diff --git a/lib/libthread_db/Makefile b/lib/libthread_db/Makefile --- a/lib/libthread_db/Makefile +++ b/lib/libthread_db/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH} PACKAGE=lib${LIB} diff --git a/lib/libucl/Makefile b/lib/libucl/Makefile --- a/lib/libucl/Makefile +++ b/lib/libucl/Makefile @@ -1,4 +1,3 @@ - LIBUCL_DIR= ${SRCTOP}/contrib/libucl PACKAGE=lib${LIB} diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ufs LIB= ufs SHLIBDIR?= /lib diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile --- a/lib/libugidfw/Makefile +++ b/lib/libugidfw/Makefile @@ -1,4 +1,3 @@ - LIB= ugidfw SHLIB_MAJOR= 5 SRCS= ugidfw.c diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?=/lib .include diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile --- a/lib/libutil/tests/Makefile +++ b/lib/libutil/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test diff --git a/lib/libveriexec/Makefile b/lib/libveriexec/Makefile --- a/lib/libveriexec/Makefile +++ b/lib/libveriexec/Makefile @@ -1,4 +1,3 @@ - .include LIB= veriexec diff --git a/lib/libvmmapi/Makefile b/lib/libvmmapi/Makefile --- a/lib/libvmmapi/Makefile +++ b/lib/libvmmapi/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= vmmapi SHLIB_MAJOR= 6 diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile --- a/lib/libxo/Makefile +++ b/lib/libxo/Makefile @@ -1,4 +1,3 @@ - .include HAS_TESTS= diff --git a/lib/libxo/encoder/Makefile b/lib/libxo/encoder/Makefile --- a/lib/libxo/encoder/Makefile +++ b/lib/libxo/encoder/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libxo/encoder/csv/Makefile b/lib/libxo/encoder/csv/Makefile --- a/lib/libxo/encoder/csv/Makefile +++ b/lib/libxo/encoder/csv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libxo/libxo/Makefile b/lib/libxo/libxo/Makefile --- a/lib/libxo/libxo/Makefile +++ b/lib/libxo/libxo/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile --- a/lib/libxo/tests/Makefile +++ b/lib/libxo/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile --- a/lib/libxo/tests/encoder/Makefile +++ b/lib/libxo/tests/encoder/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/lib/liby/Makefile b/lib/liby/Makefile --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= y SRCS= main.c yyerror.c diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile --- a/lib/libypclnt/Makefile +++ b/lib/libypclnt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= ypclnt SHLIB_MAJOR= 4 diff --git a/lib/libz/Versions.def b/lib/libz/Versions.def --- a/lib/libz/Versions.def +++ b/lib/libz/Versions.def @@ -1,4 +1,3 @@ - ZLIB_1.2.4.0 { }; diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -1,4 +1,3 @@ - LIB= zstd SRCS= entropy_common.c \ error_private.c \ diff --git a/lib/msun/aarch64/Makefile.inc b/lib/msun/aarch64/Makefile.inc --- a/lib/msun/aarch64/Makefile.inc +++ b/lib/msun/aarch64/Makefile.inc @@ -1,4 +1,3 @@ - LDBL_PREC = 113 # Use a builtin when it generates the needed instruction diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc --- a/lib/msun/amd64/Makefile.inc +++ b/lib/msun/amd64/Makefile.inc @@ -1,4 +1,3 @@ - ARCH_SRCS = e_fmod.S e_fmodf.S e_fmodl.S \ e_remainder.S e_remainderf.S e_remainderl.S \ e_sqrt.S e_sqrtf.S e_sqrtl.S \ diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc --- a/lib/msun/arm/Makefile.inc +++ b/lib/msun/arm/Makefile.inc @@ -1,4 +1,3 @@ - LDBL_PREC = 53 SYM_MAPS += ${.CURDIR}/arm/Symbol.map diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc --- a/lib/msun/i387/Makefile.inc +++ b/lib/msun/i387/Makefile.inc @@ -1,4 +1,3 @@ - ARCH_SRCS = e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_sqrt.S s_ceil.S s_copysign.S \ s_finite.S s_floor.S s_llrint.S s_logb.S s_lrint.S \ diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc --- a/lib/msun/powerpc/Makefile.inc +++ b/lib/msun/powerpc/Makefile.inc @@ -1,3 +1,2 @@ - LDBL_PREC = 53 SYM_MAPS += ${.CURDIR}/powerpc/Symbol.map diff --git a/lib/msun/riscv/Makefile.inc b/lib/msun/riscv/Makefile.inc --- a/lib/msun/riscv/Makefile.inc +++ b/lib/msun/riscv/Makefile.inc @@ -1,3 +1,2 @@ - LDBL_PREC = 113 SYM_MAPS += ${.CURDIR}/riscv/Symbol.map diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_acosl.c b/lib/msun/src/e_acosl.c --- a/lib/msun/src/e_acosl.c +++ b/lib/msun/src/e_acosl.c @@ -1,4 +1,3 @@ - /* FreeBSD: head/lib/msun/src/e_acos.c 176451 2008-02-22 02:30:36Z das */ /* * ==================================================== diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c --- a/lib/msun/src/e_asin.c +++ b/lib/msun/src/e_asin.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_asinl.c b/lib/msun/src/e_asinl.c --- a/lib/msun/src/e_asinl.c +++ b/lib/msun/src/e_asinl.c @@ -1,4 +1,3 @@ - /* FreeBSD: head/lib/msun/src/e_asin.c 176451 2008-02-22 02:30:36Z das */ /* * ==================================================== diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_atan2l.c b/lib/msun/src/e_atan2l.c --- a/lib/msun/src/e_atan2l.c +++ b/lib/msun/src/e_atan2l.c @@ -1,4 +1,3 @@ - /* FreeBSD: head/lib/msun/src/e_atan2.c 176451 2008-02-22 02:30:36Z das */ /* * ==================================================== diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c --- a/lib/msun/src/e_hypot.c +++ b/lib/msun/src/e_hypot.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c --- a/lib/msun/src/e_lgamma.c +++ b/lib/msun/src/e_lgamma.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c --- a/lib/msun/src/e_log.c +++ b/lib/msun/src/e_log.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c --- a/lib/msun/src/e_log10.c +++ b/lib/msun/src/e_log10.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_log2.c b/lib/msun/src/e_log2.c --- a/lib/msun/src/e_log2.c +++ b/lib/msun/src/e_log2.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c --- a/lib/msun/src/e_rem_pio2.c +++ b/lib/msun/src/e_rem_pio2.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c --- a/lib/msun/src/e_remainder.c +++ b/lib/msun/src/e_remainder.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c --- a/lib/msun/src/e_scalb.c +++ b/lib/msun/src/e_scalb.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c --- a/lib/msun/src/e_sinh.c +++ b/lib/msun/src/e_sinh.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c --- a/lib/msun/src/e_sqrt.c +++ b/lib/msun/src/e_sqrt.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c --- a/lib/msun/src/k_cos.c +++ b/lib/msun/src/k_cos.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/k_log.h b/lib/msun/src/k_log.h --- a/lib/msun/src/k_log.h +++ b/lib/msun/src/k_log.h @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c --- a/lib/msun/src/k_rem_pio2.c +++ b/lib/msun/src/k_rem_pio2.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c --- a/lib/msun/src/k_sin.c +++ b/lib/msun/src/k_sin.c @@ -1,4 +1,3 @@ - /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile --- a/lib/msun/tests/Makefile +++ b/lib/msun/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile --- a/lib/ncurses/Makefile +++ b/lib/ncurses/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tinfo ncurses form menu panel SUBDIR_PARALLEL= diff --git a/lib/ncurses/Makefile.inc b/lib/ncurses/Makefile.inc --- a/lib/ncurses/Makefile.inc +++ b/lib/ncurses/Makefile.inc @@ -1,4 +1,3 @@ - # This is to include src/lib/Makefile.inc WARNS?= 3 diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk --- a/lib/ncurses/config.mk +++ b/lib/ncurses/config.mk @@ -1,4 +1,3 @@ - # This Makefile is shared by libncurses, libform, libmenu, libpanel. NCURSES_DIR= ${SRCTOP}/contrib/ncurses diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/ofed/Makefile b/lib/ofed/Makefile --- a/lib/ofed/Makefile +++ b/lib/ofed/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ include \ libibverbs \ diff --git a/lib/ofed/Makefile.inc b/lib/ofed/Makefile.inc --- a/lib/ofed/Makefile.inc +++ b/lib/ofed/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 0 diff --git a/lib/ofed/complib/Makefile b/lib/ofed/complib/Makefile --- a/lib/ofed/complib/Makefile +++ b/lib/ofed/complib/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/complib .PATH: ${_spath} diff --git a/lib/ofed/include/Makefile b/lib/ofed/include/Makefile --- a/lib/ofed/include/Makefile +++ b/lib/ofed/include/Makefile @@ -1,4 +1,3 @@ - OFEDINCS= ${SRCTOP}/contrib/ofed/include IBVERBS= ${SRCTOP}/contrib/ofed/libibverbs IBMAD= ${SRCTOP}/contrib/ofed/libibmad diff --git a/lib/ofed/libcxgb4/Makefile b/lib/ofed/libcxgb4/Makefile --- a/lib/ofed/libcxgb4/Makefile +++ b/lib/ofed/libcxgb4/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libcxgb4 .PATH: ${_spath} diff --git a/lib/ofed/libibcm/Makefile b/lib/ofed/libibcm/Makefile --- a/lib/ofed/libibcm/Makefile +++ b/lib/ofed/libibcm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibcm .PATH: ${_spath} diff --git a/lib/ofed/libibmad/Makefile b/lib/ofed/libibmad/Makefile --- a/lib/ofed/libibmad/Makefile +++ b/lib/ofed/libibmad/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibmad .PATH: ${_spath} diff --git a/lib/ofed/libibnetdisc/Makefile b/lib/ofed/libibnetdisc/Makefile --- a/lib/ofed/libibnetdisc/Makefile +++ b/lib/ofed/libibnetdisc/Makefile @@ -1,4 +1,3 @@ - .include _spath= ${SRCTOP}/contrib/ofed/libibnetdisc diff --git a/lib/ofed/libibumad/Makefile b/lib/ofed/libibumad/Makefile --- a/lib/ofed/libibumad/Makefile +++ b/lib/ofed/libibumad/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibumad .PATH: ${_spath} diff --git a/lib/ofed/libibverbs/Makefile b/lib/ofed/libibverbs/Makefile --- a/lib/ofed/libibverbs/Makefile +++ b/lib/ofed/libibverbs/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibverbs .PATH: ${_spath} ${_spath}/man diff --git a/lib/ofed/libmlx4/Makefile b/lib/ofed/libmlx4/Makefile --- a/lib/ofed/libmlx4/Makefile +++ b/lib/ofed/libmlx4/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libmlx4 .PATH: ${_spath} diff --git a/lib/ofed/libmlx5/Makefile b/lib/ofed/libmlx5/Makefile --- a/lib/ofed/libmlx5/Makefile +++ b/lib/ofed/libmlx5/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libmlx5 .PATH: ${_spath} diff --git a/lib/ofed/libopensm/Makefile b/lib/ofed/libopensm/Makefile --- a/lib/ofed/libopensm/Makefile +++ b/lib/ofed/libopensm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/opensm .PATH: ${_spath} diff --git a/lib/ofed/librdmacm/Makefile b/lib/ofed/librdmacm/Makefile --- a/lib/ofed/librdmacm/Makefile +++ b/lib/ofed/librdmacm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/librdmacm .PATH: ${_spath} ${_spath}/man diff --git a/lib/ofed/libvendor/Makefile b/lib/ofed/libvendor/Makefile --- a/lib/ofed/libvendor/Makefile +++ b/lib/ofed/libvendor/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/libvendor .PATH: ${_spath} diff --git a/lib/tests/Makefile b/lib/tests/Makefile --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/Makefile b/libexec/Makefile --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/libexec WFORMAT?= 1 diff --git a/libexec/atf/atf-check/Makefile.inc b/libexec/atf/atf-check/Makefile.inc --- a/libexec/atf/atf-check/Makefile.inc +++ b/libexec/atf/atf-check/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -1,4 +1,3 @@ - ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF= ${SRCTOP}/contrib/atf diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL --- a/libexec/atrun/LEGAL +++ b/libexec/atrun/LEGAL @@ -1,4 +1,3 @@ - -----BEGIN PGP SIGNED MESSAGE----- Sorry for the long wait, but there still were a few things to diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -1,4 +1,3 @@ - PACKAGE=at MAINSRC=${SRCTOP}/usr.bin/at diff --git a/libexec/blacklistd-helper/Makefile b/libexec/blacklistd-helper/Makefile --- a/libexec/blacklistd-helper/Makefile +++ b/libexec/blacklistd-helper/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist SCRIPTS= ${BLOCKLIST_DIR}/libexec/blacklistd-helper diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce --- a/libexec/bootpd/Announce +++ b/libexec/bootpd/Announce @@ -1,4 +1,3 @@ - This is an enhanced version of the CMU BOOTP server which was derived from the original BOOTP server created by Bill Croft at Stanford. This version merges most of the enhancements and bug-fixes from the diff --git a/libexec/bootpd/Changes b/libexec/bootpd/Changes --- a/libexec/bootpd/Changes +++ b/libexec/bootpd/Changes @@ -1,4 +1,3 @@ - Changes, most recent first Date, Real Name what... diff --git a/libexec/bootpd/Installation b/libexec/bootpd/Installation --- a/libexec/bootpd/Installation +++ b/libexec/bootpd/Installation @@ -1,4 +1,3 @@ - Installation instructions for SunOS Compile the executable: diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc --- a/libexec/bootpd/Makefile.inc +++ b/libexec/bootpd/Makefile.inc @@ -1,4 +1,3 @@ - WARNS?= 1 .include "../Makefile.inc" diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems --- a/libexec/bootpd/Problems +++ b/libexec/bootpd/Problems @@ -1,4 +1,3 @@ - Common problems and ways to work around them: Bootpd complains: "bind: Address already in use" and fails to start. diff --git a/libexec/bootpd/README b/libexec/bootpd/README --- a/libexec/bootpd/README +++ b/libexec/bootpd/README @@ -1,4 +1,3 @@ - This is an enhanced version of the CMU BOOTP server which was derived from the original BOOTP server created by Bill Croft at Stanford. This version merges all the enhancements and bug-fixes from the diff --git a/libexec/bootpd/report.c b/libexec/bootpd/report.c --- a/libexec/bootpd/report.c +++ b/libexec/bootpd/report.c @@ -1,4 +1,3 @@ - /* * report() - calls syslog */ diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile --- a/libexec/comsat/Makefile +++ b/libexec/comsat/Makefile @@ -1,4 +1,3 @@ - PROG= comsat MAN= comsat.8 diff --git a/libexec/dma/Makefile b/libexec/dma/Makefile --- a/libexec/dma/Makefile +++ b/libexec/dma/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dmagent \ dma-mbox-create diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc --- a/libexec/dma/Makefile.inc +++ b/libexec/dma/Makefile.inc @@ -1,4 +1,3 @@ - .sinclude "${.CURDIR:H:H}/Makefile.inc" DMA_SOURCES= ${SRCTOP}/contrib/dma .PATH: ${DMA_SOURCES} diff --git a/libexec/dma/dma-mbox-create/Makefile b/libexec/dma/dma-mbox-create/Makefile --- a/libexec/dma/dma-mbox-create/Makefile +++ b/libexec/dma/dma-mbox-create/Makefile @@ -1,4 +1,3 @@ - MAN= WARNS?= 2 diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -1,4 +1,3 @@ - .include LIBADD= ssl crypto diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -1,4 +1,3 @@ - .include PROG= fingerd diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,4 +1,3 @@ - .include LUASRC?= ${SRCTOP}/contrib/lua/src diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ftpd diff --git a/libexec/ftpd/config.h b/libexec/ftpd/config.h --- a/libexec/ftpd/config.h +++ b/libexec/ftpd/config.h @@ -1,5 +1,3 @@ - - /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ /* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile --- a/libexec/getty/Makefile +++ b/libexec/getty/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= gettytab diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile --- a/libexec/hyperv/Makefile +++ b/libexec/hyperv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/hyperv/tools/scripts BINDIR= ${LIBEXECDIR}/hyperv diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile --- a/libexec/makewhatis.local/Makefile +++ b/libexec/makewhatis.local/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= makewhatis.local.sh MAN= makewhatis.local.8 SCRIPTSDIR= ${LIBEXECDIR} diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile --- a/libexec/mknetid/Makefile +++ b/libexec/mknetid/Makefile @@ -1,4 +1,3 @@ - PROG= mknetid SRCS= mknetid.c hash.c parse_group.c diff --git a/libexec/phttpget/Makefile b/libexec/phttpget/Makefile --- a/libexec/phttpget/Makefile +++ b/libexec/phttpget/Makefile @@ -1,4 +1,3 @@ - PROG= phttpget MAN= phttpget.8 diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile --- a/libexec/pppoed/Makefile +++ b/libexec/pppoed/Makefile @@ -1,4 +1,3 @@ - PROG= pppoed LIBADD= netgraph MAN= pppoed.8 diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile --- a/libexec/rbootd/Makefile +++ b/libexec/rbootd/Makefile @@ -1,4 +1,3 @@ - PROG= rbootd SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c MAN= rbootd.8 diff --git a/libexec/rc/Makefile b/libexec/rc/Makefile --- a/libexec/rc/Makefile +++ b/libexec/rc/Makefile @@ -1,4 +1,3 @@ - .include CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -1,4 +1,3 @@ - .include CONFDIR= /etc/rc.d diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile --- a/libexec/revnetgroup/Makefile +++ b/libexec/revnetgroup/Makefile @@ -1,4 +1,3 @@ - PROG= revnetgroup SRCS= revnetgroup.c hash.c parse_netgroup.c diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile --- a/libexec/rpc.rquotad/Makefile +++ b/libexec/rpc.rquotad/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG = rpc.rquotad diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c MAN = rpc.rstatd.8 diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c extern.h MAN = rpc.rusersd.8 diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rwalld SRCS = rwalld.c MAN = rpc.rwalld.8 diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile --- a/libexec/rpc.sprayd/Makefile +++ b/libexec/rpc.sprayd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.sprayd SRCS = sprayd.c MAN = rpc.sprayd.8 diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -1,4 +1,3 @@ - # Use the following command to build local debug version of dynamic # linker: # make DEBUG_FLAGS=-g WITHOUT_TESTS=yes all diff --git a/libexec/rtld-elf/amd64/Makefile.inc b/libexec/rtld-elf/amd64/Makefile.inc --- a/libexec/rtld-elf/amd64/Makefile.inc +++ b/libexec/rtld-elf/amd64/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float -fvisibility=hidden diff --git a/libexec/rtld-elf/arm/Makefile.inc b/libexec/rtld-elf/arm/Makefile.inc --- a/libexec/rtld-elf/arm/Makefile.inc +++ b/libexec/rtld-elf/arm/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= -mfpu=none diff --git a/libexec/rtld-elf/i386/Makefile.inc b/libexec/rtld-elf/i386/Makefile.inc --- a/libexec/rtld-elf/i386/Makefile.inc +++ b/libexec/rtld-elf/i386/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float -fvisibility=hidden diff --git a/libexec/rtld-elf/powerpc64/Makefile.inc b/libexec/rtld-elf/powerpc64/Makefile.inc --- a/libexec/rtld-elf/powerpc64/Makefile.inc +++ b/libexec/rtld-elf/powerpc64/Makefile.inc @@ -1,2 +1 @@ - RTLD_ENTRY= _rtld_start diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= libpythagoras libdeep libval libval2 target TESTS_SUBDIRS+= rtld_deepbind diff --git a/libexec/rtld-elf/tests/Makefile.inc b/libexec/rtld-elf/tests/Makefile.inc --- a/libexec/rtld-elf/tests/Makefile.inc +++ b/libexec/rtld-elf/tests/Makefile.inc @@ -1,3 +1,2 @@ - PACKAGE?= tests TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf diff --git a/libexec/rtld-elf/tests/libdeep/Makefile b/libexec/rtld-elf/tests/libdeep/Makefile --- a/libexec/rtld-elf/tests/libdeep/Makefile +++ b/libexec/rtld-elf/tests/libdeep/Makefile @@ -1,4 +1,3 @@ - SHLIB?= deep SHLIB_MAJOR= 0 diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile --- a/libexec/rtld-elf/tests/libpythagoras/Makefile +++ b/libexec/rtld-elf/tests/libpythagoras/Makefile @@ -1,4 +1,3 @@ - .include LIB= pythagoras diff --git a/libexec/rtld-elf/tests/libval/Makefile b/libexec/rtld-elf/tests/libval/Makefile --- a/libexec/rtld-elf/tests/libval/Makefile +++ b/libexec/rtld-elf/tests/libval/Makefile @@ -1,4 +1,3 @@ - SHLIB?= val SHLIB_MAJOR= 0 diff --git a/libexec/rtld-elf/tests/libval2/Makefile b/libexec/rtld-elf/tests/libval2/Makefile --- a/libexec/rtld-elf/tests/libval2/Makefile +++ b/libexec/rtld-elf/tests/libval2/Makefile @@ -1,4 +1,3 @@ - LIBVAL= ${.CURDIR}/../libval # Just rebuild libval diff --git a/libexec/rtld-elf/tests/rtld_deepbind/Makefile b/libexec/rtld-elf/tests/rtld_deepbind/Makefile --- a/libexec/rtld-elf/tests/rtld_deepbind/Makefile +++ b/libexec/rtld-elf/tests/rtld_deepbind/Makefile @@ -1,4 +1,3 @@ - TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind ATF_TESTS_C= rtld_deepbind diff --git a/libexec/rtld-elf/tests/target/Makefile b/libexec/rtld-elf/tests/target/Makefile --- a/libexec/rtld-elf/tests/target/Makefile +++ b/libexec/rtld-elf/tests/target/Makefile @@ -1,4 +1,3 @@ - .include PROG= target diff --git a/libexec/rtld-elf32/Makefile b/libexec/rtld-elf32/Makefile --- a/libexec/rtld-elf32/Makefile +++ b/libexec/rtld-elf32/Makefile @@ -1,4 +1,3 @@ - NEED_COMPAT= 32 .include diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile --- a/libexec/save-entropy/Makefile +++ b/libexec/save-entropy/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= save-entropy.sh MAN= save-entropy.8 diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile --- a/libexec/talkd/Makefile +++ b/libexec/talkd/Makefile @@ -1,4 +1,3 @@ - PROG= ntalkd SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c .PATH: ${SRCTOP}/usr.bin/wall diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile --- a/libexec/tests/Makefile +++ b/libexec/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile --- a/libexec/tftp-proxy/Makefile +++ b/libexec/tftp-proxy/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/tftp-proxy PROG= tftp-proxy diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -1,4 +1,3 @@ - .include PROG= tftpd diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile --- a/libexec/tftpd/tests/Makefile +++ b/libexec/tftpd/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= functional diff --git a/libexec/ulog-helper/Makefile b/libexec/ulog-helper/Makefile --- a/libexec/ulog-helper/Makefile +++ b/libexec/ulog-helper/Makefile @@ -1,4 +1,3 @@ - PROG= ulog-helper BINOWN= root BINMODE=4555 diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypxfr SRCS= yp_dblookup.c yp_dbwrite.c yp_error.c \ diff --git a/rescue/Makefile b/rescue/Makefile --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,4 +1,3 @@ - SUBDIR= librescue \ rescue diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/sbin/Makefile b/sbin/Makefile --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR=adjkerntz \ diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64 --- a/sbin/Makefile.amd64 +++ b/sbin/Makefile.amd64 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.arm b/sbin/Makefile.arm --- a/sbin/Makefile.arm +++ b/sbin/Makefile.arm @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.i386 b/sbin/Makefile.i386 --- a/sbin/Makefile.i386 +++ b/sbin/Makefile.i386 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /sbin diff --git a/sbin/Makefile.powerpc64 b/sbin/Makefile.powerpc64 --- a/sbin/Makefile.powerpc64 +++ b/sbin/Makefile.powerpc64 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile --- a/sbin/adjkerntz/Makefile +++ b/sbin/adjkerntz/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= adjkerntz MAN= adjkerntz.8 diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=zfs diff --git a/sbin/bectl/tests/Makefile b/sbin/bectl/tests/Makefile --- a/sbin/bectl/tests/Makefile +++ b/sbin/bectl/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= bectl_test diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom CONFS= disktab diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile --- a/sbin/ccdconfig/Makefile +++ b/sbin/ccdconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ccdconfig PROG= ccdconfig MAN= ccdconfig.8 diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile --- a/sbin/clri/Makefile +++ b/sbin/clri/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= clri MAN= clri.8 diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile --- a/sbin/comcontrol/Makefile +++ b/sbin/comcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= comcontrol MAN= comcontrol.8 diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile --- a/sbin/conscontrol/Makefile +++ b/sbin/conscontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= conscontrol MAN= conscontrol.8 diff --git a/sbin/ddb/Makefile b/sbin/ddb/Makefile --- a/sbin/ddb/Makefile +++ b/sbin/ddb/Makefile @@ -1,4 +1,3 @@ - CONFS= ddb.conf PACKAGE=runtime PROG= ddb diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile --- a/sbin/decryptcore/Makefile +++ b/sbin/decryptcore/Makefile @@ -1,4 +1,3 @@ - PROG= decryptcore CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -1,4 +1,3 @@ - .include WARNS?= 6 diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile --- a/sbin/devd/tests/Makefile +++ b/sbin/devd/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C= client_test TEST_METADATA.client_test= required_files="/var/run/devd.pid" TEST_METADATA.client_test+= required_programs="devd" diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile --- a/sbin/devfs/Makefile +++ b/sbin/devfs/Makefile @@ -1,4 +1,3 @@ - CONFS= devfs.conf devfs.rules CONFSDIR_devfs.rules= /etc/defaults CONFSMODE_devfs.rules= 600 diff --git a/sbin/devmatch/Makefile b/sbin/devmatch/Makefile --- a/sbin/devmatch/Makefile +++ b/sbin/devmatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch PROG= devmatch MAN= devmatch.8 diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile --- a/sbin/dhclient/tests/Makefile +++ b/sbin/dhclient/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} ATF_TESTS_SH= pcp diff --git a/sbin/dhclient/tests/fake.c b/sbin/dhclient/tests/fake.c --- a/sbin/dhclient/tests/fake.c +++ b/sbin/dhclient/tests/fake.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c --- a/sbin/dhclient/tests/option-domain-search.c +++ b/sbin/dhclient/tests/option-domain-search.c @@ -1,4 +1,3 @@ - #include #include diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile --- a/sbin/dmesg/Makefile +++ b/sbin/dmesg/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= dmesg MAN= dmesg.8 diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -1,4 +1,3 @@ - # dump.h header file # itime.c reads /etc/dumpdates # main.c driver diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile --- a/sbin/dumpfs/Makefile +++ b/sbin/dumpfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= dumpfs WARNS?= 2 diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile --- a/sbin/dumpon/Makefile +++ b/sbin/dumpon/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile --- a/sbin/etherswitchcfg/Makefile +++ b/sbin/etherswitchcfg/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= etherswitchcfg MAN= etherswitchcfg.8 diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile --- a/sbin/fdisk/Makefile +++ b/sbin/fdisk/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= fdisk SRCS= fdisk.c fdisk_mbr_enc.c diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= fsck_ffs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom PROG= gbde SRCS= gbde.c template.c diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu --- a/sbin/gbde/image.uu +++ b/sbin/gbde/image.uu @@ -1,4 +1,3 @@ - begin 644 gbde.image.bz2 M0EIH.3%!629364"&9H\`Y1=_____________________________________ M________X7"_"W7I7N^[5>OM;NXTY!ZK'VZ]]MS?=??>>OM=[?/I-WMSSFM; diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/core ${.CURDIR}/misc diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile --- a/sbin/ggate/Makefile +++ b/sbin/ggate/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= ggatec \ diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc --- a/sbin/ggate/Makefile.inc +++ b/sbin/ggate/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile --- a/sbin/ggate/ggatec/Makefile +++ b/sbin/ggate/ggatec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggatec diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile --- a/sbin/ggate/ggated/Makefile +++ b/sbin/ggate/ggated/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggated diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile --- a/sbin/ggate/ggatel/Makefile +++ b/sbin/ggate/ggatel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggatel diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile --- a/sbin/growfs/tests/Makefile +++ b/sbin/growfs/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_PERL= legacy_test .include diff --git a/sbin/growfs/tests/legacy_test.pl b/sbin/growfs/tests/legacy_test.pl --- a/sbin/growfs/tests/legacy_test.pl +++ b/sbin/growfs/tests/legacy_test.pl @@ -1,4 +1,3 @@ - use strict; use warnings; use POSIX; diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile --- a/sbin/hastctl/Makefile +++ b/sbin/hastctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=hast diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile --- a/sbin/hastd/Makefile +++ b/sbin/hastd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=hast diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= nonexistent_test .include diff --git a/sbin/init/Makefile b/sbin/init/Makefile --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,4 +1,3 @@ - CONFGROUPS= CONFTTYS PACKAGE=runtime PROG= init diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile --- a/sbin/ipf/Makefile +++ b/sbin/ipf/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libipf .WAIT SUBDIR+= ipf ipfs ipfstat ipmon ipnat ippool # XXX Temporarily disconnected. diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -1,4 +1,3 @@ - .include WARNS?= 2 diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h --- a/sbin/ipf/common/ipf.h +++ b/sbin/ipf/common/ipf.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/ipf_y.y b/sbin/ipf/common/ipf_y.y --- a/sbin/ipf/common/ipf_y.y +++ b/sbin/ipf/common/ipf_y.y @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/ipmon.h b/sbin/ipf/common/ipmon.h --- a/sbin/ipf/common/ipmon.h +++ b/sbin/ipf/common/ipmon.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/ipt.h b/sbin/ipf/common/ipt.h --- a/sbin/ipf/common/ipt.h +++ b/sbin/ipf/common/ipt.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/kmem.h b/sbin/ipf/common/kmem.h --- a/sbin/ipf/common/kmem.h +++ b/sbin/ipf/common/kmem.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/lexer.h b/sbin/ipf/common/lexer.h --- a/sbin/ipf/common/lexer.h +++ b/sbin/ipf/common/lexer.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/lexer.c b/sbin/ipf/common/lexer.c --- a/sbin/ipf/common/lexer.c +++ b/sbin/ipf/common/lexer.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/opts.h b/sbin/ipf/common/opts.h --- a/sbin/ipf/common/opts.h +++ b/sbin/ipf/common/opts.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/common/pcap-ipf.h b/sbin/ipf/common/pcap-ipf.h --- a/sbin/ipf/common/pcap-ipf.h +++ b/sbin/ipf/common/pcap-ipf.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipf SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c diff --git a/sbin/ipf/ipf/bpf-ipf.h b/sbin/ipf/ipf/bpf-ipf.h --- a/sbin/ipf/ipf/bpf-ipf.h +++ b/sbin/ipf/ipf/bpf-ipf.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c --- a/sbin/ipf/ipf/bpf_filter.c +++ b/sbin/ipf/ipf/bpf_filter.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. diff --git a/sbin/ipf/ipf/ipf.c b/sbin/ipf/ipf/ipf.c --- a/sbin/ipf/ipf/ipf.c +++ b/sbin/ipf/ipf/ipf.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipf/ipfcomp.c b/sbin/ipf/ipf/ipfcomp.c --- a/sbin/ipf/ipf/ipfcomp.c +++ b/sbin/ipf/ipf/ipfcomp.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipfs/Makefile b/sbin/ipf/ipfs/Makefile --- a/sbin/ipf/ipfs/Makefile +++ b/sbin/ipf/ipfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ipf PROG= ipfs MAN= ipfs.8 diff --git a/sbin/ipf/ipfs/ipfs.c b/sbin/ipf/ipfs/ipfs.c --- a/sbin/ipf/ipfs/ipfs.c +++ b/sbin/ipf/ipfs/ipfs.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile --- a/sbin/ipf/ipfstat/Makefile +++ b/sbin/ipf/ipfstat/Makefile @@ -1,4 +1,3 @@ - NOGCCERROR= # defined PACKAGE= ipf diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c --- a/sbin/ipf/ipfstat/ipfstat.c +++ b/sbin/ipf/ipfstat/ipfstat.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipfsync/ipsyncm.c b/sbin/ipf/ipfsync/ipsyncm.c --- a/sbin/ipf/ipfsync/ipsyncm.c +++ b/sbin/ipf/ipfsync/ipsyncm.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipfsync/ipsyncs.c b/sbin/ipf/ipfsync/ipsyncs.c --- a/sbin/ipf/ipfsync/ipsyncs.c +++ b/sbin/ipf/ipfsync/ipsyncs.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipftest SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ diff --git a/sbin/ipf/ipftest/ip_fil.c b/sbin/ipf/ipftest/ip_fil.c --- a/sbin/ipf/ipftest/ip_fil.c +++ b/sbin/ipf/ipftest/ip_fil.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipftest/ipftest.c b/sbin/ipf/ipftest/ipftest.c --- a/sbin/ipf/ipftest/ipftest.c +++ b/sbin/ipf/ipftest/ipftest.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipftest/md5.h b/sbin/ipf/ipftest/md5.h --- a/sbin/ipf/ipftest/md5.h +++ b/sbin/ipf/ipftest/md5.h @@ -1,4 +1,3 @@ - /* *********************************************************************** ** md5.h -- header file for implementation of MD5 ** diff --git a/sbin/ipf/ipftest/md5.c b/sbin/ipf/ipftest/md5.c --- a/sbin/ipf/ipftest/md5.c +++ b/sbin/ipf/ipftest/md5.c @@ -1,6 +1,4 @@ - - /* *********************************************************************** ** md5.c -- the source code for MD5 routines ** diff --git a/sbin/ipf/iplang/iplang.h b/sbin/ipf/iplang/iplang.h --- a/sbin/ipf/iplang/iplang.h +++ b/sbin/ipf/iplang/iplang.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/iplang/iplang_l.l b/sbin/ipf/iplang/iplang_l.l --- a/sbin/ipf/iplang/iplang_l.l +++ b/sbin/ipf/iplang/iplang_l.l @@ -1,4 +1,3 @@ - %{ /* * Copyright (C) 2012 by Darren Reed. diff --git a/sbin/ipf/iplang/iplang_y.y b/sbin/ipf/iplang/iplang_y.y --- a/sbin/ipf/iplang/iplang_y.y +++ b/sbin/ipf/iplang/iplang_y.y @@ -1,4 +1,3 @@ - %{ /* * Copyright (C) 2012 by Darren Reed. diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile --- a/sbin/ipf/ipmon/Makefile +++ b/sbin/ipf/ipmon/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipmon SRCS= ${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c diff --git a/sbin/ipf/ipmon/ipmon.c b/sbin/ipf/ipmon/ipmon.c --- a/sbin/ipf/ipmon/ipmon.c +++ b/sbin/ipf/ipmon/ipmon.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipmon/ipmon_y.y b/sbin/ipf/ipmon/ipmon_y.y --- a/sbin/ipf/ipmon/ipmon_y.y +++ b/sbin/ipf/ipmon/ipmon_y.y @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile --- a/sbin/ipf/ipnat/Makefile +++ b/sbin/ipf/ipnat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipnat SRCS= ${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c diff --git a/sbin/ipf/ipnat/ipnat.c b/sbin/ipf/ipnat/ipnat.c --- a/sbin/ipf/ipnat/ipnat.c +++ b/sbin/ipf/ipnat/ipnat.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipnat/ipnat_y.y b/sbin/ipf/ipnat/ipnat_y.y --- a/sbin/ipf/ipnat/ipnat_y.y +++ b/sbin/ipf/ipnat/ipnat_y.y @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile --- a/sbin/ipf/ippool/Makefile +++ b/sbin/ipf/ippool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ippool SRCS= ${GENHDRS} ippool_y.c ippool_l.c ippool.c diff --git a/sbin/ipf/ippool/ippool.c b/sbin/ipf/ippool/ippool.c --- a/sbin/ipf/ippool/ippool.c +++ b/sbin/ipf/ippool/ippool.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ippool/ippool_y.y b/sbin/ipf/ippool/ippool_y.y --- a/sbin/ipf/ippool/ippool_y.y +++ b/sbin/ipf/ippool/ippool_y.y @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile --- a/sbin/ipf/ipresend/Makefile +++ b/sbin/ipf/ipresend/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipresend SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c diff --git a/sbin/ipf/ipscan/Makefile b/sbin/ipf/ipscan/Makefile --- a/sbin/ipf/ipscan/Makefile +++ b/sbin/ipf/ipscan/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipscan SRCS= ${GENHDRS} ipscan_y.c diff --git a/sbin/ipf/ipscan/ipscan_y.y b/sbin/ipf/ipscan/ipscan_y.y --- a/sbin/ipf/ipscan/ipscan_y.y +++ b/sbin/ipf/ipscan/ipscan_y.y @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipsend/44arp.c b/sbin/ipf/ipsend/44arp.c --- a/sbin/ipf/ipsend/44arp.c +++ b/sbin/ipf/ipsend/44arp.c @@ -1,4 +1,3 @@ - /* * Based upon 4.4BSD's /usr/sbin/arp */ diff --git a/sbin/ipf/ipsend/arp.c b/sbin/ipf/ipsend/arp.c --- a/sbin/ipf/ipsend/arp.c +++ b/sbin/ipf/ipsend/arp.c @@ -1,4 +1,3 @@ - /* * arp.c (C) 1995-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/dlcommon.c b/sbin/ipf/ipsend/dlcommon.c --- a/sbin/ipf/ipsend/dlcommon.c +++ b/sbin/ipf/ipsend/dlcommon.c @@ -1,4 +1,3 @@ - /* * Common (shared) DLPI test routines. * Mostly pretty boring boilerplate sorta stuff. diff --git a/sbin/ipf/ipsend/dltest.h b/sbin/ipf/ipsend/dltest.h --- a/sbin/ipf/ipsend/dltest.h +++ b/sbin/ipf/ipsend/dltest.h @@ -1,4 +1,3 @@ - /* * Common DLPI Test Suite header file * diff --git a/sbin/ipf/ipsend/ip.c b/sbin/ipf/ipsend/ip.c --- a/sbin/ipf/ipsend/ip.c +++ b/sbin/ipf/ipsend/ip.c @@ -1,4 +1,3 @@ - /* * ip.c (C) 1995-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/ipresend.c b/sbin/ipf/ipsend/ipresend.c --- a/sbin/ipf/ipsend/ipresend.c +++ b/sbin/ipf/ipsend/ipresend.c @@ -1,4 +1,3 @@ - /* * ipresend.c (C) 1995-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/ipsend.h b/sbin/ipf/ipsend/ipsend.h --- a/sbin/ipf/ipsend/ipsend.h +++ b/sbin/ipf/ipsend/ipsend.h @@ -1,4 +1,3 @@ - /* * ipsend.h (C) 1997-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/ipsopt.c b/sbin/ipf/ipsend/ipsopt.c --- a/sbin/ipf/ipsend/ipsopt.c +++ b/sbin/ipf/ipsend/ipsopt.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipsend/iptest.c b/sbin/ipf/ipsend/iptest.c --- a/sbin/ipf/ipsend/iptest.c +++ b/sbin/ipf/ipsend/iptest.c @@ -1,4 +1,3 @@ - /* * ipsend.c (C) 1995-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c --- a/sbin/ipf/ipsend/iptests.c +++ b/sbin/ipf/ipsend/iptests.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/ipsend/resend.c b/sbin/ipf/ipsend/resend.c --- a/sbin/ipf/ipsend/resend.c +++ b/sbin/ipf/ipsend/resend.c @@ -1,4 +1,3 @@ - /* * resend.c (C) 1995-1998 Darren Reed * diff --git a/sbin/ipf/ipsend/sdlpi.c b/sbin/ipf/ipsend/sdlpi.c --- a/sbin/ipf/ipsend/sdlpi.c +++ b/sbin/ipf/ipsend/sdlpi.c @@ -1,4 +1,3 @@ - /* * (C)opyright 1992-1998 Darren Reed. (from tcplog) * diff --git a/sbin/ipf/ipsend/snit.c b/sbin/ipf/ipsend/snit.c --- a/sbin/ipf/ipsend/snit.c +++ b/sbin/ipf/ipsend/snit.c @@ -1,4 +1,3 @@ - /* * (C)opyright 1992-1998 Darren Reed. (from tcplog) * diff --git a/sbin/ipf/ipsend/sockraw.c b/sbin/ipf/ipsend/sockraw.c --- a/sbin/ipf/ipsend/sockraw.c +++ b/sbin/ipf/ipsend/sockraw.c @@ -1,4 +1,3 @@ - /* * (C)opyright 2000 Darren Reed. * diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile --- a/sbin/ipf/libipf/Makefile +++ b/sbin/ipf/libipf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf LIB= ipf INTERNALLIB= diff --git a/sbin/ipf/libipf/addicmp.c b/sbin/ipf/libipf/addicmp.c --- a/sbin/ipf/libipf/addicmp.c +++ b/sbin/ipf/libipf/addicmp.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/addipopt.c b/sbin/ipf/libipf/addipopt.c --- a/sbin/ipf/libipf/addipopt.c +++ b/sbin/ipf/libipf/addipopt.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/bcopywrap.c b/sbin/ipf/libipf/bcopywrap.c --- a/sbin/ipf/libipf/bcopywrap.c +++ b/sbin/ipf/libipf/bcopywrap.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/binprint.c b/sbin/ipf/libipf/binprint.c --- a/sbin/ipf/libipf/binprint.c +++ b/sbin/ipf/libipf/binprint.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/buildopts.c b/sbin/ipf/libipf/buildopts.c --- a/sbin/ipf/libipf/buildopts.c +++ b/sbin/ipf/libipf/buildopts.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/checkrev.c b/sbin/ipf/libipf/checkrev.c --- a/sbin/ipf/libipf/checkrev.c +++ b/sbin/ipf/libipf/checkrev.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/count4bits.c b/sbin/ipf/libipf/count4bits.c --- a/sbin/ipf/libipf/count4bits.c +++ b/sbin/ipf/libipf/count4bits.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/count6bits.c b/sbin/ipf/libipf/count6bits.c --- a/sbin/ipf/libipf/count6bits.c +++ b/sbin/ipf/libipf/count6bits.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/debug.c b/sbin/ipf/libipf/debug.c --- a/sbin/ipf/libipf/debug.c +++ b/sbin/ipf/libipf/debug.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/facpri.h b/sbin/ipf/libipf/facpri.h --- a/sbin/ipf/libipf/facpri.h +++ b/sbin/ipf/libipf/facpri.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/facpri.c b/sbin/ipf/libipf/facpri.c --- a/sbin/ipf/libipf/facpri.c +++ b/sbin/ipf/libipf/facpri.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/fill6bits.c b/sbin/ipf/libipf/fill6bits.c --- a/sbin/ipf/libipf/fill6bits.c +++ b/sbin/ipf/libipf/fill6bits.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/flags.c b/sbin/ipf/libipf/flags.c --- a/sbin/ipf/libipf/flags.c +++ b/sbin/ipf/libipf/flags.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/gethost.c b/sbin/ipf/libipf/gethost.c --- a/sbin/ipf/libipf/gethost.c +++ b/sbin/ipf/libipf/gethost.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getifname.c b/sbin/ipf/libipf/getifname.c --- a/sbin/ipf/libipf/getifname.c +++ b/sbin/ipf/libipf/getifname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getnattype.c b/sbin/ipf/libipf/getnattype.c --- a/sbin/ipf/libipf/getnattype.c +++ b/sbin/ipf/libipf/getnattype.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getport.c b/sbin/ipf/libipf/getport.c --- a/sbin/ipf/libipf/getport.c +++ b/sbin/ipf/libipf/getport.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getportproto.c b/sbin/ipf/libipf/getportproto.c --- a/sbin/ipf/libipf/getportproto.c +++ b/sbin/ipf/libipf/getportproto.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getproto.c b/sbin/ipf/libipf/getproto.c --- a/sbin/ipf/libipf/getproto.c +++ b/sbin/ipf/libipf/getproto.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/getsumd.c b/sbin/ipf/libipf/getsumd.c --- a/sbin/ipf/libipf/getsumd.c +++ b/sbin/ipf/libipf/getsumd.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/hostname.c b/sbin/ipf/libipf/hostname.c --- a/sbin/ipf/libipf/hostname.c +++ b/sbin/ipf/libipf/hostname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/icmpcode.c b/sbin/ipf/libipf/icmpcode.c --- a/sbin/ipf/libipf/icmpcode.c +++ b/sbin/ipf/libipf/icmpcode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/inet_addr.c b/sbin/ipf/libipf/inet_addr.c --- a/sbin/ipf/libipf/inet_addr.c +++ b/sbin/ipf/libipf/inet_addr.c @@ -1,4 +1,3 @@ - /* * ++Copyright++ 1983, 1990, 1993 * - diff --git a/sbin/ipf/libipf/initparse.c b/sbin/ipf/libipf/initparse.c --- a/sbin/ipf/libipf/initparse.c +++ b/sbin/ipf/libipf/initparse.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ionames.c b/sbin/ipf/libipf/ionames.c --- a/sbin/ipf/libipf/ionames.c +++ b/sbin/ipf/libipf/ionames.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ipf_dotuning.c b/sbin/ipf/libipf/ipf_dotuning.c --- a/sbin/ipf/libipf/ipf_dotuning.c +++ b/sbin/ipf/libipf/ipf_dotuning.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ipft_hx.c b/sbin/ipf/libipf/ipft_hx.c --- a/sbin/ipf/libipf/ipft_hx.c +++ b/sbin/ipf/libipf/ipft_hx.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ipft_pc.c b/sbin/ipf/libipf/ipft_pc.c --- a/sbin/ipf/libipf/ipft_pc.c +++ b/sbin/ipf/libipf/ipft_pc.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ipft_tx.c b/sbin/ipf/libipf/ipft_tx.c --- a/sbin/ipf/libipf/ipft_tx.c +++ b/sbin/ipf/libipf/ipft_tx.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ipoptsec.c b/sbin/ipf/libipf/ipoptsec.c --- a/sbin/ipf/libipf/ipoptsec.c +++ b/sbin/ipf/libipf/ipoptsec.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/kmem.h b/sbin/ipf/libipf/kmem.h --- a/sbin/ipf/libipf/kmem.h +++ b/sbin/ipf/libipf/kmem.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/kmem.c b/sbin/ipf/libipf/kmem.c --- a/sbin/ipf/libipf/kmem.c +++ b/sbin/ipf/libipf/kmem.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/kmemcpywrap.c b/sbin/ipf/libipf/kmemcpywrap.c --- a/sbin/ipf/libipf/kmemcpywrap.c +++ b/sbin/ipf/libipf/kmemcpywrap.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/kvatoname.c b/sbin/ipf/libipf/kvatoname.c --- a/sbin/ipf/libipf/kvatoname.c +++ b/sbin/ipf/libipf/kvatoname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/load_hash.c b/sbin/ipf/libipf/load_hash.c --- a/sbin/ipf/libipf/load_hash.c +++ b/sbin/ipf/libipf/load_hash.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/load_hashnode.c b/sbin/ipf/libipf/load_hashnode.c --- a/sbin/ipf/libipf/load_hashnode.c +++ b/sbin/ipf/libipf/load_hashnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/load_http.c b/sbin/ipf/libipf/load_http.c --- a/sbin/ipf/libipf/load_http.c +++ b/sbin/ipf/libipf/load_http.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/load_pool.c b/sbin/ipf/libipf/load_pool.c --- a/sbin/ipf/libipf/load_pool.c +++ b/sbin/ipf/libipf/load_pool.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/load_poolnode.c b/sbin/ipf/libipf/load_poolnode.c --- a/sbin/ipf/libipf/load_poolnode.c +++ b/sbin/ipf/libipf/load_poolnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/mutex_emul.c b/sbin/ipf/libipf/mutex_emul.c --- a/sbin/ipf/libipf/mutex_emul.c +++ b/sbin/ipf/libipf/mutex_emul.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/nametokva.c b/sbin/ipf/libipf/nametokva.c --- a/sbin/ipf/libipf/nametokva.c +++ b/sbin/ipf/libipf/nametokva.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/nat_setgroupmap.c b/sbin/ipf/libipf/nat_setgroupmap.c --- a/sbin/ipf/libipf/nat_setgroupmap.c +++ b/sbin/ipf/libipf/nat_setgroupmap.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/ntomask.c b/sbin/ipf/libipf/ntomask.c --- a/sbin/ipf/libipf/ntomask.c +++ b/sbin/ipf/libipf/ntomask.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/optname.c b/sbin/ipf/libipf/optname.c --- a/sbin/ipf/libipf/optname.c +++ b/sbin/ipf/libipf/optname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/optprint.c b/sbin/ipf/libipf/optprint.c --- a/sbin/ipf/libipf/optprint.c +++ b/sbin/ipf/libipf/optprint.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/optprintv6.c b/sbin/ipf/libipf/optprintv6.c --- a/sbin/ipf/libipf/optprintv6.c +++ b/sbin/ipf/libipf/optprintv6.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/optvalue.c b/sbin/ipf/libipf/optvalue.c --- a/sbin/ipf/libipf/optvalue.c +++ b/sbin/ipf/libipf/optvalue.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/portname.c b/sbin/ipf/libipf/portname.c --- a/sbin/ipf/libipf/portname.c +++ b/sbin/ipf/libipf/portname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/print_toif.c b/sbin/ipf/libipf/print_toif.c --- a/sbin/ipf/libipf/print_toif.c +++ b/sbin/ipf/libipf/print_toif.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printactivenat.c b/sbin/ipf/libipf/printactivenat.c --- a/sbin/ipf/libipf/printactivenat.c +++ b/sbin/ipf/libipf/printactivenat.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printaps.c b/sbin/ipf/libipf/printaps.c --- a/sbin/ipf/libipf/printaps.c +++ b/sbin/ipf/libipf/printaps.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printbuf.c b/sbin/ipf/libipf/printbuf.c --- a/sbin/ipf/libipf/printbuf.c +++ b/sbin/ipf/libipf/printbuf.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printfr.c b/sbin/ipf/libipf/printfr.c --- a/sbin/ipf/libipf/printfr.c +++ b/sbin/ipf/libipf/printfr.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printfraginfo.c b/sbin/ipf/libipf/printfraginfo.c --- a/sbin/ipf/libipf/printfraginfo.c +++ b/sbin/ipf/libipf/printfraginfo.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printhash.c b/sbin/ipf/libipf/printhash.c --- a/sbin/ipf/libipf/printhash.c +++ b/sbin/ipf/libipf/printhash.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printhashnode.c b/sbin/ipf/libipf/printhashnode.c --- a/sbin/ipf/libipf/printhashnode.c +++ b/sbin/ipf/libipf/printhashnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printhostmap.c b/sbin/ipf/libipf/printhostmap.c --- a/sbin/ipf/libipf/printhostmap.c +++ b/sbin/ipf/libipf/printhostmap.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printhostmask.c b/sbin/ipf/libipf/printhostmask.c --- a/sbin/ipf/libipf/printhostmask.c +++ b/sbin/ipf/libipf/printhostmask.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printifname.c b/sbin/ipf/libipf/printifname.c --- a/sbin/ipf/libipf/printifname.c +++ b/sbin/ipf/libipf/printifname.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printip.c b/sbin/ipf/libipf/printip.c --- a/sbin/ipf/libipf/printip.c +++ b/sbin/ipf/libipf/printip.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printlog.c b/sbin/ipf/libipf/printlog.c --- a/sbin/ipf/libipf/printlog.c +++ b/sbin/ipf/libipf/printlog.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printmask.c b/sbin/ipf/libipf/printmask.c --- a/sbin/ipf/libipf/printmask.c +++ b/sbin/ipf/libipf/printmask.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printnat.c b/sbin/ipf/libipf/printnat.c --- a/sbin/ipf/libipf/printnat.c +++ b/sbin/ipf/libipf/printnat.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printpacket.c b/sbin/ipf/libipf/printpacket.c --- a/sbin/ipf/libipf/printpacket.c +++ b/sbin/ipf/libipf/printpacket.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printpacket6.c b/sbin/ipf/libipf/printpacket6.c --- a/sbin/ipf/libipf/printpacket6.c +++ b/sbin/ipf/libipf/printpacket6.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printpool.c b/sbin/ipf/libipf/printpool.c --- a/sbin/ipf/libipf/printpool.c +++ b/sbin/ipf/libipf/printpool.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printpoolnode.c b/sbin/ipf/libipf/printpoolnode.c --- a/sbin/ipf/libipf/printpoolnode.c +++ b/sbin/ipf/libipf/printpoolnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printportcmp.c b/sbin/ipf/libipf/printportcmp.c --- a/sbin/ipf/libipf/printportcmp.c +++ b/sbin/ipf/libipf/printportcmp.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printsbuf.c b/sbin/ipf/libipf/printsbuf.c --- a/sbin/ipf/libipf/printsbuf.c +++ b/sbin/ipf/libipf/printsbuf.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printstate.c b/sbin/ipf/libipf/printstate.c --- a/sbin/ipf/libipf/printstate.c +++ b/sbin/ipf/libipf/printstate.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/printtunable.c b/sbin/ipf/libipf/printtunable.c --- a/sbin/ipf/libipf/printtunable.c +++ b/sbin/ipf/libipf/printtunable.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/remove_hash.c b/sbin/ipf/libipf/remove_hash.c --- a/sbin/ipf/libipf/remove_hash.c +++ b/sbin/ipf/libipf/remove_hash.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/remove_hashnode.c b/sbin/ipf/libipf/remove_hashnode.c --- a/sbin/ipf/libipf/remove_hashnode.c +++ b/sbin/ipf/libipf/remove_hashnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/remove_pool.c b/sbin/ipf/libipf/remove_pool.c --- a/sbin/ipf/libipf/remove_pool.c +++ b/sbin/ipf/libipf/remove_pool.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/remove_poolnode.c b/sbin/ipf/libipf/remove_poolnode.c --- a/sbin/ipf/libipf/remove_poolnode.c +++ b/sbin/ipf/libipf/remove_poolnode.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/resetlexer.c b/sbin/ipf/libipf/resetlexer.c --- a/sbin/ipf/libipf/resetlexer.c +++ b/sbin/ipf/libipf/resetlexer.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/rwlock_emul.c b/sbin/ipf/libipf/rwlock_emul.c --- a/sbin/ipf/libipf/rwlock_emul.c +++ b/sbin/ipf/libipf/rwlock_emul.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/tcp_flags.c b/sbin/ipf/libipf/tcp_flags.c --- a/sbin/ipf/libipf/tcp_flags.c +++ b/sbin/ipf/libipf/tcp_flags.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2000-2004 by Darren Reed. * diff --git a/sbin/ipf/libipf/tcpflags.c b/sbin/ipf/libipf/tcpflags.c --- a/sbin/ipf/libipf/tcpflags.c +++ b/sbin/ipf/libipf/tcpflags.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/tcpoptnames.c b/sbin/ipf/libipf/tcpoptnames.c --- a/sbin/ipf/libipf/tcpoptnames.c +++ b/sbin/ipf/libipf/tcpoptnames.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/v6ionames.c b/sbin/ipf/libipf/v6ionames.c --- a/sbin/ipf/libipf/v6ionames.c +++ b/sbin/ipf/libipf/v6ionames.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/v6optvalue.c b/sbin/ipf/libipf/v6optvalue.c --- a/sbin/ipf/libipf/v6optvalue.c +++ b/sbin/ipf/libipf/v6optvalue.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/var.c b/sbin/ipf/libipf/var.c --- a/sbin/ipf/libipf/var.c +++ b/sbin/ipf/libipf/var.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipf/libipf/verbose.c b/sbin/ipf/libipf/verbose.c --- a/sbin/ipf/libipf/verbose.c +++ b/sbin/ipf/libipf/verbose.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=ipfw diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile --- a/sbin/ldconfig/Makefile +++ b/sbin/ldconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= ldconfig SRCS= elfhints.c ldconfig.c diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= md5 diff --git a/sbin/md5/tests/Makefile b/sbin/md5/tests/Makefile --- a/sbin/md5/tests/Makefile +++ b/sbin/md5/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile --- a/sbin/mdconfig/Makefile +++ b/sbin/mdconfig/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile --- a/sbin/mdconfig/tests/Makefile +++ b/sbin/mdconfig/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= mdconfig_test TEST_METADATA.mdconfig_test+= required_user="root" diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile --- a/sbin/mdmfs/Makefile +++ b/sbin/mdmfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mdmfs LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile --- a/sbin/mknod/Makefile +++ b/sbin/mknod/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mknod MAN= mknod.8 diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile --- a/sbin/mksnap_ffs/Makefile +++ b/sbin/mksnap_ffs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/mount PACKAGE=ufs diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount SRCS= mount.c mount_fs.c getmntopts.c vfslist.c diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile --- a/sbin/mount_cd9660/Makefile +++ b/sbin/mount_cd9660/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_cd9660 SRCS= mount_cd9660.c getmntopts.c diff --git a/sbin/mount_fusefs/Makefile b/sbin/mount_fusefs/Makefile --- a/sbin/mount_fusefs/Makefile +++ b/sbin/mount_fusefs/Makefile @@ -1,4 +1,3 @@ - .if defined(DEBUG) DEBUG_FLAGS+= -D_DEBUG -g .endif diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=nfs PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c mounttab.c diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile --- a/sbin/mount_nullfs/Makefile +++ b/sbin/mount_nullfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_nullfs SRCS= mount_nullfs.c getmntopts.c diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile --- a/sbin/mount_udf/Makefile +++ b/sbin/mount_udf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_udf SRCS= mount_udf.c getmntopts.c diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile --- a/sbin/mount_unionfs/Makefile +++ b/sbin/mount_unionfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_unionfs SRCS= mount_unionfs.c getmntopts.c diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile --- a/sbin/natd/Makefile +++ b/sbin/natd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd PROG = natd SRCS = natd.c icmp.c diff --git a/sbin/natd/README b/sbin/natd/README --- a/sbin/natd/README +++ b/sbin/natd/README @@ -1,4 +1,3 @@ - A Network Address Translation Daemon for FreeBSD diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile --- a/sbin/newfs/Makefile +++ b/sbin/newfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom PACKAGE= ufs diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile --- a/sbin/newfs_msdos/Makefile +++ b/sbin/newfs_msdos/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile --- a/sbin/nfsiod/Makefile +++ b/sbin/nfsiod/Makefile @@ -1,4 +1,3 @@ - PROG= nfsiod MAN= nfsiod.8 diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile --- a/sbin/nos-tun/Makefile +++ b/sbin/nos-tun/Makefile @@ -1,4 +1,3 @@ - PROG= nos-tun MAN= nos-tun.8 WARNS?= 3 diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile --- a/sbin/nvmecontrol/Makefile +++ b/sbin/nvmecontrol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=nvme-tools diff --git a/sbin/nvmecontrol/modules/Makefile b/sbin/nvmecontrol/modules/Makefile --- a/sbin/nvmecontrol/modules/Makefile +++ b/sbin/nvmecontrol/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= intel wdc samsung .include diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc --- a/sbin/nvmecontrol/modules/Makefile.inc +++ b/sbin/nvmecontrol/modules/Makefile.inc @@ -1,4 +1,3 @@ - PACKAGE=nvme-tools NVMECONTROLDIR= ${SRCTOP}/sbin/nvmecontrol diff --git a/sbin/nvmecontrol/modules/intel/Makefile b/sbin/nvmecontrol/modules/intel/Makefile --- a/sbin/nvmecontrol/modules/intel/Makefile +++ b/sbin/nvmecontrol/modules/intel/Makefile @@ -1,4 +1,3 @@ - LIB= intel SRCS= intel.c diff --git a/sbin/nvmecontrol/modules/samsung/Makefile b/sbin/nvmecontrol/modules/samsung/Makefile --- a/sbin/nvmecontrol/modules/samsung/Makefile +++ b/sbin/nvmecontrol/modules/samsung/Makefile @@ -1,4 +1,3 @@ - LIB= samsung SRCS= samsung.c diff --git a/sbin/nvmecontrol/modules/wdc/Makefile b/sbin/nvmecontrol/modules/wdc/Makefile --- a/sbin/nvmecontrol/modules/wdc/Makefile +++ b/sbin/nvmecontrol/modules/wdc/Makefile @@ -1,4 +1,3 @@ - LIB= wdc SRCS= wdc.c diff --git a/sbin/nvmecontrol/tests/Makefile b/sbin/nvmecontrol/tests/Makefile --- a/sbin/nvmecontrol/tests/Makefile +++ b/sbin/nvmecontrol/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= basic diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile --- a/sbin/pfctl/Makefile +++ b/sbin/pfctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=pf diff --git a/sbin/pfctl/tests/Makefile b/sbin/pfctl/tests/Makefile --- a/sbin/pfctl/tests/Makefile +++ b/sbin/pfctl/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_C= pfctl_test diff --git a/sbin/pfctl/tests/files/Makefile b/sbin/pfctl/tests/files/Makefile --- a/sbin/pfctl/tests/files/Makefile +++ b/sbin/pfctl/tests/files/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sbin/pfctl/files diff --git a/sbin/pfctl/tests/files/pf0095.in b/sbin/pfctl/tests/files/pf0095.in --- a/sbin/pfctl/tests/files/pf0095.in +++ b/sbin/pfctl/tests/files/pf0095.in @@ -1,4 +1,3 @@ - include "./pf0095.include" block out proto tcp diff --git a/sbin/pfctl/tests/files/pf0095.include b/sbin/pfctl/tests/files/pf0095.include --- a/sbin/pfctl/tests/files/pf0095.include +++ b/sbin/pfctl/tests/files/pf0095.include @@ -1,2 +1 @@ - block in proto udp diff --git a/sbin/pfctl/tests/macro.sh b/sbin/pfctl/tests/macro.sh --- a/sbin/pfctl/tests/macro.sh +++ b/sbin/pfctl/tests/macro.sh @@ -1,4 +1,3 @@ - atf_test_case "space" cleanup space_head() { diff --git a/sbin/pfilctl/Makefile b/sbin/pfilctl/Makefile --- a/sbin/pfilctl/Makefile +++ b/sbin/pfilctl/Makefile @@ -1,4 +1,3 @@ - PROG= pfilctl SRCS= pfilctl.c diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile --- a/sbin/pflogd/Makefile +++ b/sbin/pflogd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/pflogd PACKAGE=pf diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile --- a/sbin/ping/tests/Makefile +++ b/sbin/ping/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= in_cksum_test SRCS.in_cksum_test= in_cksum_test.c ../utils.c diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile --- a/sbin/quotacheck/Makefile +++ b/sbin/quotacheck/Makefile @@ -1,4 +1,3 @@ - PACKAGE=quotacheck PROG= quotacheck SRCS= quotacheck.c preen.c fsutil.c utilities.c diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= reboot MAN= reboot.8 nextboot.8 diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= recoverdisk diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=resolvconf DIST= ${SRCTOP}/contrib/openresolv .PATH: ${DIST} diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile --- a/sbin/restore/Makefile +++ b/sbin/restore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/dump PACKAGE=ufs diff --git a/sbin/route/Makefile b/sbin/route/Makefile --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/route/keywords b/sbin/route/keywords --- a/sbin/route/keywords +++ b/sbin/route/keywords @@ -1,4 +1,3 @@ - 4 6 add diff --git a/sbin/route/tests/Makefile b/sbin/route/tests/Makefile --- a/sbin/route/tests/Makefile +++ b/sbin/route/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= \ diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc --- a/sbin/routed/Makefile.inc +++ b/sbin/routed/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile --- a/sbin/savecore/Makefile +++ b/sbin/savecore/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime CONFS= minfree VAR_CRASH= /var/crash diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile --- a/sbin/shutdown/Makefile +++ b/sbin/shutdown/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= shutdown MAN= shutdown.8 diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= swapon MAN= swapon.8 diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile --- a/sbin/sysctl/Makefile +++ b/sbin/sysctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/sysctl/tests/Makefile b/sbin/sysctl/tests/Makefile --- a/sbin/sysctl/tests/Makefile +++ b/sbin/sysctl/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= sysctl_test .include diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile --- a/sbin/tests/Makefile +++ b/sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile --- a/sbin/tunefs/Makefile +++ b/sbin/tunefs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= tunefs SRCS= tunefs.c getmntopts.c diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile --- a/sbin/umount/Makefile +++ b/sbin/umount/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= umount SRCS= umount.c vfslist.c mounttab.c diff --git a/sbin/veriexec/Makefile b/sbin/veriexec/Makefile --- a/sbin/veriexec/Makefile +++ b/sbin/veriexec/Makefile @@ -1,4 +1,3 @@ - PROG= veriexec MAN= veriexec.8 SRCS= \ diff --git a/sbin/zfsbootcfg/Makefile b/sbin/zfsbootcfg/Makefile --- a/sbin/zfsbootcfg/Makefile +++ b/sbin/zfsbootcfg/Makefile @@ -1,4 +1,3 @@ - PROG= zfsbootcfg MAN= zfsbootcfg.8 diff --git a/secure/Makefile b/secure/Makefile --- a/secure/Makefile +++ b/secure/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/secure/Makefile.inc b/secure/Makefile.inc --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,4 +1,3 @@ - .if exists(${.CURDIR:H:H}/lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj .else diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -1,4 +1,3 @@ - CLEANFILES+= certdata.txt SUBDIR+= trusted diff --git a/secure/caroot/Makefile.inc b/secure/caroot/Makefile.inc --- a/secure/caroot/Makefile.inc +++ b/secure/caroot/Makefile.inc @@ -1,2 +1 @@ - PACKAGE= caroot diff --git a/secure/caroot/README b/secure/caroot/README --- a/secure/caroot/README +++ b/secure/caroot/README @@ -1,4 +1,3 @@ - This directory contains the scripts to update the TLS CA Root Certificates that comprise the 'root trust store'. diff --git a/secure/caroot/trusted/Makefile b/secure/caroot/trusted/Makefile --- a/secure/caroot/trusted/Makefile +++ b/secure/caroot/trusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/trusted TRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/caroot/untrusted/Makefile b/secure/caroot/untrusted/Makefile --- a/secure/caroot/untrusted/Makefile +++ b/secure/caroot/untrusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/untrusted UNTRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/lib/Makefile b/secure/lib/Makefile --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc --- a/secure/lib/Makefile.inc +++ b/secure/lib/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .if exists(${.CURDIR:H:H:H}/lib/Makefile.inc) .include "${.CURDIR:H:H:H}/lib/Makefile.inc" diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) SUBDIR= engines modules diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -1,4 +1,3 @@ - .include .if ${TARGET_ENDIANNESS} == 1234 diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,4 +1,3 @@ - .include # OpenSSL version used for manual page generation diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version.map --- a/secure/lib/libcrypto/Version.map +++ b/secure/lib/libcrypto/Version.map @@ -1,4 +1,3 @@ - OPENSSL_1_1_0 { global: ACCESS_DESCRIPTION_free; diff --git a/secure/lib/libcrypto/engines/Makefile b/secure/lib/libcrypto/engines/Makefile --- a/secure/lib/libcrypto/engines/Makefile +++ b/secure/lib/libcrypto/engines/Makefile @@ -1,4 +1,3 @@ - SUBDIR= capi devcrypto loader_attic .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= padlock diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/engines-3 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/engines/capi/Makefile b/secure/lib/libcrypto/engines/capi/Makefile --- a/secure/lib/libcrypto/engines/capi/Makefile +++ b/secure/lib/libcrypto/engines/capi/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= capi.so SRCS= e_capi.c diff --git a/secure/lib/libcrypto/engines/devcrypto/Makefile b/secure/lib/libcrypto/engines/devcrypto/Makefile --- a/secure/lib/libcrypto/engines/devcrypto/Makefile +++ b/secure/lib/libcrypto/engines/devcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= devcrypto.so SRCS= e_devcrypto.c diff --git a/secure/lib/libcrypto/engines/loader_attic/Makefile b/secure/lib/libcrypto/engines/loader_attic/Makefile --- a/secure/lib/libcrypto/engines/loader_attic/Makefile +++ b/secure/lib/libcrypto/engines/loader_attic/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= loader_attic.so SRCS= e_loader_attic.c pvkfmt.c diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= padlock.so SRCS= e_padlock.c diff --git a/secure/lib/libcrypto/modules/Makefile b/secure/lib/libcrypto/modules/Makefile --- a/secure/lib/libcrypto/modules/Makefile +++ b/secure/lib/libcrypto/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fips legacy SUBDIR_PARALLEL= diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/ossl-modules LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= fips.so CFLAGS+= -DFIPS_MODULE diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= legacy.so LIBADD= crypto diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -1,4 +1,3 @@ - .include LIB= ssl diff --git a/secure/lib/libssl/Version.map b/secure/lib/libssl/Version.map --- a/secure/lib/libssl/Version.map +++ b/secure/lib/libssl/Version.map @@ -1,4 +1,3 @@ - OPENSSL_1_1_0 { global: BIO_f_ssl; diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile --- a/secure/lib/tests/Makefile +++ b/secure/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/libexec PACKAGE= ssh diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/tests/Makefile b/secure/tests/Makefile --- a/secure/tests/Makefile +++ b/secure/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc --- a/secure/usr.bin/Makefile.inc +++ b/secure/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -1,4 +1,3 @@ - CONFS= openssl.cnf CONFSDIR= /etc/ssl PROG= openssl diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile --- a/secure/usr.bin/tests/Makefile +++ b/secure/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc --- a/secure/usr.sbin/Makefile.inc +++ b/secure/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin .include "../Makefile.inc" diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile --- a/secure/usr.sbin/tests/Makefile +++ b/secure/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/share/Makefile b/share/Makefile --- a/share/Makefile +++ b/share/Makefile @@ -1,4 +1,3 @@ - .include # Do not include `info' in the SUBDIR list, it is handled separately. diff --git a/share/Makefile.inc b/share/Makefile.inc --- a/share/Makefile.inc +++ b/share/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= ${SHAREDIR} BINOWN= ${SHAREOWN} BINGRP= ${SHAREGRP} diff --git a/share/colldef/Makefile b/share/colldef/Makefile --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales FILESGROUPS= FILES ALWAYS ALWAYSPACKAGE= runtime diff --git a/share/dict/Makefile b/share/dict/Makefile --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,4 +1,3 @@ - # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd FILESDIR= ${BINDIR}/dict diff --git a/share/dict/README b/share/dict/README --- a/share/dict/README +++ b/share/dict/README @@ -1,4 +1,3 @@ - WEB ---- (introduction provided by jaw@riacs) ------------------------- Welcome to web2 (Webster's Second International) all 234,936 words worth. diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile --- a/share/doc/IPv6/Makefile +++ b/share/doc/IPv6/Makefile @@ -1,4 +1,3 @@ - FILES= IMPLEMENTATION FILESDIR= ${SHAREDIR}/doc/IPv6 diff --git a/share/doc/Makefile b/share/doc/Makefile --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= ${_IPv6} \ diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile --- a/share/doc/legal/Makefile +++ b/share/doc/legal/Makefile @@ -1,4 +1,3 @@ - SUBDIR= intel_ipw \ intel_iwi \ intel_iwlwififw \ diff --git a/share/doc/legal/Makefile.armv7 b/share/doc/legal/Makefile.armv7 --- a/share/doc/legal/Makefile.armv7 +++ b/share/doc/legal/Makefile.armv7 @@ -1,2 +1 @@ - SUBDIR += imx diff --git a/share/doc/legal/imx/Makefile b/share/doc/legal/imx/Makefile --- a/share/doc/legal/imx/Makefile +++ b/share/doc/legal/imx/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/imx/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= sdma-imx6q.LICENSE diff --git a/share/doc/legal/intel_ipw/Makefile b/share/doc/legal/intel_ipw/Makefile --- a/share/doc/legal/intel_ipw/Makefile +++ b/share/doc/legal/intel_ipw/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/ipw/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_ipw.LICENSE diff --git a/share/doc/legal/intel_iwi/Makefile b/share/doc/legal/intel_iwi/Makefile --- a/share/doc/legal/intel_iwi/Makefile +++ b/share/doc/legal/intel_iwi/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwi.LICENSE diff --git a/share/doc/legal/intel_iwlwififw/Makefile b/share/doc/legal/intel_iwlwififw/Makefile --- a/share/doc/legal/intel_iwlwififw/Makefile +++ b/share/doc/legal/intel_iwlwififw/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwlwifi_firmware.LICENCE diff --git a/share/doc/legal/intel_iwn/Makefile b/share/doc/legal/intel_iwn/Makefile --- a/share/doc/legal/intel_iwn/Makefile +++ b/share/doc/legal/intel_iwn/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwn.LICENSE diff --git a/share/doc/legal/intel_wpi/Makefile b/share/doc/legal/intel_wpi/Makefile --- a/share/doc/legal/intel_wpi/Makefile +++ b/share/doc/legal/intel_wpi/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/wpi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_wpi.LICENSE diff --git a/share/doc/legal/realtek/Makefile b/share/doc/legal/realtek/Makefile --- a/share/doc/legal/realtek/Makefile +++ b/share/doc/legal/realtek/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/rtwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= realtek.LICENSE diff --git a/share/doc/llvm/Makefile b/share/doc/llvm/Makefile --- a/share/doc/llvm/Makefile +++ b/share/doc/llvm/Makefile @@ -1,4 +1,3 @@ - SUBDIR= clang SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm diff --git a/share/doc/llvm/clang/Makefile b/share/doc/llvm/clang/Makefile --- a/share/doc/llvm/clang/Makefile +++ b/share/doc/llvm/clang/Makefile @@ -1,4 +1,3 @@ - SRCDIR= ${SRCTOP}/contrib/llvm-project/clang .PATH: ${SRCDIR} diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile --- a/share/doc/papers/Makefile +++ b/share/doc/papers/Makefile @@ -1,4 +1,3 @@ - SUBDIR= beyond4.3 \ bufbio \ contents \ diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile --- a/share/doc/papers/beyond4.3/Makefile +++ b/share/doc/papers/beyond4.3/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= beyond43 SRCS= beyond43.ms diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile --- a/share/doc/papers/bufbio/Makefile +++ b/share/doc/papers/bufbio/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= bio SRCS= bio.ms-patched diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile --- a/share/doc/papers/contents/Makefile +++ b/share/doc/papers/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= contents SRCS= contents.ms diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile --- a/share/doc/papers/devfs/Makefile +++ b/share/doc/papers/devfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= devfs SRCS= paper.me diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile --- a/share/doc/papers/diskperf/Makefile +++ b/share/doc/papers/diskperf/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= diskperf SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms \ diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile --- a/share/doc/papers/fsinterface/Makefile +++ b/share/doc/papers/fsinterface/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= fsinterface SRCS= fsinterface.ms diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile --- a/share/doc/papers/jail/Makefile +++ b/share/doc/papers/jail/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= jail SRCS= paper.ms-patched diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile --- a/share/doc/papers/kernmalloc/Makefile +++ b/share/doc/papers/kernmalloc/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= kernmalloc SRCS= kernmalloc.t appendix.ms diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile --- a/share/doc/papers/kerntune/Makefile +++ b/share/doc/papers/kerntune/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= kerntune SRCS= 0.t 1.t 2.t 3.t 4.t diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile --- a/share/doc/papers/malloc/Makefile +++ b/share/doc/papers/malloc/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= malloc SRCS= abs.ms intro.ms kernel.ms malloc.ms problems.ms alternatives.ms \ diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile --- a/share/doc/papers/newvm/Makefile +++ b/share/doc/papers/newvm/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= newvm SRCS= 0.t 1.t a.t diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile --- a/share/doc/papers/relengr/Makefile +++ b/share/doc/papers/relengr/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= releng SRCS= stubs 0.t 1.t 2.t 3.t diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile --- a/share/doc/papers/sysperf/Makefile +++ b/share/doc/papers/sysperf/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= sysperf SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.ms diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile --- a/share/doc/papers/timecounter/Makefile +++ b/share/doc/papers/timecounter/Makefile @@ -1,4 +1,3 @@ - # You really want: # PRINTERDEVICE=ps # or you will not get the illustration. diff --git a/share/doc/pjdfstest/Makefile b/share/doc/pjdfstest/Makefile --- a/share/doc/pjdfstest/Makefile +++ b/share/doc/pjdfstest/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/doc/pjdfstest FILES= README diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile --- a/share/doc/psd/01.cacm/Makefile +++ b/share/doc/psd/01.cacm/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/01.cacm SRCS= stubs p.mac p1 p2 p3 p4 p5 p6 EXTRA= ref.bib diff --git a/share/doc/psd/01.cacm/ref.bib b/share/doc/psd/01.cacm/ref.bib --- a/share/doc/psd/01.cacm/ref.bib +++ b/share/doc/psd/01.cacm/ref.bib @@ -1,4 +1,3 @@ - %A L. P. Deutsch %A B. W. Lampson %T An online editor diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile --- a/share/doc/psd/02.implement/Makefile +++ b/share/doc/psd/02.implement/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/02.implement SRCS= stubs implement EXTRA= ref.bib diff --git a/share/doc/psd/02.implement/ref.bib b/share/doc/psd/02.implement/ref.bib --- a/share/doc/psd/02.implement/ref.bib +++ b/share/doc/psd/02.implement/ref.bib @@ -1,4 +1,3 @@ - %T U\s-2NIX\s0 Time-Sharing System: The U\s-2NIX\s0 Shell %A S. R. Bourne %K unix bstj diff --git a/share/doc/psd/03.iosys/Makefile b/share/doc/psd/03.iosys/Makefile --- a/share/doc/psd/03.iosys/Makefile +++ b/share/doc/psd/03.iosys/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/03.iosys SRCS= iosys MACROS= -ms diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile --- a/share/doc/psd/04.uprog/Makefile +++ b/share/doc/psd/04.uprog/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/04.uprog SRCS= p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9 MACROS= -ms diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile --- a/share/doc/psd/05.sysman/Makefile +++ b/share/doc/psd/05.sysman/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/05.sysman SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \ 2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile --- a/share/doc/psd/06.Clang/Makefile +++ b/share/doc/psd/06.Clang/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/06.Clang SRCS= Clang.ms MACROS= -ms diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile --- a/share/doc/psd/12.make/Makefile +++ b/share/doc/psd/12.make/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/12.make SRCS= stubs tutorial.ms MACROS= -ms diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile --- a/share/doc/psd/15.yacc/Makefile +++ b/share/doc/psd/15.yacc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/15.yacc SRCS= stubs ss_ ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \ ss10 ss11 ssa ssb ssc ssd diff --git a/share/doc/psd/15.yacc/ref.bib b/share/doc/psd/15.yacc/ref.bib --- a/share/doc/psd/15.yacc/ref.bib +++ b/share/doc/psd/15.yacc/ref.bib @@ -1,4 +1,3 @@ - %T The C Programming Language %A B. W. Kernighan %A D. M. Ritchie diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile --- a/share/doc/psd/16.lex/Makefile +++ b/share/doc/psd/16.lex/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/16.lex SRCS= lex.ms MACROS= -ms diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile --- a/share/doc/psd/17.m4/Makefile +++ b/share/doc/psd/17.m4/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/17.m4 SRCS= m4.ms MACROS= -ms diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile --- a/share/doc/psd/18.gprof/Makefile +++ b/share/doc/psd/18.gprof/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/18.gprof SRCS= header.me abstract.me intro.me profiling.me gathering.me \ postp.me present.me refs.me diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile --- a/share/doc/psd/20.ipctut/Makefile +++ b/share/doc/psd/20.ipctut/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/20.ipctut SRCS= tutor.me MACROS= -me diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile --- a/share/doc/psd/21.ipc/Makefile +++ b/share/doc/psd/21.ipc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/21.ipc SRCS= 0.t 1.t 2.t 3.t 4.t 5.t MACROS= -ms diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile --- a/share/doc/psd/22.rpcgen/Makefile +++ b/share/doc/psd/22.rpcgen/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/22.rpcgen SRCS= stubs rpcgen.ms MACROS= -ms diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile --- a/share/doc/psd/23.rpc/Makefile +++ b/share/doc/psd/23.rpc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/23.rpc SRCS= stubs rpc.prog.ms MACROS= -ms diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile --- a/share/doc/psd/24.xdr/Makefile +++ b/share/doc/psd/24.xdr/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/24.xdr SRCS= stubs xdr.nts.ms MACROS= -ms diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile --- a/share/doc/psd/25.xdrrfc/Makefile +++ b/share/doc/psd/25.xdrrfc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/25.xdrrfc SRCS= stubs xdr.rfc.ms MACROS= -ms diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile --- a/share/doc/psd/26.rpcrfc/Makefile +++ b/share/doc/psd/26.rpcrfc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/26.rpcrfc SRCS= stubs rpc.rfc.ms MACROS= -ms diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile --- a/share/doc/psd/27.nfsrpc/Makefile +++ b/share/doc/psd/27.nfsrpc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/27.nfsrfc SRCS= stubs nfs.rfc.ms MACROS= -ms diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile --- a/share/doc/psd/Makefile +++ b/share/doc/psd/Makefile @@ -1,4 +1,3 @@ - # The following modules do not build/install: # 10.gdb diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile --- a/share/doc/psd/contents/Makefile +++ b/share/doc/psd/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd DOC= contents SRCS= contents.ms diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile --- a/share/doc/psd/title/Makefile +++ b/share/doc/psd/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd DOC= Title SRCS= Title diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile --- a/share/doc/smm/01.setup/Makefile +++ b/share/doc/smm/01.setup/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/01.setup SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile --- a/share/doc/smm/02.config/Makefile +++ b/share/doc/smm/02.config/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/02.config SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t MACROS= -ms diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile --- a/share/doc/smm/03.fsck/Makefile +++ b/share/doc/smm/03.fsck/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/03.fsck SRCS= 0.t 1.t 2.t 3.t 4.t MACROS= -ms diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile --- a/share/doc/smm/04.quotas/Makefile +++ b/share/doc/smm/04.quotas/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/04.quotas SRCS= quotas.ms MACROS= -ms diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile --- a/share/doc/smm/05.fastfs/Makefile +++ b/share/doc/smm/05.fastfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/05.fastfs SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile --- a/share/doc/smm/06.nfs/Makefile +++ b/share/doc/smm/06.nfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/06.nfs SRCS= 0.t 1.t 2.t ref.t MACROS= -me diff --git a/share/doc/smm/07.lpd/Makefile b/share/doc/smm/07.lpd/Makefile --- a/share/doc/smm/07.lpd/Makefile +++ b/share/doc/smm/07.lpd/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/07.lpd SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t MACROS= -ms diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile --- a/share/doc/smm/08.sendmailop/Makefile +++ b/share/doc/smm/08.sendmailop/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/08.sendmailop SRCS= op.me MACROS= -me diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile --- a/share/doc/smm/11.timedop/Makefile +++ b/share/doc/smm/11.timedop/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/11.timedop SRCS= timed.ms MACROS= -ms diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile --- a/share/doc/smm/12.timed/Makefile +++ b/share/doc/smm/12.timed/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/12.timed SRCS= timed.ms EXTRA= date loop time unused diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile --- a/share/doc/smm/18.net/Makefile +++ b/share/doc/smm/18.net/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/18.net SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t MACROS= -ms diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,4 +1,3 @@ - .include # The following modules do not describe FreeBSD: diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile --- a/share/doc/smm/contents/Makefile +++ b/share/doc/smm/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm DOC= contents SRCS= contents.ms diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile --- a/share/doc/smm/title/Makefile +++ b/share/doc/smm/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm DOC= Title SRCS= Title diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile --- a/share/doc/usd/04.csh/Makefile +++ b/share/doc/usd/04.csh/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/04.csh SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g MACROS= -ms diff --git a/share/doc/usd/05.dc/Makefile b/share/doc/usd/05.dc/Makefile --- a/share/doc/usd/05.dc/Makefile +++ b/share/doc/usd/05.dc/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/05.dc SRCS= dc MACROS= -ms diff --git a/share/doc/usd/06.bc/Makefile b/share/doc/usd/06.bc/Makefile --- a/share/doc/usd/06.bc/Makefile +++ b/share/doc/usd/06.bc/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/06.bc SRCS= bc MACROS= -ms diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile --- a/share/doc/usd/07.mail/Makefile +++ b/share/doc/usd/07.mail/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/07.mail SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \ mail7.nr mail8.nr mail9.nr maila.nr diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile --- a/share/doc/usd/10.exref/Makefile +++ b/share/doc/usd/10.exref/Makefile @@ -1,4 +1,3 @@ - SUBDIR= exref summary .include diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc --- a/share/doc/usd/10.exref/Makefile.inc +++ b/share/doc/usd/10.exref/Makefile.inc @@ -1,3 +1,2 @@ - VOLUME= usd/10.exref MACROS= -ms diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile --- a/share/doc/usd/10.exref/exref/Makefile +++ b/share/doc/usd/10.exref/exref/Makefile @@ -1,4 +1,3 @@ - SRCS= ex.rm .include diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile --- a/share/doc/usd/10.exref/summary/Makefile +++ b/share/doc/usd/10.exref/summary/Makefile @@ -1,4 +1,3 @@ - DOC= summary SRCS= ex.summary USE_TBL= diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile --- a/share/doc/usd/11.vitut/Makefile +++ b/share/doc/usd/11.vitut/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/11.edit SRCS= edittut.ms MACROS= -ms diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile --- a/share/doc/usd/12.vi/Makefile +++ b/share/doc/usd/12.vi/Makefile @@ -1,4 +1,3 @@ - SUBDIR= vi viapwh summary .include diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc --- a/share/doc/usd/12.vi/Makefile.inc +++ b/share/doc/usd/12.vi/Makefile.inc @@ -1,3 +1,2 @@ - VOLUME= usd/12.vi MACROS= -ms diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile --- a/share/doc/usd/12.vi/summary/Makefile +++ b/share/doc/usd/12.vi/summary/Makefile @@ -1,4 +1,3 @@ - DOC= summary SRCS= vi.summary USE_TBL= diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile --- a/share/doc/usd/12.vi/vi/Makefile +++ b/share/doc/usd/12.vi/vi/Makefile @@ -1,4 +1,3 @@ - SRCS= vi.in vi.chars USE_TBL= diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile --- a/share/doc/usd/12.vi/viapwh/Makefile +++ b/share/doc/usd/12.vi/viapwh/Makefile @@ -1,4 +1,3 @@ - DOC= viapwh SRCS= vi.apwh.ms diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile --- a/share/doc/usd/13.viref/Makefile +++ b/share/doc/usd/13.viref/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/13.viref EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff MACROS= -me diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile --- a/share/doc/usd/18.msdiffs/Makefile +++ b/share/doc/usd/18.msdiffs/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/18.msdiffs SRCS= ms.diffs MACROS= -ms diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile --- a/share/doc/usd/19.memacros/Makefile +++ b/share/doc/usd/19.memacros/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/19.memacros SRCS= meintro.me-sed MACROS= -me diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile --- a/share/doc/usd/20.meref/Makefile +++ b/share/doc/usd/20.meref/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/20.meref SRCS= meref.me-sed MACROS= -me diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile --- a/share/doc/usd/21.troff/Makefile +++ b/share/doc/usd/21.troff/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/21.troff SRCS= m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2 USE_TBL= diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile --- a/share/doc/usd/Makefile +++ b/share/doc/usd/Makefile @@ -1,4 +1,3 @@ - # The following modules are not provided: # 14.jove diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile --- a/share/doc/usd/contents/Makefile +++ b/share/doc/usd/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd DOC= contents SRCS= contents.ms diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile --- a/share/doc/usd/title/Makefile +++ b/share/doc/usd/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd DOC= Title SRCS= Title diff --git a/share/dtrace/README b/share/dtrace/README --- a/share/dtrace/README +++ b/share/dtrace/README @@ -1,4 +1,3 @@ - This directory contains scripts for use with the DTrace system. These files and directories contain code generated by the FreeBSD Project for use with DTrace on FreeBSD. diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile --- a/share/examples/FreeBSD_version/Makefile +++ b/share/examples/FreeBSD_version/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= FreeBSD_version diff --git a/share/examples/drivers/README b/share/examples/drivers/README --- a/share/examples/drivers/README +++ b/share/examples/drivers/README @@ -1,4 +1,3 @@ - Author: Julian Elischer The files in this directory are shell scripts. diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -1,4 +1,3 @@ - The /usr/share/examples/etc directory contains the original distribution versions of the files which are shipped in /etc. This is intended to make it easy to recover when the /etc versions are diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile --- a/share/examples/find_interface/Makefile +++ b/share/examples/find_interface/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= find_interface diff --git a/share/examples/hwpmc/Makefile b/share/examples/hwpmc/Makefile --- a/share/examples/hwpmc/Makefile +++ b/share/examples/hwpmc/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/hwpmc PROG= overhead diff --git a/share/examples/hwpmc/README b/share/examples/hwpmc/README --- a/share/examples/hwpmc/README +++ b/share/examples/hwpmc/README @@ -1,4 +1,3 @@ - Examples illustrating the use of the hwpmc(4) driver and pmc(3) library interface. diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile --- a/share/examples/ipfilter/Makefile +++ b/share/examples/ipfilter/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ipf FILES= README diff --git a/share/examples/ipfilter/README b/share/examples/ipfilter/README --- a/share/examples/ipfilter/README +++ b/share/examples/ipfilter/README @@ -1,4 +1,3 @@ - This directory contains various files related to ipfilter. For information on building ipf based firewalls, read the ipf-howto.txt. diff --git a/share/examples/ipfilter/l4check/l4check.c b/share/examples/ipfilter/l4check/l4check.c --- a/share/examples/ipfilter/l4check/l4check.c +++ b/share/examples/ipfilter/l4check/l4check.c @@ -1,4 +1,3 @@ - /* * (C)Copyright (C) 2012 by Darren Reed. */ diff --git a/share/examples/ipfilter/mlfk_rule.c b/share/examples/ipfilter/mlfk_rule.c --- a/share/examples/ipfilter/mlfk_rule.c +++ b/share/examples/ipfilter/mlfk_rule.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/share/examples/ipfilter/samples/proxy.c b/share/examples/ipfilter/samples/proxy.c --- a/share/examples/ipfilter/samples/proxy.c +++ b/share/examples/ipfilter/samples/proxy.c @@ -1,4 +1,3 @@ - /* * Sample transparent proxy program. * diff --git a/share/examples/ipfilter/samples/relay.c b/share/examples/ipfilter/samples/relay.c --- a/share/examples/ipfilter/samples/relay.c +++ b/share/examples/ipfilter/samples/relay.c @@ -1,4 +1,3 @@ - /* * Sample program to be used as a transparent proxy. * diff --git a/share/examples/ipfilter/samples/userauth.c b/share/examples/ipfilter/samples/userauth.c --- a/share/examples/ipfilter/samples/userauth.c +++ b/share/examples/ipfilter/samples/userauth.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/share/examples/jails/README b/share/examples/jails/README --- a/share/examples/jails/README +++ b/share/examples/jails/README @@ -1,4 +1,3 @@ - The below 4 samples require a VIMAGE enabled kernel: # (as root) diff --git a/share/examples/jails/VIMAGE b/share/examples/jails/VIMAGE --- a/share/examples/jails/VIMAGE +++ b/share/examples/jails/VIMAGE @@ -1,4 +1,3 @@ - ################################################################################ ######################### VIMAGE KERNEL CONFIGURATION ########################## ################################################################################ diff --git a/share/examples/jails/jail.xxx.conf b/share/examples/jails/jail.xxx.conf --- a/share/examples/jails/jail.xxx.conf +++ b/share/examples/jails/jail.xxx.conf @@ -1,4 +1,3 @@ - xxx { host.hostname = "xxx.yyy"; # hostname path = "/vm/xxx"; # root directory diff --git a/share/examples/jails/rc.conf.jails b/share/examples/jails/rc.conf.jails --- a/share/examples/jails/rc.conf.jails +++ b/share/examples/jails/rc.conf.jails @@ -1,4 +1,3 @@ - ############################################################################### ############################# JAIL CONFIGURATIONS ############################# ############################################################################### diff --git a/share/examples/jails/rcjail.xxx.conf b/share/examples/jails/rcjail.xxx.conf --- a/share/examples/jails/rcjail.xxx.conf +++ b/share/examples/jails/rcjail.xxx.conf @@ -1,4 +1,3 @@ - jail_XXX_hostname="XXX.YYY" # hostname jail_XXX_rootdir="/vm/XXX" # root directory diff --git a/share/examples/kld/cdev/Makefile b/share/examples/kld/cdev/Makefile --- a/share/examples/kld/cdev/Makefile +++ b/share/examples/kld/cdev/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/cdev SUBDIR= module test diff --git a/share/examples/kld/dyn_sysctl/Makefile b/share/examples/kld/dyn_sysctl/Makefile --- a/share/examples/kld/dyn_sysctl/Makefile +++ b/share/examples/kld/dyn_sysctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/${KMOD} SRCS = dyn_sysctl.c diff --git a/share/examples/kld/firmware/Makefile b/share/examples/kld/firmware/Makefile --- a/share/examples/kld/firmware/Makefile +++ b/share/examples/kld/firmware/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/firmware SUBDIR= fwimage fwconsumer diff --git a/share/examples/kld/firmware/README b/share/examples/kld/firmware/README --- a/share/examples/kld/firmware/README +++ b/share/examples/kld/firmware/README @@ -1,4 +1,3 @@ - This is a simple example of the firmware(9) system. It consists of two parts: diff --git a/share/examples/kld/firmware/fwconsumer/Makefile b/share/examples/kld/firmware/fwconsumer/Makefile --- a/share/examples/kld/firmware/fwconsumer/Makefile +++ b/share/examples/kld/firmware/fwconsumer/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/fwconsumer KMOD= fw_consumer diff --git a/share/examples/kld/firmware/fwimage/Makefile b/share/examples/kld/firmware/fwimage/Makefile --- a/share/examples/kld/firmware/fwimage/Makefile +++ b/share/examples/kld/firmware/fwimage/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/fwimage KMOD= beastie diff --git a/share/examples/kld/khelp/Makefile b/share/examples/kld/khelp/Makefile --- a/share/examples/kld/khelp/Makefile +++ b/share/examples/kld/khelp/Makefile @@ -1,4 +1,3 @@ - .include # Change if the src tree you are compiling for is not in /usr/src diff --git a/share/examples/kld/khelp/README b/share/examples/kld/khelp/README --- a/share/examples/kld/khelp/README +++ b/share/examples/kld/khelp/README @@ -1,4 +1,3 @@ - An example Khelp module which uses the helper hook points available in the TCP stack to calculate a per-connection count of inbound and outbound packets when the connection is in the established state. The code is verbosely documented in diff --git a/share/examples/kld/random_adaptor/Makefile b/share/examples/kld/random_adaptor/Makefile --- a/share/examples/kld/random_adaptor/Makefile +++ b/share/examples/kld/random_adaptor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/${KMOD} KMOD= random_adaptor_example diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile --- a/share/examples/kld/syscall/Makefile +++ b/share/examples/kld/syscall/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/syscall SUBDIR= module test diff --git a/share/examples/libusb20/Makefile b/share/examples/libusb20/Makefile --- a/share/examples/libusb20/Makefile +++ b/share/examples/libusb20/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/libusb20 TARGETS= bulk control diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile --- a/share/examples/libvgl/Makefile +++ b/share/examples/libvgl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/libvgl PROG= demo diff --git a/share/examples/netgraph/ngctl b/share/examples/netgraph/ngctl --- a/share/examples/netgraph/ngctl +++ b/share/examples/netgraph/ngctl @@ -1,4 +1,3 @@ - # # This is an example that shows how to send ASCII formatted control # messages to a node using ngctl(8). diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile --- a/share/examples/perfmon/Makefile +++ b/share/examples/perfmon/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= perfmon diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile --- a/share/examples/pf/Makefile +++ b/share/examples/pf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp --- a/share/examples/ppp/ppp.conf.span-isp +++ b/share/examples/ppp/ppp.conf.span-isp @@ -1,4 +1,3 @@ - # This advanced ppp configuration file explains how to implement # the following: # diff --git a/share/examples/ppp/ppp.conf.span-isp.working b/share/examples/ppp/ppp.conf.span-isp.working --- a/share/examples/ppp/ppp.conf.span-isp.working +++ b/share/examples/ppp/ppp.conf.span-isp.working @@ -1,4 +1,3 @@ - # This is a working example of ppp.conf.span-isp that uses ppp connections # to the same machine through 3 null-modem serial cables. # diff --git a/share/examples/ppp/ppp.linkdown.span-isp b/share/examples/ppp/ppp.linkdown.span-isp --- a/share/examples/ppp/ppp.linkdown.span-isp +++ b/share/examples/ppp/ppp.linkdown.span-isp @@ -1,4 +1,3 @@ - # Refer to ppp.conf.span-isp for a description of what this file is for. # This file is only required on the Gateway machine. diff --git a/share/examples/ppp/ppp.linkdown.span-isp.working b/share/examples/ppp/ppp.linkdown.span-isp.working --- a/share/examples/ppp/ppp.linkdown.span-isp.working +++ b/share/examples/ppp/ppp.linkdown.span-isp.working @@ -1,4 +1,3 @@ - # This is a working example of ppp.linkdown.span-isp that uses ppp connections # to the same machine through 3 null-modem serial cables. diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp --- a/share/examples/ppp/ppp.linkup.span-isp +++ b/share/examples/ppp/ppp.linkup.span-isp @@ -1,4 +1,3 @@ - # Refer to ppp.conf.span-isp for a description of what this file is for. # This file is only required on the Gateway machine. diff --git a/share/examples/ppp/ppp.linkup.span-isp.working b/share/examples/ppp/ppp.linkup.span-isp.working --- a/share/examples/ppp/ppp.linkup.span-isp.working +++ b/share/examples/ppp/ppp.linkup.span-isp.working @@ -1,4 +1,3 @@ - # This is a working example of ppp.linkup.span-isp that uses ppp connections # to the same machine through 3 null-modem serial cables. diff --git a/share/examples/ppp/ppp.secret.span-isp b/share/examples/ppp/ppp.secret.span-isp --- a/share/examples/ppp/ppp.secret.span-isp +++ b/share/examples/ppp/ppp.secret.span-isp @@ -1,4 +1,3 @@ - # Refer to ppp.conf.span-isp for a description of what this file is for. # This file is only required on the Receiver machine. diff --git a/share/examples/ppp/ppp.secret.span-isp.working b/share/examples/ppp/ppp.secret.span-isp.working --- a/share/examples/ppp/ppp.secret.span-isp.working +++ b/share/examples/ppp/ppp.secret.span-isp.working @@ -1,4 +1,3 @@ - # This is a working example of ppp.secret.span-isp that uses ppp connections # to the same machine through 3 null-modem serial cables. diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile --- a/share/examples/scsi_target/Makefile +++ b/share/examples/scsi_target/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= scsi_target diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile --- a/share/examples/smbfs/Makefile +++ b/share/examples/smbfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile --- a/share/examples/smbfs/print/Makefile +++ b/share/examples/smbfs/print/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile --- a/share/examples/tests/Makefile +++ b/share/examples/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tests .PATH: ${SRCTOP}/tests diff --git a/share/examples/tests/README b/share/examples/tests/README --- a/share/examples/tests/README +++ b/share/examples/tests/README @@ -1,4 +1,3 @@ - This directory contains sample test programs along the Makefile and Kyuafile logic to get them build and installed. diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile --- a/share/examples/tests/tests/Makefile +++ b/share/examples/tests/tests/Makefile @@ -1,4 +1,3 @@ - .include # Directory into which the Kyuafile provided by this directory will be diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile --- a/share/examples/tests/tests/atf/Makefile +++ b/share/examples/tests/tests/atf/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile --- a/share/examples/tests/tests/plain/Makefile +++ b/share/examples/tests/tests/plain/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/examples/tests/tests/plain/printf_test.c b/share/examples/tests/tests/plain/printf_test.c --- a/share/examples/tests/tests/plain/printf_test.c +++ b/share/examples/tests/tests/plain/printf_test.c @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/share/examples/tests/tests/tap/Makefile b/share/examples/tests/tests/tap/Makefile --- a/share/examples/tests/tests/tap/Makefile +++ b/share/examples/tests/tests/tap/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/i18n/csmapper/APPLE/ARABIC%UCS.src b/share/i18n/csmapper/APPLE/ARABIC%UCS.src --- a/share/i18n/csmapper/APPLE/ARABIC%UCS.src +++ b/share/i18n/csmapper/APPLE/ARABIC%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME ARABIC/UCS SRC_ZONE 0x00-0xFF diff --git a/share/i18n/csmapper/APPLE/DEVANAGA%UCS.src b/share/i18n/csmapper/APPLE/DEVANAGA%UCS.src --- a/share/i18n/csmapper/APPLE/DEVANAGA%UCS.src +++ b/share/i18n/csmapper/APPLE/DEVANAGA%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME DEVANAGA/UCS SRC_ZONE 0x00-0xFA diff --git a/share/i18n/csmapper/APPLE/FARSI%UCS.src b/share/i18n/csmapper/APPLE/FARSI%UCS.src --- a/share/i18n/csmapper/APPLE/FARSI%UCS.src +++ b/share/i18n/csmapper/APPLE/FARSI%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME FARSI/UCS SRC_ZONE 0x00-0xFF diff --git a/share/i18n/csmapper/APPLE/GUJARATI%UCS.src b/share/i18n/csmapper/APPLE/GUJARATI%UCS.src --- a/share/i18n/csmapper/APPLE/GUJARATI%UCS.src +++ b/share/i18n/csmapper/APPLE/GUJARATI%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME GUJARATI/UCS SRC_ZONE 0x00-0xFA diff --git a/share/i18n/csmapper/APPLE/GURMUKHI%UCS.src b/share/i18n/csmapper/APPLE/GURMUKHI%UCS.src --- a/share/i18n/csmapper/APPLE/GURMUKHI%UCS.src +++ b/share/i18n/csmapper/APPLE/GURMUKHI%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME GURMUKHI/UCS SRC_ZONE 0x00-0xFA diff --git a/share/i18n/csmapper/APPLE/HEBREW%UCS.src b/share/i18n/csmapper/APPLE/HEBREW%UCS.src --- a/share/i18n/csmapper/APPLE/HEBREW%UCS.src +++ b/share/i18n/csmapper/APPLE/HEBREW%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME HEBREW/UCS SRC_ZONE 0x00-0xFF diff --git a/share/i18n/csmapper/APPLE/KEYBOARD%UCS.src b/share/i18n/csmapper/APPLE/KEYBOARD%UCS.src --- a/share/i18n/csmapper/APPLE/KEYBOARD%UCS.src +++ b/share/i18n/csmapper/APPLE/KEYBOARD%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME KEYBOARD/UCS SRC_ZONE 0x00-0x8F diff --git a/share/i18n/csmapper/APPLE/SYMBOL%UCS.src b/share/i18n/csmapper/APPLE/SYMBOL%UCS.src --- a/share/i18n/csmapper/APPLE/SYMBOL%UCS.src +++ b/share/i18n/csmapper/APPLE/SYMBOL%UCS.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME SYMBOL/UCS SRC_ZONE 0x00-0xFF diff --git a/share/i18n/csmapper/APPLE/UCS%ARABIC.src b/share/i18n/csmapper/APPLE/UCS%ARABIC.src --- a/share/i18n/csmapper/APPLE/UCS%ARABIC.src +++ b/share/i18n/csmapper/APPLE/UCS%ARABIC.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/ARABIC SRC_ZONE 0x0000-0xFB02 diff --git a/share/i18n/csmapper/APPLE/UCS%DEVANAGA.src b/share/i18n/csmapper/APPLE/UCS%DEVANAGA.src --- a/share/i18n/csmapper/APPLE/UCS%DEVANAGA.src +++ b/share/i18n/csmapper/APPLE/UCS%DEVANAGA.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/DEVANAGA SRC_ZONE 0x0000-0x2212 diff --git a/share/i18n/csmapper/APPLE/UCS%FARSI.src b/share/i18n/csmapper/APPLE/UCS%FARSI.src --- a/share/i18n/csmapper/APPLE/UCS%FARSI.src +++ b/share/i18n/csmapper/APPLE/UCS%FARSI.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/FARSI SRC_ZONE 0x0000-0xF8FF diff --git a/share/i18n/csmapper/APPLE/UCS%GUJARATI.src b/share/i18n/csmapper/APPLE/UCS%GUJARATI.src --- a/share/i18n/csmapper/APPLE/UCS%GUJARATI.src +++ b/share/i18n/csmapper/APPLE/UCS%GUJARATI.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/GUJARATI SRC_ZONE 0x0000-0xFFFF diff --git a/share/i18n/csmapper/APPLE/UCS%GURMUKHI.src b/share/i18n/csmapper/APPLE/UCS%GURMUKHI.src --- a/share/i18n/csmapper/APPLE/UCS%GURMUKHI.src +++ b/share/i18n/csmapper/APPLE/UCS%GURMUKHI.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/GURMUKHI SRC_ZONE 0x0000-0x2212 diff --git a/share/i18n/csmapper/APPLE/UCS%HEBREW.src b/share/i18n/csmapper/APPLE/UCS%HEBREW.src --- a/share/i18n/csmapper/APPLE/UCS%HEBREW.src +++ b/share/i18n/csmapper/APPLE/UCS%HEBREW.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/HEBREW SRC_ZONE 0x0000-0xFB4B diff --git a/share/i18n/csmapper/APPLE/UCS%KEYBOARD.src b/share/i18n/csmapper/APPLE/UCS%KEYBOARD.src --- a/share/i18n/csmapper/APPLE/UCS%KEYBOARD.src +++ b/share/i18n/csmapper/APPLE/UCS%KEYBOARD.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/KEYBOARD SRC_ZONE 0x0000-0xF8FF diff --git a/share/i18n/csmapper/APPLE/UCS%SYMBOL.src b/share/i18n/csmapper/APPLE/UCS%SYMBOL.src --- a/share/i18n/csmapper/APPLE/UCS%SYMBOL.src +++ b/share/i18n/csmapper/APPLE/UCS%SYMBOL.src @@ -1,4 +1,3 @@ - TYPE ROWCOL NAME UCS/SYMBOL SRC_ZONE 0x0000-0xF8FF diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc --- a/share/i18n/csmapper/Makefile.inc +++ b/share/i18n/csmapper/Makefile.inc @@ -1,4 +1,3 @@ - .include CSMAPPERDIR?= /usr/share/i18n/csmapper diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc --- a/share/i18n/esdb/Makefile.inc +++ b/share/i18n/esdb/Makefile.inc @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR} diff --git a/share/keys/Makefile b/share/keys/Makefile --- a/share/keys/Makefile +++ b/share/keys/Makefile @@ -1,4 +1,3 @@ - SUBDIR= pkg .include diff --git a/share/keys/pkg/Makefile b/share/keys/pkg/Makefile --- a/share/keys/pkg/Makefile +++ b/share/keys/pkg/Makefile @@ -1,4 +1,3 @@ - SUBDIR= trusted .include diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile --- a/share/keys/pkg/trusted/Makefile +++ b/share/keys/pkg/trusted/Makefile @@ -1,4 +1,3 @@ - PACKAGE= pkg-bootstrap FILES= pkg.freebsd.org.2013102301 diff --git a/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 --- a/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 +++ b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 @@ -1,3 +1,2 @@ - function: "sha256" fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" diff --git a/share/man/Makefile b/share/man/Makefile --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,4 +1,3 @@ - .include # XXX MISSING: man3f diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -1,4 +1,3 @@ - .include MAN= builtin.1 intro.1 diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -1,4 +1,3 @@ - .include MAN= arb.3 \ diff --git a/share/man/man3lua/Makefile b/share/man/man3lua/Makefile --- a/share/man/man3lua/Makefile +++ b/share/man/man3lua/Makefile @@ -1,4 +1,3 @@ - .include MAN= intro.3lua diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,3 @@ - .include MAN= aac.4 \ diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../man4.arm # Some manpages are common to arm and aarch64 MAN= \ diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -1,4 +1,3 @@ - MAN= \ aw_gpio.4 \ aw_mmc.4 \ diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -1,4 +1,3 @@ - MAN= apm.4 \ CPU_ELAN.4 \ glxiic.4 \ diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile --- a/share/man/man4/man4.powerpc/Makefile +++ b/share/man/man4/man4.powerpc/Makefile @@ -1,4 +1,3 @@ - MAN= adb.4 \ akbd.4 \ abtn.4 \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,4 +1,3 @@ - .include #MISSING: dump.5 plot.5 diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile --- a/share/man/man6/Makefile +++ b/share/man/man6/Makefile @@ -1,4 +1,3 @@ - MAN= intro.6 .include diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -1,4 +1,3 @@ - .include #MISSING: eqnchar.7 ms.7 term.7 diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,3 @@ - .include MAN= \ diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,4 +1,3 @@ - .include MAN= accept_filter.9 \ diff --git a/share/misc/Makefile b/share/misc/Makefile --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/../../sys/dev/usb diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -1,4 +1,3 @@ - # This file is meant to list all FreeBSD doc+www committers and describe the # mentor-mentee relationships between them. # The graphical output can be generated from this file with the following diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -1,4 +1,3 @@ - # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. # The graphical output can be generated from this file with the following diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -1,4 +1,3 @@ - # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. # The graphical output can be generated from this file with the following diff --git a/share/misc/latin1 b/share/misc/latin1 index 193ac4dedece8fd4117f84d6d44af4f33c2726fb..ab4c38f4bd683dcdf41ee9af35d89690e3db5ad8 GIT binary patch literal 2378 zc$_uX$JP}^6vgp5Pq81NPxW{ERy|HvhoKXv-^-X45i#eSvmzoYBBCN92C|ZL?{n&o z_F6UgkLtIo_S0U6yXxKhY0rRrz)irt+8(%1y9eB_-2e}02jD^N7I+Bz2lmsZ10Lqd zhJ{D8EF9Fb@TiuBLs}Ld)3R__%fjPc7+5&MlYxaNv@ATSW#K6;3r}lVct*>@vsxCO z^TL*e=XtVa;RP)VFKStMNz1~^S{7c>vhb>wh1XQ*I~HCCmxVX9EWD{@;Vmr-Z);h2 zN6W&yS{B~(g0b*EPmF~Rv@Cq6W#J<&3mOTr~v~tV4wyJ)PR8+Fi-;qYQR9K)ISka@ctthk<2u7+9*qz%n@uEVIMFvN#MZYlDF`U|*z4BR)>Lgau`@=hkyN54FSW3 zfMG+xupwaB5HM^A7&h!+*bp#m2pA@<2esxfOj-|Vdxv4tdRV(@Fic*L=w$0KY?~d1 zZHvRO+&K)(<}fTLhhe#IFf8vm49gpbVR>*EmbVVWa&{P&i^H(eISeb-U|2~G!%FWk ztn4`qD;tMlWpEf)whqHeb{JMlgOR#;F;W*VM(X0lNL{=bsf!mQb@5`PE?$h(?Ou%3 zWrvZv;xLllprcxI7)fu?F>UWKlHQ=>+D(Iz^a`EO$<|>c%MK%1aTrN&(n+m3jHEZ| zl(ug$l3u0LI@vgkq*v*TcIz-w$_^u?;xLllsIyvYFp^%Wb2{lAM$#*FUb}G^Nw3re z?bczWK0A!mmj*+>7{Tyg%*FPLxzv6!m)kGqO8doJZNHdn?H6-B3IQYS1q}by+-Sd= Vo9$O~tNm(jw_nYj_Nx(${{d*aw2A-# literal 2379 zc$_uX$JP}^6vgp5Pq81NPxW{ERy|HvhoKXv-^-X45i#eSvmzoYBBCN92C|ZL?{n&o z_F6UgkLtIo4(zAB4tLeNxdz+=ZUXMr_P~AGJ>Y)r26#X_01s-nz(d$Su%9*^@Gws{ zEIguR;h>g*(z5WFmW9Jw79RJ)z`_xp3@kjMW#LIJ3r}fTcv{QCGg=m&)w1xM z7q%=s&yy_+FKAhKQOm+hS{7c`vha$Qg;%vKyrx3mvG6*$EWDv*;Y}?IZ)sV0Tg$>b zS{B~bvhbc4jD`1kVk~^1W#L0D3m<7&_*l!rCt4Oh)w1xJ7ZMAf^CYqGg_eb*S{A<4 zvT#hx!dF@rj%!)?+6z4kCwS7c@Qs#*Z?!CZr)A-!mWA)NES%D^@Pik4A8?u{x(`2U zSvaF*;U_H%KWka|Ma#ljEepSTLHFStPjnxC)3R`0%fjzk7A|O6_(RLWpIR3F@`CQe z-#pQMxTs~}l9q+bS{ANoS-7fY;hL6(>t4`(_=hLD5C3XexS?g?rj~_US{80=S-7KR z;Xf7*>|+cV7y|~zfPpb!Uu5tW`}`kaTu7^1_N`z zz#K3z2Mo*s19QN@9565k49q(in6tycTpR}G(P3b&4g>S#Ffh*!1M}iAFs}^;mVkjJ zU|Oy3@oF=z)~FsmdRmYnH>g}#bIDs8w{)g18cy* z8ZfX146FeIYrw!7FtF}mV9gE#YjGG@M~8v6It;9n!@xQ_46KX8z`E{W*bp#m2pBd5 z3>yN54FSW3fMG+xuwe(ohJay1z%Xe&s5OUS(t1eSI}DT7!`e-QVe)!JCtHVM+w3rG zTO5Yv&S6+KhhaH649k6kVR_GCSl&1c%Y(zPymc6sv%|1l9EO$7VOX&S!%A`(R(gkF zWzS()**FXQWq~q>f*&nUA!2nix(qx@nWQI_hO_j zJB-v7hmrIK9o3q{NP2^gX?ur}^adT*ZW@fFSLlRJwhkj%b{NTu!$^9QPHN3zB)v(e zw0(n-^eUa!$;M$My-H`aTZfTSb{HuYhmrI~oz+@{k@QNP(@F0zl3uCv+Kt0VdZjLC zw+aY?N@WV{c7&CUyWe=55=jplmGw# diff --git a/share/misc/organization.dot b/share/misc/organization.dot --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -1,4 +1,3 @@ - # This file is meant to show the infrastructural organization of the # FreeBSD Project; what kind of teams we have and how they relate to # each other. diff --git a/share/mk/Makefile b/share/mk/Makefile --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,3 @@ - # Only parse this if executing make in this directory, not in other places # in src that lack a Makefile, such as sys/dev/*. Otherwise the MAKESYSPATH # will read this Makefile since it auto includes it into -I. diff --git a/share/mk/bsd.README b/share/mk/bsd.README --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,3 @@ - This is the README file for the "include" files for the FreeBSD source tree. The files are installed in /usr/share/mk, and are by convention, named with the suffix ".mk". These files store several diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -1,4 +1,3 @@ - .if !targets(__<${_this:T}>__) __<${_this:T}>__: diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -1,4 +1,3 @@ - # Setup variables for the compiler # # COMPILER_TYPE is the major type of compiler. Currently gcc and clang support diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -1,4 +1,3 @@ - .if !target(____) . error bsd.conf.mk cannot be included directly. .endif diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -1,4 +1,3 @@ - # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but # may tune support for more advanced processors. diff --git a/share/mk/bsd.dtb.mk b/share/mk/bsd.dtb.mk --- a/share/mk/bsd.dtb.mk +++ b/share/mk/bsd.dtb.mk @@ -1,4 +1,3 @@ - .include .include "${SYSDIR}/conf/dtb.mk" diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -1,4 +1,3 @@ - .if ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_ARCH} == "amd64" || \ diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -1,4 +1,3 @@ - .if !target(____) .error bsd.files.mk cannot be included directly. .endif diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -1,4 +1,3 @@ - .if !target(____) .error bsd.incs.mk cannot be included directly. .endif diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -1,4 +1,3 @@ - # The include file includes , # ../Makefile.inc and ; this is used at the # top of all files that actually "build something". diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,4 +1,3 @@ - .-include .include diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,3 @@ - .include .include .include diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -1,4 +1,3 @@ - # The include file define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this # file where necessary. diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -1,4 +1,3 @@ - # Setup variables for the linker. # # LINKER_TYPE is the major type of linker. Currently binutils and lld support diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -1,4 +1,3 @@ - .if !target(____) .error bsd.links.mk cannot be included directly. .endif diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -1,4 +1,3 @@ - .if !defined(PORTSDIR) # Autodetect if the command is being run in a ports tree that's not rooted # in the default /usr/ports. The ../../.. case is in case ports ever grows diff --git a/share/mk/bsd.port.options.mk b/share/mk/bsd.port.options.mk --- a/share/mk/bsd.port.options.mk +++ b/share/mk/bsd.port.options.mk @@ -1,4 +1,3 @@ - USEOPTIONSMK= yes INOPTIONSMK= yes diff --git a/share/mk/bsd.port.post.mk b/share/mk/bsd.port.post.mk --- a/share/mk/bsd.port.post.mk +++ b/share/mk/bsd.port.post.mk @@ -1,4 +1,3 @@ - AFTERPORTMK= yes .include diff --git a/share/mk/bsd.port.pre.mk b/share/mk/bsd.port.pre.mk --- a/share/mk/bsd.port.pre.mk +++ b/share/mk/bsd.port.pre.mk @@ -1,4 +1,3 @@ - BEFOREPORTMK= yes .include diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -1,4 +1,3 @@ - .if !defined(PORTSDIR) # Autodetect if the command is being run in a ports tree that's not rooted # in the default /usr/ports. The ../../.. case is in case ports ever grows diff --git a/share/mk/bsd.snmpmod.mk b/share/mk/bsd.snmpmod.mk --- a/share/mk/bsd.snmpmod.mk +++ b/share/mk/bsd.snmpmod.mk @@ -1,4 +1,3 @@ - INCSDIR= ${INCLUDEDIR}/bsnmp SHLIB_NAME= snmp_${MOD}.so.${SHLIB_MAJOR} diff --git a/share/mk/bsd.suffixes-posix.mk b/share/mk/bsd.suffixes-posix.mk --- a/share/mk/bsd.suffixes-posix.mk +++ b/share/mk/bsd.suffixes-posix.mk @@ -1,4 +1,3 @@ - # Posix 1003.2 mandated rules # # Quoted directly from the Posix 1003.2 draft, only the macros diff --git a/share/mk/bsd.suffixes.mk b/share/mk/bsd.suffixes.mk --- a/share/mk/bsd.suffixes.mk +++ b/share/mk/bsd.suffixes.mk @@ -1,4 +1,3 @@ - .sh: cp -f ${.IMPSRC} ${.TARGET} chmod a+x ${.TARGET} diff --git a/share/mk/bsd.symver.mk b/share/mk/bsd.symver.mk --- a/share/mk/bsd.symver.mk +++ b/share/mk/bsd.symver.mk @@ -1,4 +1,3 @@ - .if !target(____) ____: diff --git a/share/mk/bsd.sysdir.mk b/share/mk/bsd.sysdir.mk --- a/share/mk/bsd.sysdir.mk +++ b/share/mk/bsd.sysdir.mk @@ -1,4 +1,3 @@ - .-include # Search for kernel source tree in standard places. diff --git a/share/mk/kmod.opts.mk b/share/mk/kmod.opts.mk --- a/share/mk/kmod.opts.mk +++ b/share/mk/kmod.opts.mk @@ -1,3 +1,2 @@ - .include .include "${SYSDIR}/conf/kmod.opts.mk" diff --git a/share/mk/local.autodep.mk b/share/mk/local.autodep.mk --- a/share/mk/local.autodep.mk +++ b/share/mk/local.autodep.mk @@ -1,4 +1,3 @@ - .if ${.MAKE.DEPENDFILE:M*.${MACHINE}} == "" # by default only MACHINE0 does updates UPDATE_DEPENDFILE_MACHINE?= ${MACHINE0:U${MACHINE}} diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk --- a/share/mk/local.dirdeps-options.mk +++ b/share/mk/local.dirdeps-options.mk @@ -1,4 +1,3 @@ - # avoid duplication DIRDEPS.AUDIT.yes= lib/libbsm DIRDEPS.BLACKLIST_SUPPORT.yes+= lib/libblacklist diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk --- a/share/mk/local.gendirdeps.mk +++ b/share/mk/local.gendirdeps.mk @@ -1,4 +1,3 @@ - # suppress optional/auto dependencies # local.dirdeps.mk will put them in if necessary GENDIRDEPS_FILTER+= \ diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk --- a/share/mk/local.init.mk +++ b/share/mk/local.init.mk @@ -1,4 +1,3 @@ - .if !target(__${_this}__) __${_this}__: diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.mk --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -1,4 +1,3 @@ - # local configuration specific to meta mode .-include diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -1,4 +1,3 @@ - # For universe we want to potentially # build for multiple MACHINE_ARCH per MACHINE # so we need more than MACHINE in TARGET_SPEC diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -1,4 +1,3 @@ - # local configuration specific to meta mode # we assume that MK_DIRDEPS_BUILD=yes diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -1,4 +1,3 @@ - # This makefile is for customizations that should be done early .if !defined(_TARGETS) diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk --- a/share/mk/local.sys.machine.mk +++ b/share/mk/local.sys.machine.mk @@ -1,4 +1,3 @@ - .-include PSEUDO_MACHINE_LIST?= common host host32 diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -1,4 +1,3 @@ - .if !target(_${_this}_) _${_this}_: .NOTMAIN diff --git a/share/mk/netbsd-tests.test.mk b/share/mk/netbsd-tests.test.mk --- a/share/mk/netbsd-tests.test.mk +++ b/share/mk/netbsd-tests.test.mk @@ -1,4 +1,3 @@ - .if !target(__netbsd_tests.test.mk__) __netbsd_tests.test.mk__: diff --git a/share/mk/src.init.mk b/share/mk/src.init.mk --- a/share/mk/src.init.mk +++ b/share/mk/src.init.mk @@ -1,4 +1,3 @@ - .if !target(____) ____: diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -1,4 +1,3 @@ - # early setup only see also src.sys.mk # bmake-20170301 started taking '-C' "as is" for some cases, notably absolute diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -1,4 +1,3 @@ - # Note: This file is also duplicated in the sys/conf/kern.pre.mk so # it will always grab SRCCONF, even if it isn't being built in-tree # to preserve historical (and useful) behavior. Changes here need to diff --git a/share/mk/sys.mk b/share/mk/sys.mk --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,3 @@ - unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_NUMERIC diff --git a/share/security/Makefile b/share/security/Makefile --- a/share/security/Makefile +++ b/share/security/Makefile @@ -1,4 +1,3 @@ - FILES= lomac-policy.contexts FILESDIR= ${BINDIR}/security diff --git a/share/skel/Makefile b/share/skel/Makefile --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -1,4 +1,3 @@ - FILES= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ dot.shrc dot.mail_aliases FILESDIR= ${SHAREDIR}/skel diff --git a/share/snmp/Makefile b/share/snmp/Makefile --- a/share/snmp/Makefile +++ b/share/snmp/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mibs .include diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile --- a/share/snmp/mibs/Makefile +++ b/share/snmp/mibs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bsnmp FILES= FREEBSD-MIB.txt diff --git a/share/syscons/Makefile b/share/syscons/Makefile --- a/share/syscons/Makefile +++ b/share/syscons/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fonts keymaps scrnmaps SUBDIR_PARALLEL= diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc --- a/share/syscons/Makefile.inc +++ b/share/syscons/Makefile.inc @@ -1,2 +1 @@ - FILESPACKAGE= syscons diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data FILES= INDEX.keymaps \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data SCRMAPS = armscii8-2haik8.scm \ diff --git a/share/tabset/Makefile b/share/tabset/Makefile --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -1,4 +1,3 @@ - FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \ xerox1730-lm zenith29 diff --git a/share/termcap/Makefile b/share/termcap/Makefile --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,4 +1,3 @@ - # reorder gives an editor command for most common terminals # (in reverse order from n'th to 1'st most commonly used) # to move them to the front of termcap diff --git a/share/termcap/README b/share/termcap/README --- a/share/termcap/README +++ b/share/termcap/README @@ -1,4 +1,3 @@ - << 12 May 1983 >> To install this directory on your system: diff --git a/share/tests/Makefile b/share/tests/Makefile --- a/share/tests/Makefile +++ b/share/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/share/timedef/Makefile b/share/timedef/Makefile --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_TIME diff --git a/share/vt/Makefile b/share/vt/Makefile --- a/share/vt/Makefile +++ b/share/vt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fonts keymaps .include diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile --- a/share/vt/fonts/Makefile +++ b/share/vt/fonts/Makefile @@ -1,4 +1,3 @@ - PACKAGE= vt-data .PATH: ${SRCTOP}/contrib/spleen diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= vt-data FILES= INDEX.keymaps \ diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -1,4 +1,3 @@ - # # HOW TO UPDATE THE ZONEINFO DATA # diff --git a/share/zoneinfo/tests/Makefile b/share/zoneinfo/tests/Makefile --- a/share/zoneinfo/tests/Makefile +++ b/share/zoneinfo/tests/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tzdata diff --git a/stand/Makefile b/stand/Makefile --- a/stand/Makefile +++ b/stand/Makefile @@ -1,4 +1,3 @@ - .include # For amd64 we have to build 32 and 64 bit versions of things. For diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64 --- a/stand/Makefile.amd64 +++ b/stand/Makefile.amd64 @@ -1,4 +1,3 @@ - S.yes+= userboot S.yes+= i386 diff --git a/stand/Makefile.inc b/stand/Makefile.inc --- a/stand/Makefile.inc +++ b/stand/Makefile.inc @@ -1,4 +1,3 @@ - SUBDIR_PARALLEL= yes .include "defs.mk" diff --git a/stand/arm64/Makefile b/stand/arm64/Makefile --- a/stand/arm64/Makefile +++ b/stand/arm64/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/defaults/Makefile b/stand/defaults/Makefile --- a/stand/defaults/Makefile +++ b/stand/defaults/Makefile @@ -1,4 +1,3 @@ - .include FILES+= loader.conf diff --git a/stand/defs.mk b/stand/defs.mk --- a/stand/defs.mk +++ b/stand/defs.mk @@ -1,4 +1,3 @@ - .if !defined(__BOOT_DEFS_MK__) __BOOT_DEFS_MK__=${MFILE} diff --git a/stand/efi/Makefile b/stand/efi/Makefile --- a/stand/efi/Makefile +++ b/stand/efi/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc --- a/stand/efi/Makefile.inc +++ b/stand/efi/Makefile.inc @@ -1,4 +1,3 @@ - # Options used when building app-specific efi components # See conf/kern.mk for the correct set of these CFLAGS+= -Wformat diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -1,4 +1,3 @@ - .include BOOT1?= boot1 diff --git a/stand/efi/fdt/Makefile b/stand/efi/fdt/Makefile --- a/stand/efi/fdt/Makefile +++ b/stand/efi/fdt/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${LDRSRC} diff --git a/stand/efi/gptboot/Makefile b/stand/efi/gptboot/Makefile --- a/stand/efi/gptboot/Makefile +++ b/stand/efi/gptboot/Makefile @@ -1,4 +1,3 @@ - # ZFS is not supported, we want debugging until this is vetted and # we don't want the gptboot.efifat thing created. MK_LOADER_ZFS=no diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -1,4 +1,3 @@ - .include LIB= efi diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -1,4 +1,3 @@ - LOADER_NET_SUPPORT?= yes LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc --- a/stand/efi/loader/arch/amd64/Makefile.inc +++ b/stand/efi/loader/arch/amd64/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= amd64_tramp.S \ start.S \ elf64_freebsd.c \ diff --git a/stand/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc --- a/stand/efi/loader/arch/arm/Makefile.inc +++ b/stand/efi/loader/arch/arm/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= exec.c \ start.S diff --git a/stand/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc --- a/stand/efi/loader/arch/arm64/Makefile.inc +++ b/stand/efi/loader/arch/arm64/Makefile.inc @@ -1,4 +1,3 @@ - HAVE_FDT=yes SRCS+= exec.c \ diff --git a/stand/efi/loader/arch/riscv/Makefile.inc b/stand/efi/loader/arch/riscv/Makefile.inc --- a/stand/efi/loader/arch/riscv/Makefile.inc +++ b/stand/efi/loader/arch/riscv/Makefile.inc @@ -1,4 +1,3 @@ - HAVE_FDT=yes SRCS+= exec.c \ diff --git a/stand/efi/loader/version b/stand/efi/loader/version --- a/stand/efi/loader/version +++ b/stand/efi/loader/version @@ -1,4 +1,3 @@ - NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. diff --git a/stand/efi/loader_4th/Makefile b/stand/efi/loader_4th/Makefile --- a/stand/efi/loader_4th/Makefile +++ b/stand/efi/loader_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/efi/loader_lua/Makefile b/stand/efi/loader_lua/Makefile --- a/stand/efi/loader_lua/Makefile +++ b/stand/efi/loader_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua INSTALL_LOADER_HELP_FILE=no diff --git a/stand/efi/loader_simp/Makefile b/stand/efi/loader_simp/Makefile --- a/stand/efi/loader_simp/Makefile +++ b/stand/efi/loader_simp/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=simp .include "../loader/Makefile" diff --git a/stand/fdt.mk b/stand/fdt.mk --- a/stand/fdt.mk +++ b/stand/fdt.mk @@ -1,4 +1,3 @@ - .if ${MK_FDT} == "yes" CFLAGS+= -I${FDTSRC} CFLAGS+= -I${BOOTOBJ}/fdt diff --git a/stand/fdt/Makefile b/stand/fdt/Makefile --- a/stand/fdt/Makefile +++ b/stand/fdt/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SYSDIR}/contrib/libfdt/ diff --git a/stand/ficl.mk b/stand/ficl.mk --- a/stand/ficl.mk +++ b/stand/ficl.mk @@ -1,4 +1,3 @@ - # Common flags to build FICL related files .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1 diff --git a/stand/ficl/fileaccess.c b/stand/ficl/fileaccess.c --- a/stand/ficl/fileaccess.c +++ b/stand/ficl/fileaccess.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/stand/ficl/unix.c b/stand/ficl/unix.c --- a/stand/ficl/unix.c +++ b/stand/ficl/unix.c @@ -1,4 +1,3 @@ - #include #include diff --git a/stand/ficl/x86/sysdep.c b/stand/ficl/x86/sysdep.c --- a/stand/ficl/x86/sysdep.c +++ b/stand/ficl/x86/sysdep.c @@ -1,4 +1,3 @@ - #ifndef TESTMAIN #include diff --git a/stand/ficl32/Makefile b/stand/ficl32/Makefile --- a/stand/ficl32/Makefile +++ b/stand/ficl32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include "${.CURDIR}/../ficl/Makefile" diff --git a/stand/fonts/Makefile b/stand/fonts/Makefile --- a/stand/fonts/Makefile +++ b/stand/fonts/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/terminus diff --git a/stand/forth/Makefile b/stand/forth/Makefile --- a/stand/forth/Makefile +++ b/stand/forth/Makefile @@ -1,4 +1,3 @@ - .include MAN+= beastie.4th.8 \ diff --git a/stand/i386/Makefile b/stand/i386/Makefile --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -1,4 +1,3 @@ - PROG?= boot0 STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/boot0sio/Makefile b/stand/i386/boot0sio/Makefile --- a/stand/i386/boot0sio/Makefile +++ b/stand/i386/boot0sio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../boot0 PROGNAME= boot0sio diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile --- a/stand/i386/boot2/Makefile +++ b/stand/i386/boot2/Makefile @@ -1,4 +1,3 @@ - .include FILES= boot boot1 boot2 diff --git a/stand/i386/btx/Makefile b/stand/i386/btx/Makefile --- a/stand/i386/btx/Makefile +++ b/stand/i386/btx/Makefile @@ -1,4 +1,3 @@ - SUBDIR= btx btxldr lib .include diff --git a/stand/i386/btx/Makefile.inc b/stand/i386/btx/Makefile.inc --- a/stand/i386/btx/Makefile.inc +++ b/stand/i386/btx/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile --- a/stand/i386/btx/btx/Makefile +++ b/stand/i386/btx/btx/Makefile @@ -1,4 +1,3 @@ - .include PROG= btx diff --git a/stand/i386/btx/btxldr/Makefile b/stand/i386/btx/btxldr/Makefile --- a/stand/i386/btx/btxldr/Makefile +++ b/stand/i386/btx/btxldr/Makefile @@ -1,4 +1,3 @@ - .include PROG= btxldr diff --git a/stand/i386/btx/lib/Makefile b/stand/i386/btx/lib/Makefile --- a/stand/i386/btx/lib/Makefile +++ b/stand/i386/btx/lib/Makefile @@ -1,4 +1,3 @@ - .include PROG= crt0.o diff --git a/stand/i386/cdboot/Makefile b/stand/i386/cdboot/Makefile --- a/stand/i386/cdboot/Makefile +++ b/stand/i386/cdboot/Makefile @@ -1,4 +1,3 @@ - .include PROG= cdboot diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile --- a/stand/i386/gptboot/Makefile +++ b/stand/i386/gptboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${SASRC} diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile --- a/stand/i386/gptzfsboot/Makefile +++ b/stand/i386/gptzfsboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile --- a/stand/i386/isoboot/Makefile +++ b/stand/i386/isoboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -1,4 +1,3 @@ - .include LIB= i386 diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -1,4 +1,3 @@ - HAVE_ZFS= ${MK_LOADER_ZFS} LOADER_NET_SUPPORT?= yes diff --git a/stand/i386/loader/version b/stand/i386/loader/version --- a/stand/i386/loader/version +++ b/stand/i386/loader/version @@ -1,4 +1,3 @@ - NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. diff --git a/stand/i386/loader_4th/Makefile b/stand/i386/loader_4th/Makefile --- a/stand/i386/loader_4th/Makefile +++ b/stand/i386/loader_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/i386/loader_lua/Makefile b/stand/i386/loader_lua/Makefile --- a/stand/i386/loader_lua/Makefile +++ b/stand/i386/loader_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua INSTALL_LOADER_HELP_FILE=no diff --git a/stand/i386/loader_simp/Makefile b/stand/i386/loader_simp/Makefile --- a/stand/i386/loader_simp/Makefile +++ b/stand/i386/loader_simp/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=simp .include "../loader/Makefile" diff --git a/stand/i386/mbr/Makefile b/stand/i386/mbr/Makefile --- a/stand/i386/mbr/Makefile +++ b/stand/i386/mbr/Makefile @@ -1,4 +1,3 @@ - PROG= mbr STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/pmbr/Makefile b/stand/i386/pmbr/Makefile --- a/stand/i386/pmbr/Makefile +++ b/stand/i386/pmbr/Makefile @@ -1,4 +1,3 @@ - PROG= pmbr STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -1,4 +1,3 @@ - .include PROG= ${LDR} diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile --- a/stand/i386/zfsboot/Makefile +++ b/stand/i386/zfsboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${BOOTSRC}/common diff --git a/stand/images/Makefile b/stand/images/Makefile --- a/stand/images/Makefile +++ b/stand/images/Makefile @@ -1,4 +1,3 @@ - .include FILES+= freebsd-brand-rev.png freebsd-brand.png freebsd-logo-rev.png diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -1,4 +1,3 @@ - LOADER_DISK_SUPPORT?= yes LOADER_CD9660_SUPPORT?= yes LOADER_MSDOS_SUPPORT?= no diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile --- a/stand/liblua/Makefile +++ b/stand/liblua/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${LUASRC} diff --git a/stand/liblua32/Makefile b/stand/liblua32/Makefile --- a/stand/liblua32/Makefile +++ b/stand/liblua32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include "${.CURDIR}/../liblua/Makefile" diff --git a/stand/libofw/Makefile b/stand/libofw/Makefile --- a/stand/libofw/Makefile +++ b/stand/libofw/Makefile @@ -1,4 +1,3 @@ - .include LIB= ofw diff --git a/stand/libsa/crc32_libkern.c b/stand/libsa/crc32_libkern.c --- a/stand/libsa/crc32_libkern.c +++ b/stand/libsa/crc32_libkern.c @@ -1,2 +1 @@ - #include "../../sys/libkern/gsb_crc32.c" diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${ZFSSRC} .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl diff --git a/stand/libsa32/Makefile b/stand/libsa32/Makefile --- a/stand/libsa32/Makefile +++ b/stand/libsa32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include diff --git a/stand/loader.mk b/stand/loader.mk --- a/stand/loader.mk +++ b/stand/loader.mk @@ -1,4 +1,3 @@ - .PATH: ${LDRSRC} ${BOOTSRC}/libsa CFLAGS+=-I${LDRSRC} diff --git a/stand/lua.mk b/stand/lua.mk --- a/stand/lua.mk +++ b/stand/lua.mk @@ -1,4 +1,3 @@ - # Common flags to build lua related files CFLAGS+= -I${LUASRC} -I${LDRSRC} -I${LIBLUASRC} diff --git a/stand/lua/Makefile b/stand/lua/Makefile --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -1,4 +1,3 @@ - .include MAN= loader.conf.lua.5 \ diff --git a/stand/man/Makefile b/stand/man/Makefile --- a/stand/man/Makefile +++ b/stand/man/Makefile @@ -1,4 +1,3 @@ - .include M.${MK_EFI}+= boot1.efi.8 diff --git a/stand/powerpc/Makefile b/stand/powerpc/Makefile --- a/stand/powerpc/Makefile +++ b/stand/powerpc/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/powerpc/Makefile.inc b/stand/powerpc/Makefile.inc --- a/stand/powerpc/Makefile.inc +++ b/stand/powerpc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -1,4 +1,3 @@ - .include PROG= boot1.elf diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -1,4 +1,3 @@ - LOADER_CD9660_SUPPORT?= yes LOADER_EXT2FS_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no diff --git a/stand/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc --- a/stand/powerpc/ofw/ldscript.powerpc +++ b/stand/powerpc/ofw/ldscript.powerpc @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc:common) diff --git a/stand/powerpc/ofw/ldscript.powerpcle b/stand/powerpc/ofw/ldscript.powerpcle --- a/stand/powerpc/ofw/ldscript.powerpcle +++ b/stand/powerpc/ofw/ldscript.powerpcle @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-powerpcle-freebsd", "elf32-powerpcle-freebsd", "elf32-powerpcle-freebsd") OUTPUT_ARCH(powerpcle:common) diff --git a/stand/powerpc/ofw/version b/stand/powerpc/ofw/version --- a/stand/powerpc/ofw/version +++ b/stand/powerpc/ofw/version @@ -1,4 +1,3 @@ - NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -1,4 +1,3 @@ - LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/ldscript.arm --- a/stand/uboot/arch/arm/ldscript.arm +++ b/stand/uboot/arch/arm/ldscript.arm @@ -1,4 +1,3 @@ - OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS diff --git a/stand/uboot/arch/powerpc/Makefile.inc b/stand/uboot/arch/powerpc/Makefile.inc --- a/stand/uboot/arch/powerpc/Makefile.inc +++ b/stand/uboot/arch/powerpc/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= start.S conf.c ppc64_elf_freebsd.c .PATH: ${SYSDIR}/libkern SRCS+= ucmpdi2.c diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/ldscript.powerpc --- a/stand/uboot/arch/powerpc/ldscript.powerpc +++ b/stand/uboot/arch/powerpc/ldscript.powerpc @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc:common) diff --git a/stand/uboot/help.uboot b/stand/uboot/help.uboot --- a/stand/uboot/help.uboot +++ b/stand/uboot/help.uboot @@ -1,4 +1,3 @@ - ############################################################################### # Tubenv DShow or import U-Boot environment variables diff --git a/stand/uboot/version b/stand/uboot/version --- a/stand/uboot/version +++ b/stand/uboot/version @@ -1,4 +1,3 @@ - NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. diff --git a/stand/usb/tools/Makefile b/stand/usb/tools/Makefile --- a/stand/usb/tools/Makefile +++ b/stand/usb/tools/Makefile @@ -1,4 +1,3 @@ - PROG= sysinit MAN= diff --git a/stand/userboot/Makefile b/stand/userboot/Makefile --- a/stand/userboot/Makefile +++ b/stand/userboot/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.yes= test diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc --- a/stand/userboot/Makefile.inc +++ b/stand/userboot/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/userboot/test/Makefile b/stand/userboot/test/Makefile --- a/stand/userboot/test/Makefile +++ b/stand/userboot/test/Makefile @@ -1,4 +1,3 @@ - .include PROG= test diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -1,4 +1,3 @@ - LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no diff --git a/stand/userboot/userboot/version b/stand/userboot/userboot/version --- a/stand/userboot/userboot/version +++ b/stand/userboot/userboot/version @@ -1,4 +1,3 @@ - 1.2: Userboot with lua or forth 1.1: Initial userland boot diff --git a/stand/userboot/userboot_4th/Makefile b/stand/userboot/userboot_4th/Makefile --- a/stand/userboot/userboot_4th/Makefile +++ b/stand/userboot/userboot_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/userboot/userboot_lua/Makefile b/stand/userboot/userboot_lua/Makefile --- a/stand/userboot/userboot_lua/Makefile +++ b/stand/userboot/userboot_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua .include "../userboot/Makefile" diff --git a/sys/Makefile b/sys/Makefile --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,3 @@ - # Directories to include in cscope name file and TAGS. CSCOPEDIRS= bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 \ diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile --- a/sys/amd64/Makefile +++ b/sys/amd64/Makefile @@ -1,4 +1,3 @@ - # Makefile for amd64 links, tags file # SYS is normally set in Make.tags.inc diff --git a/sys/amd64/conf/GENERIC-KASAN b/sys/amd64/conf/GENERIC-KASAN --- a/sys/amd64/conf/GENERIC-KASAN +++ b/sys/amd64/conf/GENERIC-KASAN @@ -1,4 +1,3 @@ - include GENERIC ident GENERIC-KASAN diff --git a/sys/amd64/conf/GENERIC-KMSAN b/sys/amd64/conf/GENERIC-KMSAN --- a/sys/amd64/conf/GENERIC-KMSAN +++ b/sys/amd64/conf/GENERIC-KMSAN @@ -1,4 +1,3 @@ - include GENERIC ident GENERIC-KMSAN diff --git a/sys/amd64/conf/LINT b/sys/amd64/conf/LINT --- a/sys/amd64/conf/LINT +++ b/sys/amd64/conf/LINT @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include "../../x86/conf/NOTES" include NOTES diff --git a/sys/amd64/conf/LINT-NOINET b/sys/amd64/conf/LINT-NOINET --- a/sys/amd64/conf/LINT-NOINET +++ b/sys/amd64/conf/LINT-NOINET @@ -1,4 +1,3 @@ - include LINT ident LINT-NOINET makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" diff --git a/sys/amd64/conf/LINT-NOINET6 b/sys/amd64/conf/LINT-NOINET6 --- a/sys/amd64/conf/LINT-NOINET6 +++ b/sys/amd64/conf/LINT-NOINET6 @@ -1,4 +1,3 @@ - include LINT ident LINT-NOINET6 makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP --- a/sys/amd64/conf/LINT-NOIP +++ b/sys/amd64/conf/LINT-NOIP @@ -1,4 +1,3 @@ - include LINT ident LINT-NOIP makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1,4 +1,3 @@ - ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm --- a/sys/amd64/linux32/linux32_locore.asm +++ b/sys/amd64/linux32/linux32_locore.asm @@ -1,4 +1,3 @@ - #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1,4 +1,3 @@ - ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux32_sysent.c, linux32_proto.h and linux32_syscall.h. diff --git a/sys/arm/allwinner/a10/files.a10 b/sys/arm/allwinner/a10/files.a10 --- a/sys/arm/allwinner/a10/files.a10 +++ b/sys/arm/allwinner/a10/files.a10 @@ -1,4 +1,3 @@ - arm/allwinner/a10/a10_intc.c standard arm/allwinner/a10/a10_padconf.c standard arm/allwinner/clkng/ccu_a10.c standard diff --git a/sys/arm/allwinner/a13/files.a13 b/sys/arm/allwinner/a13/files.a13 --- a/sys/arm/allwinner/a13/files.a13 +++ b/sys/arm/allwinner/a13/files.a13 @@ -1,3 +1,2 @@ - arm/allwinner/a13/a13_padconf.c standard arm/allwinner/clkng/ccu_a13.c standard diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20 --- a/sys/arm/allwinner/a20/files.a20 +++ b/sys/arm/allwinner/a20/files.a20 @@ -1,3 +1,2 @@ - arm/allwinner/a20/a20_padconf.c standard arm/allwinner/clkng/ccu_a10.c standard diff --git a/sys/arm/allwinner/a31/files.a31 b/sys/arm/allwinner/a31/files.a31 --- a/sys/arm/allwinner/a31/files.a31 +++ b/sys/arm/allwinner/a31/files.a31 @@ -1,4 +1,3 @@ - arm/allwinner/clkng/ccu_a31.c standard arm/allwinner/a31/a31_padconf.c standard arm/allwinner/a31/a31_r_padconf.c standard diff --git a/sys/arm/allwinner/a33/files.a33 b/sys/arm/allwinner/a33/files.a33 --- a/sys/arm/allwinner/a33/files.a33 +++ b/sys/arm/allwinner/a33/files.a33 @@ -1,2 +1 @@ - arm/allwinner/a33/a33_padconf.c standard diff --git a/sys/arm/allwinner/a83t/files.a83t b/sys/arm/allwinner/a83t/files.a83t --- a/sys/arm/allwinner/a83t/files.a83t +++ b/sys/arm/allwinner/a83t/files.a83t @@ -1,4 +1,3 @@ - arm/allwinner/clkng/ccu_a83t.c standard arm/allwinner/clkng/ccu_sun8i_r.c standard arm/allwinner/a83t/a83t_padconf.c standard diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -1,4 +1,3 @@ - arm/allwinner/a10_ahci.c optional ahci arm/allwinner/a10_codec.c optional sound arm/allwinner/a10_dmac.c optional a10_dmac diff --git a/sys/arm/allwinner/files.allwinner_up b/sys/arm/allwinner/files.allwinner_up --- a/sys/arm/allwinner/files.allwinner_up +++ b/sys/arm/allwinner/files.allwinner_up @@ -1,2 +1 @@ - arm/allwinner/a10_timer.c standard diff --git a/sys/arm/allwinner/h3/files.h3 b/sys/arm/allwinner/h3/files.h3 --- a/sys/arm/allwinner/h3/files.h3 +++ b/sys/arm/allwinner/h3/files.h3 @@ -1,4 +1,3 @@ - arm/allwinner/clkng/ccu_h3.c standard arm/allwinner/clkng/ccu_sun8i_r.c standard arm/allwinner/h3/h3_padconf.c standard diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga --- a/sys/arm/altera/socfpga/files.socfpga +++ b/sys/arm/altera/socfpga/files.socfpga @@ -1,4 +1,3 @@ - arm/altera/socfpga/socfpga_common.c standard arm/altera/socfpga/socfpga_machdep.c standard arm/altera/socfpga/socfpga_manager.c standard diff --git a/sys/arm/altera/socfpga/std.socfpga b/sys/arm/altera/socfpga/std.socfpga --- a/sys/arm/altera/socfpga/std.socfpga +++ b/sys/arm/altera/socfpga/std.socfpga @@ -1,4 +1,3 @@ - cpu CPU_CORTEXA machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a" diff --git a/sys/arm/annapurna/alpine/files.alpine b/sys/arm/annapurna/alpine/files.alpine --- a/sys/arm/annapurna/alpine/files.alpine +++ b/sys/arm/annapurna/alpine/files.alpine @@ -1,4 +1,3 @@ - arm/arm/sp804.c standard dev/uart/uart_dev_ns8250.c optional uart diff --git a/sys/arm/annapurna/alpine/std.alpine b/sys/arm/annapurna/alpine/std.alpine --- a/sys/arm/annapurna/alpine/std.alpine +++ b/sys/arm/annapurna/alpine/std.alpine @@ -1,4 +1,3 @@ - cpu CPU_CORTEXA machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES" diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835 --- a/sys/arm/broadcom/bcm2835/files.bcm2835 +++ b/sys/arm/broadcom/bcm2835/files.bcm2835 @@ -1,2 +1 @@ - arm/broadcom/bcm2835/bcm2835_systimer.c standard diff --git a/sys/arm/broadcom/bcm2835/files.bcm2836 b/sys/arm/broadcom/bcm2835/files.bcm2836 --- a/sys/arm/broadcom/bcm2835/files.bcm2836 +++ b/sys/arm/broadcom/bcm2835/files.bcm2836 @@ -1,3 +1,2 @@ - arm/broadcom/bcm2835/bcm2836.c standard arm/broadcom/bcm2835/bcm2836_mp.c optional smp diff --git a/sys/arm/broadcom/bcm2835/files.bcm283x b/sys/arm/broadcom/bcm2835/files.bcm283x --- a/sys/arm/broadcom/bcm2835/files.bcm283x +++ b/sys/arm/broadcom/bcm2835/files.bcm283x @@ -1,4 +1,3 @@ - arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc arm/broadcom/bcm2835/bcm2835_cpufreq.c standard arm/broadcom/bcm2835/bcm2835_dma.c standard diff --git a/sys/arm/broadcom/bcm2835/std.bcm2835 b/sys/arm/broadcom/bcm2835/std.bcm2835 --- a/sys/arm/broadcom/bcm2835/std.bcm2835 +++ b/sys/arm/broadcom/bcm2835/std.bcm2835 @@ -1,4 +1,3 @@ - machine arm armv6 cpu CPU_ARM1176 makeoptions CONF_CFLAGS="-mcpu=arm1176jzf-s" diff --git a/sys/arm/broadcom/bcm2835/std.bcm2836 b/sys/arm/broadcom/bcm2835/std.bcm2836 --- a/sys/arm/broadcom/bcm2835/std.bcm2836 +++ b/sys/arm/broadcom/bcm2835/std.bcm2836 @@ -1,4 +1,3 @@ - machine arm armv7 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" diff --git a/sys/arm/broadcom/bcm2835/std.rpi b/sys/arm/broadcom/bcm2835/std.rpi --- a/sys/arm/broadcom/bcm2835/std.rpi +++ b/sys/arm/broadcom/bcm2835/std.rpi @@ -1,2 +1 @@ - options LINUX_BOOT_ABI diff --git a/sys/arm/conf/LINT b/sys/arm/conf/LINT --- a/sys/arm/conf/LINT +++ b/sys/arm/conf/LINT @@ -1,3 +1,2 @@ - include "../../conf/NOTES" include NOTES diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6 --- a/sys/arm/freescale/imx/files.imx6 +++ b/sys/arm/freescale/imx/files.imx6 @@ -1,4 +1,3 @@ - # # Standard imx6 devices and support. # diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid --- a/sys/arm/freescale/vybrid/files.vybrid +++ b/sys/arm/freescale/vybrid/files.vybrid @@ -1,4 +1,3 @@ - arm/freescale/vybrid/vf_machdep.c standard arm/freescale/vybrid/vf_ccm.c standard arm/freescale/vybrid/vf_anadig.c standard diff --git a/sys/arm/freescale/vybrid/std.vybrid b/sys/arm/freescale/vybrid/std.vybrid --- a/sys/arm/freescale/vybrid/std.vybrid +++ b/sys/arm/freescale/vybrid/std.vybrid @@ -1,4 +1,3 @@ - cpu CPU_CORTEXA machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a" diff --git a/sys/arm/include/smp.h b/sys/arm/include/smp.h --- a/sys/arm/include/smp.h +++ b/sys/arm/include/smp.h @@ -1,4 +1,3 @@ - #ifndef _MACHINE_SMP_H_ #define _MACHINE_SMP_H_ diff --git a/sys/arm/mv/armadaxp/files.armadaxp b/sys/arm/mv/armadaxp/files.armadaxp --- a/sys/arm/mv/armadaxp/files.armadaxp +++ b/sys/arm/mv/armadaxp/files.armadaxp @@ -1,4 +1,3 @@ - arm/mv/armadaxp/armadaxp.c standard arm/mv/mpic.c standard arm/mv/rtc.c standard diff --git a/sys/arm/mv/armadaxp/std.armadaxp b/sys/arm/mv/armadaxp/std.armadaxp --- a/sys/arm/mv/armadaxp/std.armadaxp +++ b/sys/arm/mv/armadaxp/std.armadaxp @@ -1 +0,0 @@ - diff --git a/sys/arm/mv/armadaxp/std.mv78x60 b/sys/arm/mv/armadaxp/std.mv78x60 --- a/sys/arm/mv/armadaxp/std.mv78x60 +++ b/sys/arm/mv/armadaxp/std.mv78x60 @@ -1,3 +1,2 @@ - include "../mv/std-pj4b.mv" include "../mv/armadaxp/std.armadaxp" diff --git a/sys/arm/mv/std-pj4b.mv b/sys/arm/mv/std-pj4b.mv --- a/sys/arm/mv/std-pj4b.mv +++ b/sys/arm/mv/std-pj4b.mv @@ -1,4 +1,3 @@ - files "../mv/files.arm7" cpu CPU_MV_PJ4B machine arm armv7 diff --git a/sys/arm/nvidia/tegra124/files.tegra124 b/sys/arm/nvidia/tegra124/files.tegra124 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -1,4 +1,3 @@ - # # Standard tegra124 devices and support. # diff --git a/sys/arm/qemu/files.qemu b/sys/arm/qemu/files.qemu --- a/sys/arm/qemu/files.qemu +++ b/sys/arm/qemu/files.qemu @@ -1,4 +1,3 @@ - # # Standard qemu virt devices and support. # diff --git a/sys/arm/ti/am335x/files.am335x b/sys/arm/ti/am335x/files.am335x --- a/sys/arm/ti/am335x/files.am335x +++ b/sys/arm/ti/am335x/files.am335x @@ -1,4 +1,3 @@ - arm/ti/aintc.c standard arm/ti/am335x/am335x_dmtimer.c standard diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti --- a/sys/arm/ti/files.ti +++ b/sys/arm/ti/files.ti @@ -1,4 +1,3 @@ - arm/ti/ti_cpuid.c standard arm/ti/ti_machdep.c standard arm/ti/ti_prcm.c standard diff --git a/sys/arm/ti/omap4/files.omap4 b/sys/arm/ti/omap4/files.omap4 --- a/sys/arm/ti/omap4/files.omap4 +++ b/sys/arm/ti/omap4/files.omap4 @@ -1,4 +1,3 @@ - arm/ti/ti_smc.S standard arm/ti/usb/omap_ehci.c optional usb ehci diff --git a/sys/arm/ti/std.ti b/sys/arm/ti/std.ti --- a/sys/arm/ti/std.ti +++ b/sys/arm/ti/std.ti @@ -1,4 +1,3 @@ - machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a" diff --git a/sys/arm64/conf/LINT b/sys/arm64/conf/LINT --- a/sys/arm64/conf/LINT +++ b/sys/arm64/conf/LINT @@ -1,3 +1,2 @@ - include "../../conf/NOTES" include NOTES diff --git a/sys/arm64/conf/LINT-ACPI b/sys/arm64/conf/LINT-ACPI --- a/sys/arm64/conf/LINT-ACPI +++ b/sys/arm64/conf/LINT-ACPI @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include NOTES nooptions FDT diff --git a/sys/arm64/conf/LINT-FDT b/sys/arm64/conf/LINT-FDT --- a/sys/arm64/conf/LINT-FDT +++ b/sys/arm64/conf/LINT-FDT @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include NOTES nodevice acpi diff --git a/sys/arm64/include/bus_dma.h b/sys/arm64/include/bus_dma.h --- a/sys/arm64/include/bus_dma.h +++ b/sys/arm64/include/bus_dma.h @@ -1,4 +1,3 @@ - #ifndef _MACHINE_BUS_DMA_H_ #define _MACHINE_BUS_DMA_H_ diff --git a/sys/arm64/include/exec.h b/sys/arm64/include/exec.h --- a/sys/arm64/include/exec.h +++ b/sys/arm64/include/exec.h @@ -1,4 +1,3 @@ - #ifdef __arm__ #include #else /* !__arm__ */ diff --git a/sys/arm64/include/floatingpoint.h b/sys/arm64/include/floatingpoint.h --- a/sys/arm64/include/floatingpoint.h +++ b/sys/arm64/include/floatingpoint.h @@ -1,2 +1 @@ - #include diff --git a/sys/arm64/include/ptrace.h b/sys/arm64/include/ptrace.h --- a/sys/arm64/include/ptrace.h +++ b/sys/arm64/include/ptrace.h @@ -1,4 +1,3 @@ - #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ diff --git a/sys/arm64/include/reloc.h b/sys/arm64/include/reloc.h --- a/sys/arm64/include/reloc.h +++ b/sys/arm64/include/reloc.h @@ -1,4 +1,3 @@ - #ifdef __arm__ #include #else /* !__arm__ */ diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1,4 +1,3 @@ - ; Linux ABI system call generic name/number map, based on Linux file ; include/uapi/asm-generic/unistd.h diff --git a/sys/cam/README.quirks b/sys/cam/README.quirks --- a/sys/cam/README.quirks +++ b/sys/cam/README.quirks @@ -1,4 +1,3 @@ - FreeBSD Quirk Guidelines Nate Lawson - njl at freebsd org diff --git a/sys/cam/ctl/README.ctl.txt b/sys/cam/ctl/README.ctl.txt --- a/sys/cam/ctl/README.ctl.txt +++ b/sys/cam/ctl/README.ctl.txt @@ -1,4 +1,3 @@ - CTL - CAM Target Layer Description Revision 1.4 (December 29th, 2011) diff --git a/sys/cddl/boot/zfs/README b/sys/cddl/boot/zfs/README --- a/sys/cddl/boot/zfs/README +++ b/sys/cddl/boot/zfs/README @@ -1,4 +1,3 @@ - This directory contains various files derived from CDDL sources that are used by the ZFS bootstrap: diff --git a/sys/compat/linux/linux_errno.c b/sys/compat/linux/linux_errno.c --- a/sys/compat/linux/linux_errno.c +++ b/sys/compat/linux/linux_errno.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h --- a/sys/compat/linux/linux_persona.h +++ b/sys/compat/linux/linux_persona.h @@ -1,4 +1,3 @@ - #ifndef LINUX_PERSONALITY_H #define LINUX_PERSONALITY_H diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -1,4 +1,3 @@ - .include # Grab all the options for a kernel build. For backwards compat, we need to # do this after bsd.own.mk. diff --git a/sys/conf/files.arm b/sys/conf/files.arm --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -1,4 +1,3 @@ - arm/arm/autoconf.c standard arm/arm/bcopy_page.S standard arm/arm/bcopyinout.S standard diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -1,4 +1,3 @@ - ## ## Kernel ## diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -1,4 +1,3 @@ - # # Warning flags for compiling the kernel and components of the kernel: # diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -1,4 +1,3 @@ - # Options set in the build system which affect the building of kernel # modules. These select which parts to compile in or out (eg INET) or which # parts to omit (eg CDDL or SOURCELESS_HOST). Some of these will cause diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -1,4 +1,3 @@ - # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES # and ones that act like they are part of %RULES. diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -1,4 +1,3 @@ - # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. diff --git a/sys/conf/kmod_syms.awk b/sys/conf/kmod_syms.awk --- a/sys/conf/kmod_syms.awk +++ b/sys/conf/kmod_syms.awk @@ -1,4 +1,3 @@ - # Read global symbols from object file. BEGIN { modname = ARGV[1] diff --git a/sys/conf/kmod_syms_prefix.awk b/sys/conf/kmod_syms_prefix.awk --- a/sys/conf/kmod_syms_prefix.awk +++ b/sys/conf/kmod_syms_prefix.awk @@ -1,4 +1,3 @@ - # Read global symbols from object file. BEGIN { while ("${NM:='nm'} " ARGV[1] | getline) { diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc --- a/sys/conf/ldscript.powerpc +++ b/sys/conf/ldscript.powerpc @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc) diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64 --- a/sys/conf/ldscript.powerpc64 +++ b/sys/conf/ldscript.powerpc64 @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf64-powerpc-freebsd", "elf64-powerpc-freebsd", "elf64-powerpc-freebsd") OUTPUT_ARCH(powerpc:common64) diff --git a/sys/conf/ldscript.powerpc64le b/sys/conf/ldscript.powerpc64le --- a/sys/conf/ldscript.powerpc64le +++ b/sys/conf/ldscript.powerpc64le @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf64-powerpcle-freebsd", "elf64-powerpcle-freebsd", "elf64-powerpcle-freebsd") OUTPUT_ARCH(powerpc:common64) diff --git a/sys/conf/ldscript.powerpcspe b/sys/conf/ldscript.powerpcspe --- a/sys/conf/ldscript.powerpcspe +++ b/sys/conf/ldscript.powerpcspe @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc) diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64 --- a/sys/conf/options.arm64 +++ b/sys/conf/options.arm64 @@ -1,4 +1,3 @@ - ARM64 opt_global.h # for cpu ARM64 to work INTRNG opt_global.h SOCDEV_PA opt_global.h diff --git a/sys/conf/options.riscv b/sys/conf/options.riscv --- a/sys/conf/options.riscv +++ b/sys/conf/options.riscv @@ -1,3 +1,2 @@ - RISCV opt_global.h # For cpu RISCV to work INTRNG opt_global.h diff --git a/sys/conf/sysent.mk b/sys/conf/sysent.mk --- a/sys/conf/sysent.mk +++ b/sys/conf/sysent.mk @@ -1,4 +1,3 @@ - # Don't use an OBJDIR .OBJDIR: ${.CURDIR} diff --git a/sys/crypto/rc4/rc4.h b/sys/crypto/rc4/rc4.h --- a/sys/crypto/rc4/rc4.h +++ b/sys/crypto/rc4/rc4.h @@ -1,4 +1,3 @@ - /* * rc4.h * diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile --- a/sys/crypto/rijndael/Makefile +++ b/sys/crypto/rijndael/Makefile @@ -1,4 +1,3 @@ - PROG=test00 MAN= SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c diff --git a/sys/dev/drm2/drm_os_freebsd.c b/sys/dev/drm2/drm_os_freebsd.c --- a/sys/dev/drm2/drm_os_freebsd.c +++ b/sys/dev/drm2/drm_os_freebsd.c @@ -1,4 +1,3 @@ - #include #include diff --git a/sys/dev/e1000/LICENSE b/sys/dev/e1000/LICENSE --- a/sys/dev/e1000/LICENSE +++ b/sys/dev/e1000/LICENSE @@ -1,4 +1,3 @@ - Copyright (c) 2001-2020, Intel Corporation All rights reserved. diff --git a/sys/dev/etherswitch/etherswitch_if.m b/sys/dev/etherswitch/etherswitch_if.m --- a/sys/dev/etherswitch/etherswitch_if.m +++ b/sys/dev/etherswitch/etherswitch_if.m @@ -1,4 +1,3 @@ - #include # Needed for ifreq/ifmediareq diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h --- a/sys/dev/exca/excavar.h +++ b/sys/dev/exca/excavar.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause * diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README --- a/sys/dev/firewire/00README +++ b/sys/dev/firewire/00README @@ -1,4 +1,3 @@ - IEEE 1394 support for FreeBSD-5.X and 4.X. 1. Introduction diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h --- a/sys/dev/ipw/if_ipwreg.h +++ b/sys/dev/ipw/if_ipwreg.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h --- a/sys/dev/ipw/if_ipwvar.h +++ b/sys/dev/ipw/if_ipwvar.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt --- a/sys/dev/isp/DriverManual.txt +++ b/sys/dev/isp/DriverManual.txt @@ -1,4 +1,3 @@ - Driver Theory of Operation Manual 1. Introduction diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt --- a/sys/dev/isp/Hardware.txt +++ b/sys/dev/isp/Hardware.txt @@ -1,4 +1,3 @@ - Hardware that is Known To or Should Work with This Driver diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h --- a/sys/dev/iwi/if_iwireg.h +++ b/sys/dev/iwi/if_iwireg.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h --- a/sys/dev/iwi/if_iwivar.h +++ b/sys/dev/iwi/if_iwivar.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/mdio/mdio_if.m b/sys/dev/mdio/mdio_if.m --- a/sys/dev/mdio/mdio_if.m +++ b/sys/dev/mdio/mdio_if.m @@ -1,4 +1,3 @@ - #include INTERFACE mdio; diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m --- a/sys/dev/mii/miibus_if.m +++ b/sys/dev/mii/miibus_if.m @@ -1,4 +1,3 @@ - #include INTERFACE miibus; diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h --- a/sys/dev/pccard/pccard_cis.h +++ b/sys/dev/pccard/pccard_cis.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-4-Clause * diff --git a/sys/dev/pms/freebsd/driver/ini/src/Readme.freebsd.txt b/sys/dev/pms/freebsd/driver/ini/src/Readme.freebsd.txt --- a/sys/dev/pms/freebsd/driver/ini/src/Readme.freebsd.txt +++ b/sys/dev/pms/freebsd/driver/ini/src/Readme.freebsd.txt @@ -1,4 +1,3 @@ - "Readme.freebsd.txt" PMC-Sierra, Inc. 05/01/2013 PMC-Sierra SPCv/SPCve/SPCv+ TISA FreeBSD Initiator Driver diff --git a/sys/dev/qlxgb/README.txt b/sys/dev/qlxgb/README.txt --- a/sys/dev/qlxgb/README.txt +++ b/sys/dev/qlxgb/README.txt @@ -1,4 +1,3 @@ - README File QLogic 3200 and 8200 series Single/Dual Port 10 Gigabit Ethernet & CNA Adapter Driver for FreeBSD 7.x/8.x/9.x diff --git a/sys/dev/qlxgbe/README.txt b/sys/dev/qlxgbe/README.txt --- a/sys/dev/qlxgbe/README.txt +++ b/sys/dev/qlxgbe/README.txt @@ -1,4 +1,3 @@ - README File QLogic 8300 series Dual Port 10 Gigabit Ethernet & CNA Adapter Driver for FreeBSD 9.x/10.x diff --git a/sys/dev/qlxge/README.txt b/sys/dev/qlxge/README.txt --- a/sys/dev/qlxge/README.txt +++ b/sys/dev/qlxge/README.txt @@ -1,4 +1,3 @@ - README File QLogic 8100 series Dual Port 10 Gigabit Ethernet & CNA Adapter Driver for FreeBSD 9.x/10.x diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 * Damien Bergamini diff --git a/sys/dev/ral/rt2560reg.h b/sys/dev/ral/rt2560reg.h --- a/sys/dev/ral/rt2560reg.h +++ b/sys/dev/ral/rt2560reg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 * Damien Bergamini diff --git a/sys/dev/ral/rt2560var.h b/sys/dev/ral/rt2560var.h --- a/sys/dev/ral/rt2560var.h +++ b/sys/dev/ral/rt2560var.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 * Damien Bergamini diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2006 * Damien Bergamini diff --git a/sys/dev/ral/rt2661reg.h b/sys/dev/ral/rt2661reg.h --- a/sys/dev/ral/rt2661reg.h +++ b/sys/dev/ral/rt2661reg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2006 * Damien Bergamini diff --git a/sys/dev/ral/rt2661var.h b/sys/dev/ral/rt2661var.h --- a/sys/dev/ral/rt2661var.h +++ b/sys/dev/ral/rt2661var.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005 * Damien Bergamini diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h --- a/sys/dev/sound/usb/uaudio.h +++ b/sys/dev/sound/usb/uaudio.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/syscons/logo/beastie.c b/sys/dev/syscons/logo/beastie.c --- a/sys/dev/syscons/logo/beastie.c +++ b/sys/dev/syscons/logo/beastie.c @@ -1,4 +1,3 @@ - #define logo_width 88 #define logo_height 88 diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c --- a/sys/dev/syscons/logo/logo.c +++ b/sys/dev/syscons/logo/logo.c @@ -1,4 +1,3 @@ - #define LOGO_WIDTH 66 #define LOGO_HEIGHT 69 diff --git a/sys/dev/usb/controller/dwc_otgreg.h b/sys/dev/usb/controller/dwc_otgreg.h --- a/sys/dev/usb/controller/dwc_otgreg.h +++ b/sys/dev/usb/controller/dwc_otgreg.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/controller/generic_xhci.h b/sys/dev/usb/controller/generic_xhci.h --- a/sys/dev/usb/controller/generic_xhci.h +++ b/sys/dev/usb/controller/generic_xhci.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/net/if_usievar.h b/sys/dev/usb/net/if_usievar.h --- a/sys/dev/usb/net/if_usievar.h +++ b/sys/dev/usb/net/if_usievar.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2011 Anybots Inc * SPDX-License-Identifier: BSD-2-Clause diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005-2007 Damien Bergamini * Copyright (c) 2006 Niall O'Higgins diff --git a/sys/dev/usb/wlan/if_rumfw.h b/sys/dev/usb/wlan/if_rumfw.h --- a/sys/dev/usb/wlan/if_rumfw.h +++ b/sys/dev/usb/wlan/if_rumfw.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005-2006, Ralink Technology, Corp. * Paul Lin diff --git a/sys/dev/usb/wlan/if_rumreg.h b/sys/dev/usb/wlan/if_rumreg.h --- a/sys/dev/usb/wlan/if_rumreg.h +++ b/sys/dev/usb/wlan/if_rumreg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 Damien Bergamini * Copyright (c) 2006 Niall O'Higgins diff --git a/sys/dev/usb/wlan/if_rumvar.h b/sys/dev/usb/wlan/if_rumvar.h --- a/sys/dev/usb/wlan/if_rumvar.h +++ b/sys/dev/usb/wlan/if_rumvar.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 Damien Bergamini * Copyright (c) 2006 Niall O'Higgins diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 * Damien Bergamini diff --git a/sys/dev/usb/wlan/if_uralreg.h b/sys/dev/usb/wlan/if_uralreg.h --- a/sys/dev/usb/wlan/if_uralreg.h +++ b/sys/dev/usb/wlan/if_uralreg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005, 2006 * Damien Bergamini diff --git a/sys/dev/usb/wlan/if_uralvar.h b/sys/dev/usb/wlan/if_uralvar.h --- a/sys/dev/usb/wlan/if_uralvar.h +++ b/sys/dev/usb/wlan/if_uralvar.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005 * Damien Bergamini diff --git a/sys/dev/usb/wlan/if_urtwreg.h b/sys/dev/usb/wlan/if_urtwreg.h --- a/sys/dev/usb/wlan/if_urtwreg.h +++ b/sys/dev/usb/wlan/if_urtwreg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2008 Weongyo Jeong * diff --git a/sys/dev/usb/wlan/if_urtwvar.h b/sys/dev/usb/wlan/if_urtwvar.h --- a/sys/dev/usb/wlan/if_urtwvar.h +++ b/sys/dev/usb/wlan/if_urtwvar.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2008 Weongyo Jeong * diff --git a/sys/dev/videomode/videomode.c b/sys/dev/videomode/videomode.c --- a/sys/dev/videomode/videomode.c +++ b/sys/dev/videomode/videomode.c @@ -1,4 +1,3 @@ - /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * diff --git a/sys/dev/vmware/pvscsi/LICENSE b/sys/dev/vmware/pvscsi/LICENSE --- a/sys/dev/vmware/pvscsi/LICENSE +++ b/sys/dev/vmware/pvscsi/LICENSE @@ -1,4 +1,3 @@ - These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dev/vmware/vmci/LICENSE b/sys/dev/vmware/vmci/LICENSE --- a/sys/dev/vmware/vmci/LICENSE +++ b/sys/dev/vmware/vmci/LICENSE @@ -1,4 +1,3 @@ - These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h --- a/sys/dev/wpi/if_wpireg.h +++ b/sys/dev/wpi/if_wpireg.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2006,2007 * Damien Bergamini diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h --- a/sys/dev/wpi/if_wpivar.h +++ b/sys/dev/wpi/if_wpivar.h @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2006,2007 * Damien Bergamini diff --git a/sys/dts/Makefile b/sys/dts/Makefile --- a/sys/dts/Makefile +++ b/sys/dts/Makefile @@ -1,4 +1,3 @@ - SUBDIR=arm powerpc .include diff --git a/sys/dts/Makefile.inc b/sys/dts/Makefile.inc --- a/sys/dts/Makefile.inc +++ b/sys/dts/Makefile.inc @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys test-dts: diff --git a/sys/dts/arm/Makefile b/sys/dts/arm/Makefile --- a/sys/dts/arm/Makefile +++ b/sys/dts/arm/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/dts/arm/Makefile.inc b/sys/dts/arm/Makefile.inc --- a/sys/dts/arm/Makefile.inc +++ b/sys/dts/arm/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/dts/arm/overlays/Makefile b/sys/dts/arm/overlays/Makefile --- a/sys/dts/arm/overlays/Makefile +++ b/sys/dts/arm/overlays/Makefile @@ -1,4 +1,3 @@ - DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso diff --git a/sys/dts/arm/overlays/spigen-rpi-b.dtso b/sys/dts/arm/overlays/spigen-rpi-b.dtso --- a/sys/dts/arm/overlays/spigen-rpi-b.dtso +++ b/sys/dts/arm/overlays/spigen-rpi-b.dtso @@ -1,4 +1,3 @@ - /dts-v1/; /plugin/; diff --git a/sys/dts/arm/overlays/spigen-rpi2.dtso b/sys/dts/arm/overlays/spigen-rpi2.dtso --- a/sys/dts/arm/overlays/spigen-rpi2.dtso +++ b/sys/dts/arm/overlays/spigen-rpi2.dtso @@ -1,4 +1,3 @@ - /dts-v1/; /plugin/; diff --git a/sys/dts/arm64/Makefile b/sys/dts/arm64/Makefile --- a/sys/dts/arm64/Makefile +++ b/sys/dts/arm64/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/dts/arm64/Makefile.inc b/sys/dts/arm64/Makefile.inc --- a/sys/dts/arm64/Makefile.inc +++ b/sys/dts/arm64/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/dts/arm64/overlays/Makefile b/sys/dts/arm64/overlays/Makefile --- a/sys/dts/arm64/overlays/Makefile +++ b/sys/dts/arm64/overlays/Makefile @@ -1,4 +1,3 @@ - DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso diff --git a/sys/dts/arm64/overlays/spigen-rpi3.dtso b/sys/dts/arm64/overlays/spigen-rpi3.dtso --- a/sys/dts/arm64/overlays/spigen-rpi3.dtso +++ b/sys/dts/arm64/overlays/spigen-rpi3.dtso @@ -1,4 +1,3 @@ - /dts-v1/; /plugin/; diff --git a/sys/dts/arm64/overlays/spigen-rpi4.dtso b/sys/dts/arm64/overlays/spigen-rpi4.dtso --- a/sys/dts/arm64/overlays/spigen-rpi4.dtso +++ b/sys/dts/arm64/overlays/spigen-rpi4.dtso @@ -1,4 +1,3 @@ - /dts-v1/; /plugin/; diff --git a/sys/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt --- a/sys/dts/bindings-gpio.txt +++ b/sys/dts/bindings-gpio.txt @@ -1,4 +1,3 @@ - GPIO configuration. =================== diff --git a/sys/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt --- a/sys/dts/bindings-localbus.txt +++ b/sys/dts/bindings-localbus.txt @@ -1,4 +1,3 @@ - Marvell Device bus (localbus) configuration. ============================================ diff --git a/sys/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt --- a/sys/dts/bindings-mpp.txt +++ b/sys/dts/bindings-mpp.txt @@ -1,4 +1,3 @@ - * Multi purpose pin (MPP) configuration. Required properties: diff --git a/sys/dts/powerpc/Makefile b/sys/dts/powerpc/Makefile --- a/sys/dts/powerpc/Makefile +++ b/sys/dts/powerpc/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/fs/cd9660/TODO b/sys/fs/cd9660/TODO --- a/sys/fs/cd9660/TODO +++ b/sys/fs/cd9660/TODO @@ -1,4 +1,3 @@ - 2) should understand Rock Ridge Yes, we have follows function. diff --git a/sys/fs/cd9660/TODO.hibler b/sys/fs/cd9660/TODO.hibler --- a/sys/fs/cd9660/TODO.hibler +++ b/sys/fs/cd9660/TODO.hibler @@ -1,4 +1,3 @@ - 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS). Since it was modelled after the inode code, we might be able to merge them back. It looks like a separate (but very similar) lookup routine diff --git a/sys/geom/notes b/sys/geom/notes --- a/sys/geom/notes +++ b/sys/geom/notes @@ -1,4 +1,3 @@ - For the lack of a better place to put them, this file will contain notes on some of the more intricate details of geom. diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c --- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c @@ -1,4 +1,3 @@ - /* Broadcom B43 wireless driver diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.c b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.c --- a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.c @@ -1,4 +1,3 @@ - /* Broadcom B43 wireless driver diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.c b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.c --- a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.c @@ -1,4 +1,3 @@ - /* Broadcom B43 wireless driver diff --git a/sys/i386/Makefile b/sys/i386/Makefile --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -1,4 +1,3 @@ - # Makefile for i386 links, tags file # SYS is normally set in Make.tags.inc diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include "../../x86/conf/NOTES" include NOTES diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -1,4 +1,3 @@ - #include "linux_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1,4 +1,3 @@ - ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,4 +1,3 @@ - SYS?= ${.CURDIR}/.. # Common files for "make tags", included by the Makefile for each diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile --- a/sys/modules/3dfx/Makefile +++ b/sys/modules/3dfx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx diff --git a/sys/modules/3dfx_linux/Makefile b/sys/modules/3dfx_linux/Makefile --- a/sys/modules/3dfx_linux/Makefile +++ b/sys/modules/3dfx_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx_linux diff --git a/sys/modules/Makefile b/sys/modules/Makefile --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc --- a/sys/modules/Makefile.inc +++ b/sys/modules/Makefile.inc @@ -1,2 +1 @@ - SUBDIR_PARALLEL= yes diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile --- a/sys/modules/aac/Makefile +++ b/sys/modules/aac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aac .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc --- a/sys/modules/aac/Makefile.inc +++ b/sys/modules/aac/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile --- a/sys/modules/aac/aac_linux/Makefile +++ b/sys/modules/aac/aac_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aac KMOD= aac_linux diff --git a/sys/modules/aacraid/Makefile b/sys/modules/aacraid/Makefile --- a/sys/modules/aacraid/Makefile +++ b/sys/modules/aacraid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aacraid .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/aacraid/Makefile.inc b/sys/modules/aacraid/Makefile.inc --- a/sys/modules/aacraid/Makefile.inc +++ b/sys/modules/aacraid/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aacraid/aacraid_linux/Makefile b/sys/modules/aacraid/aacraid_linux/Makefile --- a/sys/modules/aacraid/aacraid_linux/Makefile +++ b/sys/modules/aacraid/aacraid_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aacraid KMOD= aacraid_linux diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile --- a/sys/modules/accf_data/Makefile +++ b/sys/modules/accf_data/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_data diff --git a/sys/modules/accf_dns/Makefile b/sys/modules/accf_dns/Makefile --- a/sys/modules/accf_dns/Makefile +++ b/sys/modules/accf_dns/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_dns diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile --- a/sys/modules/accf_http/Makefile +++ b/sys/modules/accf_http/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_http diff --git a/sys/modules/acl_nfs4/Makefile b/sys/modules/acl_nfs4/Makefile --- a/sys/modules/acl_nfs4/Makefile +++ b/sys/modules/acl_nfs4/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= acl_nfs4 SRCS= vnode_if.h subr_acl_nfs4.c diff --git a/sys/modules/acl_posix1e/Makefile b/sys/modules/acl_posix1e/Makefile --- a/sys/modules/acl_posix1e/Makefile +++ b/sys/modules/acl_posix1e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= acl_posix1e SRCS= vnode_if.h subr_acl_posix1e.c diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -1,4 +1,3 @@ - SUBDIR= acpi_asus acpi_asus_wmi acpi_dock acpi_fujitsu acpi_hp \ acpi_ged acpi_ibm acpi_panasonic acpi_sony acpi_toshiba \ acpi_video acpi_wmi aibs diff --git a/sys/modules/acpi/Makefile.inc b/sys/modules/acpi/Makefile.inc --- a/sys/modules/acpi/Makefile.inc +++ b/sys/modules/acpi/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile --- a/sys/modules/acpi/acpi_asus/Makefile +++ b/sys/modules/acpi/acpi_asus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus_wmi diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile --- a/sys/modules/acpi/acpi_dock/Makefile +++ b/sys/modules/acpi/acpi_dock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_dock SRCS= acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile --- a/sys/modules/acpi/acpi_fujitsu/Makefile +++ b/sys/modules/acpi/acpi_fujitsu/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_fujitsu diff --git a/sys/modules/acpi/acpi_ged/Makefile b/sys/modules/acpi/acpi_ged/Makefile --- a/sys/modules/acpi/acpi_ged/Makefile +++ b/sys/modules/acpi/acpi_ged/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_ged SRCS= acpi_ged.c diff --git a/sys/modules/acpi/acpi_hp/Makefile b/sys/modules/acpi/acpi_hp/Makefile --- a/sys/modules/acpi/acpi_hp/Makefile +++ b/sys/modules/acpi/acpi_hp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_hp diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile --- a/sys/modules/acpi/acpi_panasonic/Makefile +++ b/sys/modules/acpi/acpi_panasonic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_panasonic diff --git a/sys/modules/acpi/acpi_rapidstart/Makefile b/sys/modules/acpi/acpi_rapidstart/Makefile --- a/sys/modules/acpi/acpi_rapidstart/Makefile +++ b/sys/modules/acpi/acpi_rapidstart/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_rapidstart diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile --- a/sys/modules/acpi/acpi_sony/Makefile +++ b/sys/modules/acpi/acpi_sony/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_sony diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile --- a/sys/modules/acpi/acpi_toshiba/Makefile +++ b/sys/modules/acpi/acpi_toshiba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_toshiba diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile --- a/sys/modules/acpi/acpi_video/Makefile +++ b/sys/modules/acpi/acpi_video/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_video diff --git a/sys/modules/acpi/acpi_wmi/Makefile b/sys/modules/acpi/acpi_wmi/Makefile --- a/sys/modules/acpi/acpi_wmi/Makefile +++ b/sys/modules/acpi/acpi_wmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_wmi diff --git a/sys/modules/acpi/aibs/Makefile b/sys/modules/acpi/aibs/Makefile --- a/sys/modules/acpi/aibs/Makefile +++ b/sys/modules/acpi/aibs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= aibs diff --git a/sys/modules/adlink/Makefile b/sys/modules/adlink/Makefile --- a/sys/modules/adlink/Makefile +++ b/sys/modules/adlink/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/adlink KMOD= adlink diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile --- a/sys/modules/ae/Makefile +++ b/sys/modules/ae/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ae KMOD= if_ae diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile --- a/sys/modules/aesni/Makefile +++ b/sys/modules/aesni/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/aesni .PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers diff --git a/sys/modules/age/Makefile b/sys/modules/age/Makefile --- a/sys/modules/age/Makefile +++ b/sys/modules/age/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/age KMOD= if_age diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile --- a/sys/modules/agp/Makefile +++ b/sys/modules/agp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/agp KMOD= agp diff --git a/sys/modules/ahci/Makefile b/sys/modules/ahci/Makefile --- a/sys/modules/ahci/Makefile +++ b/sys/modules/ahci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ahci KMOD= ahci diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile --- a/sys/modules/aic7xxx/Makefile +++ b/sys/modules/aic7xxx/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ahc ahd firmware: aicasm/aicasm ahdfirmware ahcfirmware diff --git a/sys/modules/aic7xxx/Makefile.inc b/sys/modules/aic7xxx/Makefile.inc --- a/sys/modules/aic7xxx/Makefile.inc +++ b/sys/modules/aic7xxx/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/aic7xxx/ahc/Makefile.inc b/sys/modules/aic7xxx/ahc/Makefile.inc --- a/sys/modules/aic7xxx/ahc/Makefile.inc +++ b/sys/modules/aic7xxx/ahc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile --- a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_isa diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile --- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_pci diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahd diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile --- a/sys/modules/aic7xxx/aicasm/Makefile +++ b/sys/modules/aic7xxx/aicasm/Makefile @@ -1,4 +1,3 @@ - MAKESRCPATH= ${SRCTOP}/sys/dev/aic7xxx/aicasm install: diff --git a/sys/modules/alc/Makefile b/sys/modules/alc/Makefile --- a/sys/modules/alc/Makefile +++ b/sys/modules/alc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/alc KMOD= if_alc diff --git a/sys/modules/ale/Makefile b/sys/modules/ale/Makefile --- a/sys/modules/ale/Makefile +++ b/sys/modules/ale/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ale KMOD= if_ale diff --git a/sys/modules/allwinner/aw_mmc/Makefile b/sys/modules/allwinner/aw_mmc/Makefile --- a/sys/modules/allwinner/aw_mmc/Makefile +++ b/sys/modules/allwinner/aw_mmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_mmc diff --git a/sys/modules/allwinner/aw_pwm/Makefile b/sys/modules/allwinner/aw_pwm/Makefile --- a/sys/modules/allwinner/aw_pwm/Makefile +++ b/sys/modules/allwinner/aw_pwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_pwm diff --git a/sys/modules/allwinner/aw_rsb/Makefile b/sys/modules/allwinner/aw_rsb/Makefile --- a/sys/modules/allwinner/aw_rsb/Makefile +++ b/sys/modules/allwinner/aw_rsb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_rsb diff --git a/sys/modules/allwinner/aw_rtc/Makefile b/sys/modules/allwinner/aw_rtc/Makefile --- a/sys/modules/allwinner/aw_rtc/Makefile +++ b/sys/modules/allwinner/aw_rtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_rtc diff --git a/sys/modules/allwinner/aw_sid/Makefile b/sys/modules/allwinner/aw_sid/Makefile --- a/sys/modules/allwinner/aw_sid/Makefile +++ b/sys/modules/allwinner/aw_sid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_sid diff --git a/sys/modules/allwinner/aw_spi/Makefile b/sys/modules/allwinner/aw_spi/Makefile --- a/sys/modules/allwinner/aw_spi/Makefile +++ b/sys/modules/allwinner/aw_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_spi diff --git a/sys/modules/allwinner/aw_thermal/Makefile b/sys/modules/allwinner/aw_thermal/Makefile --- a/sys/modules/allwinner/aw_thermal/Makefile +++ b/sys/modules/allwinner/aw_thermal/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_thermal diff --git a/sys/modules/allwinner/axp81x/Makefile b/sys/modules/allwinner/axp81x/Makefile --- a/sys/modules/allwinner/axp81x/Makefile +++ b/sys/modules/allwinner/axp81x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= axp81x diff --git a/sys/modules/allwinner/if_awg/Makefile b/sys/modules/allwinner/if_awg/Makefile --- a/sys/modules/allwinner/if_awg/Makefile +++ b/sys/modules/allwinner/if_awg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= if_awg diff --git a/sys/modules/alq/Makefile b/sys/modules/alq/Makefile --- a/sys/modules/alq/Makefile +++ b/sys/modules/alq/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= alq SRCS= opt_mac.h vnode_if.h kern_alq.c diff --git a/sys/modules/am335x_dmtpps/Makefile b/sys/modules/am335x_dmtpps/Makefile --- a/sys/modules/am335x_dmtpps/Makefile +++ b/sys/modules/am335x_dmtpps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_dmtpps diff --git a/sys/modules/amd_ecc_inject/Makefile b/sys/modules/amd_ecc_inject/Makefile --- a/sys/modules/amd_ecc_inject/Makefile +++ b/sys/modules/amd_ecc_inject/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amd_ecc_inject KMOD= amd_ecc_inject diff --git a/sys/modules/amdgpio/Makefile b/sys/modules/amdgpio/Makefile --- a/sys/modules/amdgpio/Makefile +++ b/sys/modules/amdgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdgpio KMOD= amdgpio SRCS= amdgpio.c diff --git a/sys/modules/amdsbwd/Makefile b/sys/modules/amdsbwd/Makefile --- a/sys/modules/amdsbwd/Makefile +++ b/sys/modules/amdsbwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsbwd KMOD = amdsbwd SRCS = amdsbwd.c diff --git a/sys/modules/amdsmb/Makefile b/sys/modules/amdsmb/Makefile --- a/sys/modules/amdsmb/Makefile +++ b/sys/modules/amdsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmb KMOD= amdsmb diff --git a/sys/modules/amdsmn/Makefile b/sys/modules/amdsmn/Makefile --- a/sys/modules/amdsmn/Makefile +++ b/sys/modules/amdsmn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmn KMOD= amdsmn diff --git a/sys/modules/amdtemp/Makefile b/sys/modules/amdtemp/Makefile --- a/sys/modules/amdtemp/Makefile +++ b/sys/modules/amdtemp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdtemp KMOD= amdtemp diff --git a/sys/modules/aout/Makefile b/sys/modules/aout/Makefile --- a/sys/modules/aout/Makefile +++ b/sys/modules/aout/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= aout diff --git a/sys/modules/arcmsr/Makefile b/sys/modules/arcmsr/Makefile --- a/sys/modules/arcmsr/Makefile +++ b/sys/modules/arcmsr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/arcmsr KMOD= arcmsr diff --git a/sys/modules/arm_ti/am335x_ehrpwm/Makefile b/sys/modules/arm_ti/am335x_ehrpwm/Makefile --- a/sys/modules/arm_ti/am335x_ehrpwm/Makefile +++ b/sys/modules/arm_ti/am335x_ehrpwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_ehrpwm diff --git a/sys/modules/arm_ti/ti_i2c/Makefile b/sys/modules/arm_ti/ti_i2c/Makefile --- a/sys/modules/arm_ti/ti_i2c/Makefile +++ b/sys/modules/arm_ti/ti_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti KMOD= ti_i2c diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile --- a/sys/modules/ata/Makefile +++ b/sys/modules/ata/Makefile @@ -1,4 +1,3 @@ - SUBDIR = atacore SUBDIR += ataisa SUBDIR += atapci diff --git a/sys/modules/ata/Makefile.inc b/sys/modules/ata/Makefile.inc --- a/sys/modules/ata/Makefile.inc +++ b/sys/modules/ata/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atacore/Makefile b/sys/modules/ata/atacore/Makefile --- a/sys/modules/ata/atacore/Makefile +++ b/sys/modules/ata/atacore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata KMOD= ata diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile --- a/sys/modules/ata/ataisa/Makefile +++ b/sys/modules/ata/ataisa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata KMOD= ataisa diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile --- a/sys/modules/ata/atapci/Makefile +++ b/sys/modules/ata/atapci/Makefile @@ -1,4 +1,3 @@ - SUBDIR += chipsets .PATH: ${SRCTOP}/sys/dev/ata diff --git a/sys/modules/ata/atapci/Makefile.inc b/sys/modules/ata/atapci/Makefile.inc --- a/sys/modules/ata/atapci/Makefile.inc +++ b/sys/modules/ata/atapci/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atapci/chipsets/Makefile b/sys/modules/ata/atapci/chipsets/Makefile --- a/sys/modules/ata/atapci/chipsets/Makefile +++ b/sys/modules/ata/atapci/chipsets/Makefile @@ -1,4 +1,3 @@ - SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia .include diff --git a/sys/modules/ata/atapci/chipsets/Makefile.inc b/sys/modules/ata/atapci/chipsets/Makefile.inc --- a/sys/modules/ata/atapci/chipsets/Makefile.inc +++ b/sys/modules/ata/atapci/chipsets/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atapci/chipsets/ataacard/Makefile b/sys/modules/ata/atapci/chipsets/ataacard/Makefile --- a/sys/modules/ata/atapci/chipsets/ataacard/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacard/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacard diff --git a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile --- a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacerlabs diff --git a/sys/modules/ata/atapci/chipsets/ataamd/Makefile b/sys/modules/ata/atapci/chipsets/ataamd/Makefile --- a/sys/modules/ata/atapci/chipsets/ataamd/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataamd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataamd diff --git a/sys/modules/ata/atapci/chipsets/ataati/Makefile b/sys/modules/ata/atapci/chipsets/ataati/Makefile --- a/sys/modules/ata/atapci/chipsets/ataati/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataati/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataati diff --git a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile --- a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacenatek diff --git a/sys/modules/ata/atapci/chipsets/atacypress/Makefile b/sys/modules/ata/atapci/chipsets/atacypress/Makefile --- a/sys/modules/ata/atapci/chipsets/atacypress/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacypress/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacypress diff --git a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile --- a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacyrix diff --git a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile --- a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile +++ b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atahighpoint diff --git a/sys/modules/ata/atapci/chipsets/ataintel/Makefile b/sys/modules/ata/atapci/chipsets/ataintel/Makefile --- a/sys/modules/ata/atapci/chipsets/ataintel/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataintel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataintel diff --git a/sys/modules/ata/atapci/chipsets/ataite/Makefile b/sys/modules/ata/atapci/chipsets/ataite/Makefile --- a/sys/modules/ata/atapci/chipsets/ataite/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataite/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataite diff --git a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile --- a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atajmicron diff --git a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile --- a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamarvell diff --git a/sys/modules/ata/atapci/chipsets/atamicron/Makefile b/sys/modules/ata/atapci/chipsets/atamicron/Makefile --- a/sys/modules/ata/atapci/chipsets/atamicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamicron/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamicron diff --git a/sys/modules/ata/atapci/chipsets/atanational/Makefile b/sys/modules/ata/atapci/chipsets/atanational/Makefile --- a/sys/modules/ata/atapci/chipsets/atanational/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanational/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanational diff --git a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile --- a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanetcell diff --git a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile --- a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanvidia diff --git a/sys/modules/ata/atapci/chipsets/atapromise/Makefile b/sys/modules/ata/atapci/chipsets/atapromise/Makefile --- a/sys/modules/ata/atapci/chipsets/atapromise/Makefile +++ b/sys/modules/ata/atapci/chipsets/atapromise/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atapromise diff --git a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile --- a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataserverworks diff --git a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile --- a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasiliconimage diff --git a/sys/modules/ata/atapci/chipsets/atasis/Makefile b/sys/modules/ata/atapci/chipsets/atasis/Makefile --- a/sys/modules/ata/atapci/chipsets/atasis/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasis diff --git a/sys/modules/ata/atapci/chipsets/atavia/Makefile b/sys/modules/ata/atapci/chipsets/atavia/Makefile --- a/sys/modules/ata/atapci/chipsets/atavia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atavia/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atavia diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -1,4 +1,3 @@ - DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -1,4 +1,3 @@ - DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} diff --git a/sys/modules/athk_common/Makefile b/sys/modules/athk_common/Makefile --- a/sys/modules/athk_common/Makefile +++ b/sys/modules/athk_common/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/athk .PATH: ${DEVDIR} diff --git a/sys/modules/autofs/Makefile b/sys/modules/autofs/Makefile --- a/sys/modules/autofs/Makefile +++ b/sys/modules/autofs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/autofs KMOD= autofs diff --git a/sys/modules/axgbe/Makefile b/sys/modules/axgbe/Makefile --- a/sys/modules/axgbe/Makefile +++ b/sys/modules/axgbe/Makefile @@ -1,4 +1,3 @@ - .if ${MACHINE_CPUARCH} == "aarch64" SUBDIR= if_axa .elif ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/axgbe/if_axa/Makefile b/sys/modules/axgbe/if_axa/Makefile --- a/sys/modules/axgbe/if_axa/Makefile +++ b/sys/modules/axgbe/if_axa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/axgbe KMOD = if_axa diff --git a/sys/modules/axgbe/if_axp/Makefile b/sys/modules/axgbe/if_axp/Makefile --- a/sys/modules/axgbe/if_axp/Makefile +++ b/sys/modules/axgbe/if_axp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/axgbe KMOD = if_axp diff --git a/sys/modules/backlight/Makefile b/sys/modules/backlight/Makefile --- a/sys/modules/backlight/Makefile +++ b/sys/modules/backlight/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/backlight KMOD= backlight SRCS= backlight.c diff --git a/sys/modules/bcm283x_clkman/Makefile b/sys/modules/bcm283x_clkman/Makefile --- a/sys/modules/bcm283x_clkman/Makefile +++ b/sys/modules/bcm283x_clkman/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= bcm283x_clkman diff --git a/sys/modules/bcm283x_pwm/Makefile b/sys/modules/bcm283x_pwm/Makefile --- a/sys/modules/bcm283x_pwm/Makefile +++ b/sys/modules/bcm283x_pwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= bcm283x_pwm diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile --- a/sys/modules/bfe/Makefile +++ b/sys/modules/bfe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bfe KMOD= if_bfe diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile --- a/sys/modules/bge/Makefile +++ b/sys/modules/bge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bge KMOD= if_bge diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile --- a/sys/modules/bhnd/Makefile +++ b/sys/modules/bhnd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd .PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc .PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc/pwrctl diff --git a/sys/modules/bhnd/bcma/Makefile b/sys/modules/bhnd/bcma/Makefile --- a/sys/modules/bhnd/bcma/Makefile +++ b/sys/modules/bhnd/bcma/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma diff --git a/sys/modules/bhnd/bcma_bhndb/Makefile b/sys/modules/bhnd/bcma_bhndb/Makefile --- a/sys/modules/bhnd/bcma_bhndb/Makefile +++ b/sys/modules/bhnd/bcma_bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma_bhndb diff --git a/sys/modules/bhnd/bhndb/Makefile b/sys/modules/bhnd/bhndb/Makefile --- a/sys/modules/bhnd/bhndb/Makefile +++ b/sys/modules/bhnd/bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb diff --git a/sys/modules/bhnd/bhndb_pci/Makefile b/sys/modules/bhnd/bhndb_pci/Makefile --- a/sys/modules/bhnd/bhndb_pci/Makefile +++ b/sys/modules/bhnd/bhndb_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb_pci diff --git a/sys/modules/bhnd/cores/Makefile b/sys/modules/bhnd/cores/Makefile --- a/sys/modules/bhnd/cores/Makefile +++ b/sys/modules/bhnd/cores/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bhnd_pci \ bhnd_pci_hostb \ bhnd_pcib diff --git a/sys/modules/bhnd/cores/bhnd_pci/Makefile b/sys/modules/bhnd/cores/bhnd_pci/Makefile --- a/sys/modules/bhnd/cores/bhnd_pci/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile --- a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/cores/bhnd_pcib/Makefile b/sys/modules/bhnd/cores/bhnd_pcib/Makefile --- a/sys/modules/bhnd/cores/bhnd_pcib/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pcib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/siba/Makefile b/sys/modules/bhnd/siba/Makefile --- a/sys/modules/bhnd/siba/Makefile +++ b/sys/modules/bhnd/siba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba diff --git a/sys/modules/bhnd/siba_bhndb/Makefile b/sys/modules/bhnd/siba_bhndb/Makefile --- a/sys/modules/bhnd/siba_bhndb/Makefile +++ b/sys/modules/bhnd/siba_bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba_bhndb diff --git a/sys/modules/blake2/Makefile b/sys/modules/blake2/Makefile --- a/sys/modules/blake2/Makefile +++ b/sys/modules/blake2/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/libb2 .PATH: ${SRCTOP}/sys/crypto/blake2 .PATH: ${SRCTOP}/sys/opencrypto diff --git a/sys/modules/bnxt/Makefile b/sys/modules/bnxt/Makefile --- a/sys/modules/bnxt/Makefile +++ b/sys/modules/bnxt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bnxt KMOD = if_bnxt diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile --- a/sys/modules/bridgestp/Makefile +++ b/sys/modules/bridgestp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= bridgestp diff --git a/sys/modules/bwi/Makefile b/sys/modules/bwi/Makefile --- a/sys/modules/bwi/Makefile +++ b/sys/modules/bwi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bwi KMOD = if_bwi diff --git a/sys/modules/bwn/Makefile b/sys/modules/bwn/Makefile --- a/sys/modules/bwn/Makefile +++ b/sys/modules/bwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bwn KMOD= if_bwn diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile --- a/sys/modules/bxe/Makefile +++ b/sys/modules/bxe/Makefile @@ -1,4 +1,3 @@ - SYSDIR ?= ${SRCTOP}/sys BXE = ${SYSDIR}/dev/bxe diff --git a/sys/modules/bytgpio/Makefile b/sys/modules/bytgpio/Makefile --- a/sys/modules/bytgpio/Makefile +++ b/sys/modules/bytgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gpio KMOD= bytgpio SRCS= bytgpio.c diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/cam $S/cam/scsi $S/cam/ata $S/cam/nvme $S/dev/nvme diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile --- a/sys/modules/cardbus/Makefile +++ b/sys/modules/cardbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cardbus KMOD= cardbus diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet .PATH: ${SRCTOP}/sys/crypto diff --git a/sys/modules/cas/Makefile b/sys/modules/cas/Makefile --- a/sys/modules/cas/Makefile +++ b/sys/modules/cas/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cas KMOD= if_cas diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile --- a/sys/modules/cbb/Makefile +++ b/sys/modules/cbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pccbb KMOD= cbb diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile --- a/sys/modules/cc/Makefile +++ b/sys/modules/cc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= cc_newreno \ cc_cubic \ cc_dctcp \ diff --git a/sys/modules/cc/cc_cdg/Makefile b/sys/modules/cc/cc_cdg/Makefile --- a/sys/modules/cc/cc_cdg/Makefile +++ b/sys/modules/cc/cc_cdg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cdg SRCS= cc_cdg.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_chd/Makefile b/sys/modules/cc/cc_chd/Makefile --- a/sys/modules/cc/cc_chd/Makefile +++ b/sys/modules/cc/cc_chd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_chd SRCS= cc_chd.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_cubic/Makefile b/sys/modules/cc/cc_cubic/Makefile --- a/sys/modules/cc/cc_cubic/Makefile +++ b/sys/modules/cc/cc_cubic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cubic SRCS= cc_cubic.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_dctcp/Makefile b/sys/modules/cc/cc_dctcp/Makefile --- a/sys/modules/cc/cc_dctcp/Makefile +++ b/sys/modules/cc/cc_dctcp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_dctcp SRCS= cc_dctcp.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_hd/Makefile b/sys/modules/cc/cc_hd/Makefile --- a/sys/modules/cc/cc_hd/Makefile +++ b/sys/modules/cc/cc_hd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_hd SRCS= cc_hd.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_htcp/Makefile b/sys/modules/cc/cc_htcp/Makefile --- a/sys/modules/cc/cc_htcp/Makefile +++ b/sys/modules/cc/cc_htcp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_htcp SRCS= cc_htcp.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_newreno/Makefile b/sys/modules/cc/cc_newreno/Makefile --- a/sys/modules/cc/cc_newreno/Makefile +++ b/sys/modules/cc/cc_newreno/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_newreno SRCS= cc_newreno.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_vegas/Makefile b/sys/modules/cc/cc_vegas/Makefile --- a/sys/modules/cc/cc_vegas/Makefile +++ b/sys/modules/cc/cc_vegas/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_vegas SRCS= cc_vegas.c opt_kern_tls.h diff --git a/sys/modules/ccp/Makefile b/sys/modules/ccp/Makefile --- a/sys/modules/ccp/Makefile +++ b/sys/modules/ccp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/ccp KMOD= ccp diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile --- a/sys/modules/cd9660/Makefile +++ b/sys/modules/cd9660/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660 diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile --- a/sys/modules/cd9660_iconv/Makefile +++ b/sys/modules/cd9660_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660_iconv SRCS= cd9660_iconv.c diff --git a/sys/modules/cfi/Makefile b/sys/modules/cfi/Makefile --- a/sys/modules/cfi/Makefile +++ b/sys/modules/cfi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cfi KMOD= cfi diff --git a/sys/modules/cfiscsi/Makefile b/sys/modules/cfiscsi/Makefile --- a/sys/modules/cfiscsi/Makefile +++ b/sys/modules/cfiscsi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/cam/ctl KMOD= cfiscsi diff --git a/sys/modules/chromebook_platform/Makefile b/sys/modules/chromebook_platform/Makefile --- a/sys/modules/chromebook_platform/Makefile +++ b/sys/modules/chromebook_platform/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/chromebook_platform KMOD= chromebook_platform SRCS= chromebook_platform.c bus_if.h device_if.h pci_if.h diff --git a/sys/modules/chvgpio/Makefile b/sys/modules/chvgpio/Makefile --- a/sys/modules/chvgpio/Makefile +++ b/sys/modules/chvgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gpio KMOD= chvgpio SRCS= chvgpio.c diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile --- a/sys/modules/ciss/Makefile +++ b/sys/modules/ciss/Makefile @@ -1,4 +1,3 @@ - KMOD = ciss .PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS = ciss.c diff --git a/sys/modules/coretemp/Makefile b/sys/modules/coretemp/Makefile --- a/sys/modules/coretemp/Makefile +++ b/sys/modules/coretemp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/coretemp KMOD= coretemp diff --git a/sys/modules/cpsw/Makefile b/sys/modules/cpsw/Makefile --- a/sys/modules/cpsw/Makefile +++ b/sys/modules/cpsw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/cpsw KMOD= if_cpsw diff --git a/sys/modules/cpuctl/Makefile b/sys/modules/cpuctl/Makefile --- a/sys/modules/cpuctl/Makefile +++ b/sys/modules/cpuctl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cpuctl KMOD= cpuctl diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile --- a/sys/modules/cpufreq/Makefile +++ b/sys/modules/cpufreq/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cpufreq \ ${SRCTOP}/sys/${MACHINE_CPUARCH}/cpufreq diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -1,4 +1,3 @@ - LIBSODIUM=${SRCTOP}/sys/contrib/libsodium/src/libsodium .PATH: ${SRCTOP}/sys/opencrypto diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile --- a/sys/modules/cryptodev/Makefile +++ b/sys/modules/cryptodev/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/opencrypto KMOD = cryptodev SRCS = cryptodev.c diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile --- a/sys/modules/ctl/Makefile +++ b/sys/modules/ctl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/cam/ctl KMOD= ctl diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile --- a/sys/modules/cxgb/Makefile +++ b/sys/modules/cxgb/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile --- a/sys/modules/cxgb/cxgb/Makefile +++ b/sys/modules/cxgb/cxgb/Makefile @@ -1,4 +1,3 @@ - CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile --- a/sys/modules/cxgb/cxgb_t3fw/Makefile +++ b/sys/modules/cxgb/cxgb_t3fw/Makefile @@ -1,4 +1,3 @@ - CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} diff --git a/sys/modules/cxgbe/ccr/Makefile b/sys/modules/cxgbe/ccr/Makefile --- a/sys/modules/cxgbe/ccr/Makefile +++ b/sys/modules/cxgbe/ccr/Makefile @@ -1,4 +1,3 @@ - CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/crypto diff --git a/sys/modules/cxgbe/cxgbei/Makefile b/sys/modules/cxgbe/cxgbei/Makefile --- a/sys/modules/cxgbe/cxgbei/Makefile +++ b/sys/modules/cxgbe/cxgbei/Makefile @@ -1,4 +1,3 @@ - CXGBE = ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/cxgbei diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile --- a/sys/modules/cxgbe/iw_cxgbe/Makefile +++ b/sys/modules/cxgbe/iw_cxgbe/Makefile @@ -1,4 +1,3 @@ - CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile --- a/sys/modules/dc/Makefile +++ b/sys/modules/dc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/dc KMOD= if_dc diff --git a/sys/modules/dpdk_lpm4/Makefile b/sys/modules/dpdk_lpm4/Makefile --- a/sys/modules/dpdk_lpm4/Makefile +++ b/sys/modules/dpdk_lpm4/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/dpdk_lpm6/Makefile b/sys/modules/dpdk_lpm6/Makefile --- a/sys/modules/dpdk_lpm6/Makefile +++ b/sys/modules/dpdk_lpm6/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/dpms/Makefile b/sys/modules/dpms/Makefile --- a/sys/modules/dpms/Makefile +++ b/sys/modules/dpms/Makefile @@ -1,4 +1,3 @@ - KMOD= dpms SRCS= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/dtb/sifive/Makefile b/sys/modules/dtb/sifive/Makefile --- a/sys/modules/dtb/sifive/Makefile +++ b/sys/modules/dtb/sifive/Makefile @@ -1,4 +1,3 @@ - DTS= \ sifive/hifive-unleashed-a00.dts diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -1,4 +1,3 @@ - .include "Makefile.inc" SUBDIR= dtaudit \ diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc --- a/sys/modules/dtrace/Makefile.inc +++ b/sys/modules/dtrace/Makefile.inc @@ -1,4 +1,3 @@ - IGNORE_PRAGMA= 1 load : diff --git a/sys/modules/dtrace/dtaudit/Makefile b/sys/modules/dtrace/dtaudit/Makefile --- a/sys/modules/dtrace/dtaudit/Makefile +++ b/sys/modules/dtrace/dtaudit/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/security/audit diff --git a/sys/modules/dtrace/dtmalloc/Makefile b/sys/modules/dtrace/dtmalloc/Makefile --- a/sys/modules/dtrace/dtmalloc/Makefile +++ b/sys/modules/dtrace/dtmalloc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtmalloc diff --git a/sys/modules/dtrace/dtnfscl/Makefile b/sys/modules/dtrace/dtnfscl/Makefile --- a/sys/modules/dtrace/dtnfscl/Makefile +++ b/sys/modules/dtrace/dtnfscl/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/fs/nfsclient diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys ARCHDIR= ${MACHINE_CPUARCH} diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile --- a/sys/modules/dtrace/dtrace_test/Makefile +++ b/sys/modules/dtrace/dtrace_test/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtrace diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile --- a/sys/modules/dtrace/dtraceall/Makefile +++ b/sys/modules/dtrace/dtraceall/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys KMOD= dtraceall diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace diff --git a/sys/modules/dtrace/fbt/Makefile b/sys/modules/dtrace/fbt/Makefile --- a/sys/modules/dtrace/fbt/Makefile +++ b/sys/modules/dtrace/fbt/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/fbt diff --git a/sys/modules/dtrace/profile/Makefile b/sys/modules/dtrace/profile/Makefile --- a/sys/modules/dtrace/profile/Makefile +++ b/sys/modules/dtrace/profile/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/profile diff --git a/sys/modules/dtrace/prototype/Makefile b/sys/modules/dtrace/prototype/Makefile --- a/sys/modules/dtrace/prototype/Makefile +++ b/sys/modules/dtrace/prototype/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile --- a/sys/modules/dtrace/sdt/Makefile +++ b/sys/modules/dtrace/sdt/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/sdt diff --git a/sys/modules/dtrace/systrace/Makefile b/sys/modules/dtrace/systrace/Makefile --- a/sys/modules/dtrace/systrace/Makefile +++ b/sys/modules/dtrace/systrace/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_freebsd32/Makefile b/sys/modules/dtrace/systrace_freebsd32/Makefile --- a/sys/modules/dtrace/systrace_freebsd32/Makefile +++ b/sys/modules/dtrace/systrace_freebsd32/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux/Makefile b/sys/modules/dtrace/systrace_linux/Makefile --- a/sys/modules/dtrace/systrace_linux/Makefile +++ b/sys/modules/dtrace/systrace_linux/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux32/Makefile b/sys/modules/dtrace/systrace_linux32/Makefile --- a/sys/modules/dtrace/systrace_linux32/Makefile +++ b/sys/modules/dtrace/systrace_linux32/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet SRCS= ip_dummynet.c diff --git a/sys/modules/e6000sw/Makefile b/sys/modules/e6000sw/Makefile --- a/sys/modules/e6000sw/Makefile +++ b/sys/modules/e6000sw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/etherswitch/e6000sw KMOD= e6000sw diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile --- a/sys/modules/efirt/Makefile +++ b/sys/modules/efirt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} .PATH: ${SRCTOP}/sys/dev/efidev diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile --- a/sys/modules/em/Makefile +++ b/sys/modules/em/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/e1000 KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_ddb.h opt_inet.h \ diff --git a/sys/modules/enetc/Makefile b/sys/modules/enetc/Makefile --- a/sys/modules/enetc/Makefile +++ b/sys/modules/enetc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/enetc KMOD = if_enetc diff --git a/sys/modules/epoch_test/Makefile b/sys/modules/epoch_test/Makefile --- a/sys/modules/epoch_test/Makefile +++ b/sys/modules/epoch_test/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/tests/epoch KMOD= epoch_test SRCS= epoch_test.c \ diff --git a/sys/modules/evdev/Makefile b/sys/modules/evdev/Makefile --- a/sys/modules/evdev/Makefile +++ b/sys/modules/evdev/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/evdev KMOD= evdev diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile --- a/sys/modules/exca/Makefile +++ b/sys/modules/exca/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/exca KMOD= exca diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile --- a/sys/modules/ext2fs/Makefile +++ b/sys/modules/ext2fs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \ diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -1,4 +1,3 @@ - KMOD= fdc .PATH: ${SRCTOP}/sys/dev/fdc diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile --- a/sys/modules/fdescfs/Makefile +++ b/sys/modules/fdescfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/fdescfs KMOD= fdescfs diff --git a/sys/modules/fdt/fdt_slicer/Makefile b/sys/modules/fdt/fdt_slicer/Makefile --- a/sys/modules/fdt/fdt_slicer/Makefile +++ b/sys/modules/fdt/fdt_slicer/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fdt KMOD= fdt_slicer diff --git a/sys/modules/ffec/Makefile b/sys/modules/ffec/Makefile --- a/sys/modules/ffec/Makefile +++ b/sys/modules/ffec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ffec KMOD= if_ffec diff --git a/sys/modules/fib_dxr/Makefile b/sys/modules/fib_dxr/Makefile --- a/sys/modules/fib_dxr/Makefile +++ b/sys/modules/fib_dxr/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/filemon/Makefile b/sys/modules/filemon/Makefile --- a/sys/modules/filemon/Makefile +++ b/sys/modules/filemon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/filemon KMOD= filemon diff --git a/sys/modules/firewire/Makefile b/sys/modules/firewire/Makefile --- a/sys/modules/firewire/Makefile +++ b/sys/modules/firewire/Makefile @@ -1,4 +1,3 @@ - SUBDIR= firewire \ fwe \ fwip \ diff --git a/sys/modules/firewire/Makefile.inc b/sys/modules/firewire/Makefile.inc --- a/sys/modules/firewire/Makefile.inc +++ b/sys/modules/firewire/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/firewire/firewire/Makefile b/sys/modules/firewire/firewire/Makefile --- a/sys/modules/firewire/firewire/Makefile +++ b/sys/modules/firewire/firewire/Makefile @@ -1,4 +1,3 @@ - # Makefile for the IEEE1394 OHCI chipset .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/fwe/Makefile b/sys/modules/firewire/fwe/Makefile --- a/sys/modules/firewire/fwe/Makefile +++ b/sys/modules/firewire/fwe/Makefile @@ -1,4 +1,3 @@ - # Makefile for the fwe(4) module (Ethernet over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile --- a/sys/modules/firewire/fwip/Makefile +++ b/sys/modules/firewire/fwip/Makefile @@ -1,4 +1,3 @@ - # Makefile for the fwip(4) module (IP over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire ${SRCTOP}/sys/net diff --git a/sys/modules/firewire/sbp/Makefile b/sys/modules/firewire/sbp/Makefile --- a/sys/modules/firewire/sbp/Makefile +++ b/sys/modules/firewire/sbp/Makefile @@ -1,4 +1,3 @@ - # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/sbp_targ/Makefile b/sys/modules/firewire/sbp_targ/Makefile --- a/sys/modules/firewire/sbp_targ/Makefile +++ b/sys/modules/firewire/sbp_targ/Makefile @@ -1,4 +1,3 @@ - # Makefile for the SBP-II Target mode .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firmware/Makefile b/sys/modules/firmware/Makefile --- a/sys/modules/firmware/Makefile +++ b/sys/modules/firmware/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= firmware diff --git a/sys/modules/flash/flexspi/Makefile b/sys/modules/flash/flexspi/Makefile --- a/sys/modules/flash/flexspi/Makefile +++ b/sys/modules/flash/flexspi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash/flexspi KMOD= flexspi diff --git a/sys/modules/ftgpio/Makefile b/sys/modules/ftgpio/Makefile --- a/sys/modules/ftgpio/Makefile +++ b/sys/modules/ftgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ftgpio KMOD= ftgpio SRCS= ftgpio.c diff --git a/sys/modules/ftwd/Makefile b/sys/modules/ftwd/Makefile --- a/sys/modules/ftwd/Makefile +++ b/sys/modules/ftwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ftwd KMOD= ftwd diff --git a/sys/modules/fusefs/Makefile b/sys/modules/fusefs/Makefile --- a/sys/modules/fusefs/Makefile +++ b/sys/modules/fusefs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/fuse KMOD= fusefs diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile --- a/sys/modules/fxp/Makefile +++ b/sys/modules/fxp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fxp KMOD= if_fxp diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile --- a/sys/modules/gem/Makefile +++ b/sys/modules/gem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gem KMOD= if_gem diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/geom/Makefile.inc b/sys/modules/geom/Makefile.inc --- a/sys/modules/geom/Makefile.inc +++ b/sys/modules/geom/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile --- a/sys/modules/geom/geom_bde/Makefile +++ b/sys/modules/geom/geom_bde/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/bde .PATH: ${SRCTOP}/sys/crypto/rijndael .PATH: ${SRCTOP}/sys/crypto/sha2 diff --git a/sys/modules/geom/geom_cache/Makefile b/sys/modules/geom/geom_cache/Makefile --- a/sys/modules/geom/geom_cache/Makefile +++ b/sys/modules/geom/geom_cache/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/cache KMOD= geom_cache diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile --- a/sys/modules/geom/geom_ccd/Makefile +++ b/sys/modules/geom/geom_ccd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom KMOD= geom_ccd diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile --- a/sys/modules/geom/geom_concat/Makefile +++ b/sys/modules/geom/geom_concat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/concat KMOD= geom_concat diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile --- a/sys/modules/geom/geom_eli/Makefile +++ b/sys/modules/geom/geom_eli/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/eli KMOD= geom_eli diff --git a/sys/modules/geom/geom_flashmap/Makefile b/sys/modules/geom/geom_flashmap/Makefile --- a/sys/modules/geom/geom_flashmap/Makefile +++ b/sys/modules/geom/geom_flashmap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom KMOD= geom_flashmap diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile --- a/sys/modules/geom/geom_gate/Makefile +++ b/sys/modules/geom/geom_gate/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/gate KMOD= geom_gate diff --git a/sys/modules/geom/geom_journal/Makefile b/sys/modules/geom/geom_journal/Makefile --- a/sys/modules/geom/geom_journal/Makefile +++ b/sys/modules/geom/geom_journal/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/journal KMOD= geom_journal diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/label KMOD= geom_label diff --git a/sys/modules/geom/geom_linux_lvm/Makefile b/sys/modules/geom/geom_linux_lvm/Makefile --- a/sys/modules/geom/geom_linux_lvm/Makefile +++ b/sys/modules/geom/geom_linux_lvm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/linux_lvm KMOD= geom_linux_lvm diff --git a/sys/modules/geom/geom_map/Makefile b/sys/modules/geom/geom_map/Makefile --- a/sys/modules/geom/geom_map/Makefile +++ b/sys/modules/geom/geom_map/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom KMOD= geom_map diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile --- a/sys/modules/geom/geom_mirror/Makefile +++ b/sys/modules/geom/geom_mirror/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/mirror KMOD= geom_mirror diff --git a/sys/modules/geom/geom_mountver/Makefile b/sys/modules/geom/geom_mountver/Makefile --- a/sys/modules/geom/geom_mountver/Makefile +++ b/sys/modules/geom/geom_mountver/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/mountver KMOD= geom_mountver diff --git a/sys/modules/geom/geom_multipath/Makefile b/sys/modules/geom/geom_multipath/Makefile --- a/sys/modules/geom/geom_multipath/Makefile +++ b/sys/modules/geom/geom_multipath/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/multipath KMOD= geom_multipath diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile --- a/sys/modules/geom/geom_nop/Makefile +++ b/sys/modules/geom/geom_nop/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/nop KMOD= geom_nop diff --git a/sys/modules/geom/geom_part/Makefile b/sys/modules/geom/geom_part/Makefile --- a/sys/modules/geom/geom_part/Makefile +++ b/sys/modules/geom/geom_part/Makefile @@ -1,4 +1,3 @@ - SUBDIR= geom_part_apm \ geom_part_bsd \ geom_part_bsd64 \ diff --git a/sys/modules/geom/geom_part/geom_part_apm/Makefile b/sys/modules/geom/geom_part/geom_part_apm/Makefile --- a/sys/modules/geom/geom_part/geom_part_apm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_apm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_apm diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile --- a/sys/modules/geom/geom_part/geom_part_bsd/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part ${SRCTOP}/sys/geom KMOD= geom_part_bsd diff --git a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile --- a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_bsd64 diff --git a/sys/modules/geom/geom_part/geom_part_ebr/Makefile b/sys/modules/geom/geom_part/geom_part_ebr/Makefile --- a/sys/modules/geom/geom_part/geom_part_ebr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ebr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ebr diff --git a/sys/modules/geom/geom_part/geom_part_gpt/Makefile b/sys/modules/geom/geom_part/geom_part_gpt/Makefile --- a/sys/modules/geom/geom_part/geom_part_gpt/Makefile +++ b/sys/modules/geom/geom_part/geom_part_gpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_gpt diff --git a/sys/modules/geom/geom_part/geom_part_ldm/Makefile b/sys/modules/geom/geom_part/geom_part_ldm/Makefile --- a/sys/modules/geom/geom_part/geom_part_ldm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ldm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ldm diff --git a/sys/modules/geom/geom_part/geom_part_mbr/Makefile b/sys/modules/geom/geom_part/geom_part_mbr/Makefile --- a/sys/modules/geom/geom_part/geom_part_mbr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_mbr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_mbr diff --git a/sys/modules/geom/geom_raid/Makefile b/sys/modules/geom/geom_raid/Makefile --- a/sys/modules/geom/geom_raid/Makefile +++ b/sys/modules/geom/geom_raid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/raid KMOD= geom_raid diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile --- a/sys/modules/geom/geom_raid3/Makefile +++ b/sys/modules/geom/geom_raid3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/raid3 KMOD= geom_raid3 diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile --- a/sys/modules/geom/geom_shsec/Makefile +++ b/sys/modules/geom/geom_shsec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/shsec KMOD= geom_shsec diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile --- a/sys/modules/geom/geom_stripe/Makefile +++ b/sys/modules/geom/geom_stripe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/stripe KMOD= geom_stripe diff --git a/sys/modules/geom/geom_union/Makefile b/sys/modules/geom/geom_union/Makefile --- a/sys/modules/geom/geom_union/Makefile +++ b/sys/modules/geom/geom_union/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/union KMOD= geom_union diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/sys/geom/uzip ${SRCTOP}/sys/net diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile --- a/sys/modules/geom/geom_vinum/Makefile +++ b/sys/modules/geom/geom_vinum/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/vinum KMOD= geom_vinum diff --git a/sys/modules/geom/geom_virstor/Makefile b/sys/modules/geom/geom_virstor/Makefile --- a/sys/modules/geom/geom_virstor/Makefile +++ b/sys/modules/geom/geom_virstor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/virstor KMOD= geom_virstor diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile --- a/sys/modules/geom/geom_zero/Makefile +++ b/sys/modules/geom/geom_zero/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/zero KMOD= geom_zero diff --git a/sys/modules/glxiic/Makefile b/sys/modules/glxiic/Makefile --- a/sys/modules/glxiic/Makefile +++ b/sys/modules/glxiic/Makefile @@ -1,4 +1,3 @@ - #CFLAGS+= -DGLXIIC_DEBUG .PATH: ${SRCTOP}/sys/dev/glxiic diff --git a/sys/modules/glxsb/Makefile b/sys/modules/glxsb/Makefile --- a/sys/modules/glxsb/Makefile +++ b/sys/modules/glxsb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/glxsb KMOD = glxsb SRCS = glxsb.c glxsb_hash.c glxsb.h diff --git a/sys/modules/hid/Makefile b/sys/modules/hid/Makefile --- a/sys/modules/hid/Makefile +++ b/sys/modules/hid/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ hid \ hidbus \ diff --git a/sys/modules/hid/bcm5974/Makefile b/sys/modules/hid/bcm5974/Makefile --- a/sys/modules/hid/bcm5974/Makefile +++ b/sys/modules/hid/bcm5974/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= bcm5974 diff --git a/sys/modules/hid/hconf/Makefile b/sys/modules/hid/hconf/Makefile --- a/sys/modules/hid/hconf/Makefile +++ b/sys/modules/hid/hconf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hconf diff --git a/sys/modules/hid/hcons/Makefile b/sys/modules/hid/hcons/Makefile --- a/sys/modules/hid/hcons/Makefile +++ b/sys/modules/hid/hcons/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hcons diff --git a/sys/modules/hid/hgame/Makefile b/sys/modules/hid/hgame/Makefile --- a/sys/modules/hid/hgame/Makefile +++ b/sys/modules/hid/hgame/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hgame diff --git a/sys/modules/hid/hid/Makefile b/sys/modules/hid/hid/Makefile --- a/sys/modules/hid/hid/Makefile +++ b/sys/modules/hid/hid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hid diff --git a/sys/modules/hid/hidbus/Makefile b/sys/modules/hid/hidbus/Makefile --- a/sys/modules/hid/hidbus/Makefile +++ b/sys/modules/hid/hidbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidbus diff --git a/sys/modules/hid/hidmap/Makefile b/sys/modules/hid/hidmap/Makefile --- a/sys/modules/hid/hidmap/Makefile +++ b/sys/modules/hid/hidmap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidmap diff --git a/sys/modules/hid/hidraw/Makefile b/sys/modules/hid/hidraw/Makefile --- a/sys/modules/hid/hidraw/Makefile +++ b/sys/modules/hid/hidraw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidraw diff --git a/sys/modules/hid/hkbd/Makefile b/sys/modules/hid/hkbd/Makefile --- a/sys/modules/hid/hkbd/Makefile +++ b/sys/modules/hid/hkbd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hkbd diff --git a/sys/modules/hid/hms/Makefile b/sys/modules/hid/hms/Makefile --- a/sys/modules/hid/hms/Makefile +++ b/sys/modules/hid/hms/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hms diff --git a/sys/modules/hid/hmt/Makefile b/sys/modules/hid/hmt/Makefile --- a/sys/modules/hid/hmt/Makefile +++ b/sys/modules/hid/hmt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hmt diff --git a/sys/modules/hid/hpen/Makefile b/sys/modules/hid/hpen/Makefile --- a/sys/modules/hid/hpen/Makefile +++ b/sys/modules/hid/hpen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hpen diff --git a/sys/modules/hid/hsctrl/Makefile b/sys/modules/hid/hsctrl/Makefile --- a/sys/modules/hid/hsctrl/Makefile +++ b/sys/modules/hid/hsctrl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hsctrl diff --git a/sys/modules/hid/ietp/Makefile b/sys/modules/hid/ietp/Makefile --- a/sys/modules/hid/ietp/Makefile +++ b/sys/modules/hid/ietp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= ietp diff --git a/sys/modules/hid/ps4dshock/Makefile b/sys/modules/hid/ps4dshock/Makefile --- a/sys/modules/hid/ps4dshock/Makefile +++ b/sys/modules/hid/ps4dshock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= ps4dshock diff --git a/sys/modules/hid/xb360gp/Makefile b/sys/modules/hid/xb360gp/Makefile --- a/sys/modules/hid/xb360gp/Makefile +++ b/sys/modules/hid/xb360gp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= xb360gp diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile --- a/sys/modules/hifn/Makefile +++ b/sys/modules/hifn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hifn KMOD = hifn SRCS = hifn7751.c opt_hifn.h diff --git a/sys/modules/hptiop/Makefile b/sys/modules/hptiop/Makefile --- a/sys/modules/hptiop/Makefile +++ b/sys/modules/hptiop/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hptiop KMOD= hptiop diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile --- a/sys/modules/hyperv/Makefile +++ b/sys/modules/hyperv/Makefile @@ -1,4 +1,3 @@ - SUBDIR = vmbus netvsc storvsc utilities hvsock hid .include diff --git a/sys/modules/hyperv/hid/Makefile b/sys/modules/hyperv/hid/Makefile --- a/sys/modules/hyperv/hid/Makefile +++ b/sys/modules/hyperv/hid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/input KMOD= hv_hid diff --git a/sys/modules/hyperv/hvsock/Makefile b/sys/modules/hyperv/hvsock/Makefile --- a/sys/modules/hyperv/hvsock/Makefile +++ b/sys/modules/hyperv/hvsock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/hvsock KMOD= hv_sock diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/netvsc \ ${SRCTOP}/sys/dev/hyperv/vmbus diff --git a/sys/modules/hyperv/pcib/Makefile b/sys/modules/hyperv/pcib/Makefile --- a/sys/modules/hyperv/pcib/Makefile +++ b/sys/modules/hyperv/pcib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/pcib \ ${SRCTOP}/sys/dev/hyperv/vmbus diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile --- a/sys/modules/hyperv/storvsc/Makefile +++ b/sys/modules/hyperv/storvsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/storvsc \ ${SRCTOP}/sys/dev/hyperv/vmbus \ diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/utilities KMOD= hv_utils diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/vmbus \ ${SRCTOP}/sys/dev/hyperv/vmbus/${MACHINE_CPUARCH} \ ${SRCTOP}/sys/dev/hyperv/vmbus/x86 diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile --- a/sys/modules/i2c/Makefile +++ b/sys/modules/i2c/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ ads111x \ controllers \ diff --git a/sys/modules/i2c/Makefile.inc b/sys/modules/i2c/Makefile.inc --- a/sys/modules/i2c/Makefile.inc +++ b/sys/modules/i2c/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile --- a/sys/modules/i2c/ads111x/Makefile +++ b/sys/modules/i2c/ads111x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= ads111x diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile --- a/sys/modules/i2c/controllers/Makefile +++ b/sys/modules/i2c/controllers/Makefile @@ -1,4 +1,3 @@ - SUBDIR = alpm amdpm amdsmb ichiic ichsmb intpm ismt nfsmb viapm lpbb pcf .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" diff --git a/sys/modules/i2c/controllers/Makefile.inc b/sys/modules/i2c/controllers/Makefile.inc --- a/sys/modules/i2c/controllers/Makefile.inc +++ b/sys/modules/i2c/controllers/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile --- a/sys/modules/i2c/controllers/alpm/Makefile +++ b/sys/modules/i2c/controllers/alpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/alpm KMOD = alpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile --- a/sys/modules/i2c/controllers/amdpm/Makefile +++ b/sys/modules/i2c/controllers/amdpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdpm KMOD = amdpm SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile --- a/sys/modules/i2c/controllers/amdsmb/Makefile +++ b/sys/modules/i2c/controllers/amdsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmb KMOD= amdsmb diff --git a/sys/modules/i2c/controllers/ichiic/Makefile b/sys/modules/i2c/controllers/ichiic/Makefile --- a/sys/modules/i2c/controllers/ichiic/Makefile +++ b/sys/modules/i2c/controllers/ichiic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichiic KMOD = ig4 SRCS = acpi_if.h device_if.h bus_if.h iicbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/ichsmb/Makefile b/sys/modules/i2c/controllers/ichsmb/Makefile --- a/sys/modules/i2c/controllers/ichsmb/Makefile +++ b/sys/modules/i2c/controllers/ichsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichsmb KMOD = ichsmb SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/imcsmb/Makefile b/sys/modules/i2c/controllers/imcsmb/Makefile --- a/sys/modules/i2c/controllers/imcsmb/Makefile +++ b/sys/modules/i2c/controllers/imcsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/imcsmb KMOD = imcsmb SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile --- a/sys/modules/i2c/controllers/intpm/Makefile +++ b/sys/modules/i2c/controllers/intpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intpm KMOD = intpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/ismt/Makefile b/sys/modules/i2c/controllers/ismt/Makefile --- a/sys/modules/i2c/controllers/ismt/Makefile +++ b/sys/modules/i2c/controllers/ismt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ismt KMOD = ismt SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile --- a/sys/modules/i2c/controllers/lpbb/Makefile +++ b/sys/modules/i2c/controllers/lpbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD = lpbb SRCS = device_if.h bus_if.h iicbb_if.h ppbus_if.h \ diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile --- a/sys/modules/i2c/controllers/nfsmb/Makefile +++ b/sys/modules/i2c/controllers/nfsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nfsmb KMOD= nfsmb diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile --- a/sys/modules/i2c/controllers/pcf/Makefile +++ b/sys/modules/i2c/controllers/pcf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pcf KMOD= pcf diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile --- a/sys/modules/i2c/controllers/viapm/Makefile +++ b/sys/modules/i2c/controllers/viapm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/viapm KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/cyapa/Makefile b/sys/modules/i2c/cyapa/Makefile --- a/sys/modules/i2c/cyapa/Makefile +++ b/sys/modules/i2c/cyapa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cyapa KMOD = cyapa SRCS = cyapa.c device_if.h bus_if.h iicbus_if.h vnode_if.h \ diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile --- a/sys/modules/i2c/ds1307/Makefile +++ b/sys/modules/i2c/ds1307/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1307 SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile --- a/sys/modules/i2c/ds13rtc/Makefile +++ b/sys/modules/i2c/ds13rtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds13rtc SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile --- a/sys/modules/i2c/ds1672/Makefile +++ b/sys/modules/i2c/ds1672/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1672 SRCS = ds1672.c diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile --- a/sys/modules/i2c/ds3231/Makefile +++ b/sys/modules/i2c/ds3231/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds3231 SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile --- a/sys/modules/i2c/htu21/Makefile +++ b/sys/modules/i2c/htu21/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= htu21 SRCS= htu21.c diff --git a/sys/modules/i2c/hym8563/Makefile b/sys/modules/i2c/hym8563/Makefile --- a/sys/modules/i2c/hym8563/Makefile +++ b/sys/modules/i2c/hym8563/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD= hym8563 SRCS= hym8563.c diff --git a/sys/modules/i2c/icee/Makefile b/sys/modules/i2c/icee/Makefile --- a/sys/modules/i2c/icee/Makefile +++ b/sys/modules/i2c/icee/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD= icee SRCS= icee.c diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile --- a/sys/modules/i2c/if_ic/Makefile +++ b/sys/modules/i2c/if_ic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = if_ic SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile --- a/sys/modules/i2c/iic/Makefile +++ b/sys/modules/i2c/iic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iic SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile --- a/sys/modules/i2c/iicbb/Makefile +++ b/sys/modules/i2c/iicbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicbb SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile --- a/sys/modules/i2c/iicbus/Makefile +++ b/sys/modules/i2c/iicbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD= iicbus diff --git a/sys/modules/i2c/iichid/Makefile b/sys/modules/i2c/iichid/Makefile --- a/sys/modules/i2c/iichid/Makefile +++ b/sys/modules/i2c/iichid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iichid SRCS = iichid.c diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile --- a/sys/modules/i2c/iicsmb/Makefile +++ b/sys/modules/i2c/iicsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicsmb SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/isl/Makefile b/sys/modules/i2c/isl/Makefile --- a/sys/modules/i2c/isl/Makefile +++ b/sys/modules/i2c/isl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/isl KMOD = isl SRCS = isl.c device_if.h bus_if.h iicbus_if.h opt_platform.h diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile --- a/sys/modules/i2c/isl12xx/Makefile +++ b/sys/modules/i2c/isl12xx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = isl12xx SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/jedec_dimm/Makefile b/sys/modules/i2c/jedec_dimm/Makefile --- a/sys/modules/i2c/jedec_dimm/Makefile +++ b/sys/modules/i2c/jedec_dimm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../dev/jedec_dimm KMOD = jedec_dimm SRCS = jedec_dimm.c jedec_dimm.h bus_if.h device_if.h smbus_if.h diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile --- a/sys/modules/i2c/max44009/Makefile +++ b/sys/modules/i2c/max44009/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= max44009 SRCS= max44009.c diff --git a/sys/modules/i2c/mux/Makefile b/sys/modules/i2c/mux/Makefile --- a/sys/modules/i2c/mux/Makefile +++ b/sys/modules/i2c/mux/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ iicmux \ ltc430x \ diff --git a/sys/modules/i2c/mux/iic_gpiomux/Makefile b/sys/modules/i2c/mux/iic_gpiomux/Makefile --- a/sys/modules/i2c/mux/iic_gpiomux/Makefile +++ b/sys/modules/i2c/mux/iic_gpiomux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= iic_gpiomux diff --git a/sys/modules/i2c/mux/iicmux/Makefile b/sys/modules/i2c/mux/iicmux/Makefile --- a/sys/modules/i2c/mux/iicmux/Makefile +++ b/sys/modules/i2c/mux/iicmux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= iicmux diff --git a/sys/modules/i2c/mux/ltc430x/Makefile b/sys/modules/i2c/mux/ltc430x/Makefile --- a/sys/modules/i2c/mux/ltc430x/Makefile +++ b/sys/modules/i2c/mux/ltc430x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= ltc430x diff --git a/sys/modules/i2c/mux/pca954x/Makefile b/sys/modules/i2c/mux/pca954x/Makefile --- a/sys/modules/i2c/mux/pca954x/Makefile +++ b/sys/modules/i2c/mux/pca954x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= pca954x diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile --- a/sys/modules/i2c/nxprtc/Makefile +++ b/sys/modules/i2c/nxprtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = nxprtc SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/pcf8574/Makefile b/sys/modules/i2c/pcf8574/Makefile --- a/sys/modules/i2c/pcf8574/Makefile +++ b/sys/modules/i2c/pcf8574/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/gpio/ KMOD = pcf8574 SRCS = pcf8574.c diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile --- a/sys/modules/i2c/pcf8591/Makefile +++ b/sys/modules/i2c/pcf8591/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= pcf8591 SRCS= pcf8591.c diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile --- a/sys/modules/i2c/rtc8583/Makefile +++ b/sys/modules/i2c/rtc8583/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = rtc8583 SRCS = rtc8583.c diff --git a/sys/modules/i2c/rv3032/Makefile b/sys/modules/i2c/rv3032/Makefile --- a/sys/modules/i2c/rv3032/Makefile +++ b/sys/modules/i2c/rv3032/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD= rv3032 SRCS= rv3032.c diff --git a/sys/modules/i2c/rx8803/Makefile b/sys/modules/i2c/rx8803/Makefile --- a/sys/modules/i2c/rx8803/Makefile +++ b/sys/modules/i2c/rx8803/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc/ KMOD = rx8803 SRCS = rx8803.c diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile --- a/sys/modules/i2c/s35390a/Makefile +++ b/sys/modules/i2c/s35390a/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = s35390a SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile --- a/sys/modules/i2c/smb/Makefile +++ b/sys/modules/i2c/smb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/smbus KMOD = smb SRCS = device_if.h bus_if.h smbus_if.h \ diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile --- a/sys/modules/i2c/smbus/Makefile +++ b/sys/modules/i2c/smbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/smbus KMOD = smbus SRCS = device_if.h bus_if.h smbus_if.h smbus_if.c \ diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile --- a/sys/modules/i2c/tmp461/Makefile +++ b/sys/modules/i2c/tmp461/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD = tmp461 SRCS = tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/iavf/Makefile b/sys/modules/iavf/Makefile --- a/sys/modules/iavf/Makefile +++ b/sys/modules/iavf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iavf KMOD = if_iavf diff --git a/sys/modules/ice/Makefile b/sys/modules/ice/Makefile --- a/sys/modules/ice/Makefile +++ b/sys/modules/ice/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ice KMOD = if_ice diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,4 +1,3 @@ - KMOD= ice_ddp FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.35.0.pkg:ice_ddp:0x01032300 diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile --- a/sys/modules/ichwd/Makefile +++ b/sys/modules/ichwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichwd KMOD= ichwd diff --git a/sys/modules/ida/Makefile b/sys/modules/ida/Makefile --- a/sys/modules/ida/Makefile +++ b/sys/modules/ida/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ida KMOD= ida diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile --- a/sys/modules/if_bridge/Makefile +++ b/sys/modules/if_bridge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_bridge SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile --- a/sys/modules/if_disc/Makefile +++ b/sys/modules/if_disc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_disc diff --git a/sys/modules/if_edsc/Makefile b/sys/modules/if_edsc/Makefile --- a/sys/modules/if_edsc/Makefile +++ b/sys/modules/if_edsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_edsc diff --git a/sys/modules/if_enc/Makefile b/sys/modules/if_enc/Makefile --- a/sys/modules/if_enc/Makefile +++ b/sys/modules/if_enc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_epair/Makefile b/sys/modules/if_epair/Makefile --- a/sys/modules/if_epair/Makefile +++ b/sys/modules/if_epair/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_epair diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile --- a/sys/modules/if_gre/Makefile +++ b/sys/modules/if_gre/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_infiniband/Makefile b/sys/modules/if_infiniband/Makefile --- a/sys/modules/if_infiniband/Makefile +++ b/sys/modules/if_infiniband/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_infiniband diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile --- a/sys/modules/if_lagg/Makefile +++ b/sys/modules/if_lagg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_lagg SRCS= if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h opt_kern_tls.h diff --git a/sys/modules/if_me/Makefile b/sys/modules/if_me/Makefile --- a/sys/modules/if_me/Makefile +++ b/sys/modules/if_me/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_me diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile --- a/sys/modules/if_stf/Makefile +++ b/sys/modules/if_stf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_stf diff --git a/sys/modules/if_tuntap/Makefile b/sys/modules/if_tuntap/Makefile --- a/sys/modules/if_tuntap/Makefile +++ b/sys/modules/if_tuntap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_tuntap diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_vlan diff --git a/sys/modules/if_vxlan/Makefile b/sys/modules/if_vxlan/Makefile --- a/sys/modules/if_vxlan/Makefile +++ b/sys/modules/if_vxlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_vxlan diff --git a/sys/modules/iflib/Makefile b/sys/modules/iflib/Makefile --- a/sys/modules/iflib/Makefile +++ b/sys/modules/iflib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= iflib diff --git a/sys/modules/igc/Makefile b/sys/modules/igc/Makefile --- a/sys/modules/igc/Makefile +++ b/sys/modules/igc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/igc KMOD = if_igc diff --git a/sys/modules/imgact_binmisc/Makefile b/sys/modules/imgact_binmisc/Makefile --- a/sys/modules/imgact_binmisc/Makefile +++ b/sys/modules/imgact_binmisc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= imgact_binmisc diff --git a/sys/modules/imx/imx6_ahci/Makefile b/sys/modules/imx/imx6_ahci/Makefile --- a/sys/modules/imx/imx6_ahci/Makefile +++ b/sys/modules/imx/imx6_ahci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx6_ahci diff --git a/sys/modules/imx/imx6_snvs/Makefile b/sys/modules/imx/imx6_snvs/Makefile --- a/sys/modules/imx/imx6_snvs/Makefile +++ b/sys/modules/imx/imx6_snvs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx6_snvs diff --git a/sys/modules/imx/imx_i2c/Makefile b/sys/modules/imx/imx_i2c/Makefile --- a/sys/modules/imx/imx_i2c/Makefile +++ b/sys/modules/imx/imx_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_i2c diff --git a/sys/modules/imx/imx_spi/Makefile b/sys/modules/imx/imx_spi/Makefile --- a/sys/modules/imx/imx_spi/Makefile +++ b/sys/modules/imx/imx_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_spi diff --git a/sys/modules/imx/imx_wdog/Makefile b/sys/modules/imx/imx_wdog/Makefile --- a/sys/modules/imx/imx_wdog/Makefile +++ b/sys/modules/imx/imx_wdog/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_wdog diff --git a/sys/modules/intelspi/Makefile b/sys/modules/intelspi/Makefile --- a/sys/modules/intelspi/Makefile +++ b/sys/modules/intelspi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intel KMOD= intelspi SRCS= spi.c spi_acpi.c spi_pci.c diff --git a/sys/modules/io/Makefile b/sys/modules/io/Makefile --- a/sys/modules/io/Makefile +++ b/sys/modules/io/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/io .PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile --- a/sys/modules/ip6_mroute_mod/Makefile +++ b/sys/modules/ip6_mroute_mod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet6 KMOD= ip6_mroute diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile --- a/sys/modules/ip_mroute_mod/Makefile +++ b/sys/modules/ip_mroute_mod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet ${SRCTOP}/sys/netinet6 KMOD= ip_mroute diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile --- a/sys/modules/ipdivert/Makefile +++ b/sys/modules/ipdivert/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= ipdivert diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfilter/netinet KMOD= ipl diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile --- a/sys/modules/ipfw_nat/Makefile +++ b/sys/modules/ipfw_nat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw_nat diff --git a/sys/modules/ipfw_nat64/Makefile b/sys/modules/ipfw_nat64/Makefile --- a/sys/modules/ipfw_nat64/Makefile +++ b/sys/modules/ipfw_nat64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/nat64 KMOD= ipfw_nat64 diff --git a/sys/modules/ipfw_nptv6/Makefile b/sys/modules/ipfw_nptv6/Makefile --- a/sys/modules/ipfw_nptv6/Makefile +++ b/sys/modules/ipfw_nptv6/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/nptv6 KMOD= ipfw_nptv6 diff --git a/sys/modules/ipfw_pmod/Makefile b/sys/modules/ipfw_pmod/Makefile --- a/sys/modules/ipfw_pmod/Makefile +++ b/sys/modules/ipfw_pmod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/pmod KMOD= ipfw_pmod diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipmi # XXX - ipmi_smbus and ipmi_ssif depend on smbus diff --git a/sys/modules/ipmi/ipmi_linux/Makefile b/sys/modules/ipmi/ipmi_linux/Makefile --- a/sys/modules/ipmi/ipmi_linux/Makefile +++ b/sys/modules/ipmi/ipmi_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipmi KMOD= ipmi_linux diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile --- a/sys/modules/ips/Makefile +++ b/sys/modules/ips/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ips KMOD = ips SRCS = ips.c ips_pci.c ips.h ips_disk.c ips_disk.h ips_commands.c \ diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile --- a/sys/modules/ipsec/Makefile +++ b/sys/modules/ipsec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net ${SRCTOP}/sys/netipsec KMOD= ipsec diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile --- a/sys/modules/ipw/Makefile +++ b/sys/modules/ipw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipw KMOD = if_ipw diff --git a/sys/modules/ipwfw/Makefile b/sys/modules/ipwfw/Makefile --- a/sys/modules/ipwfw/Makefile +++ b/sys/modules/ipwfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ipw_bss \ ipw_ibss \ ipw_monitor diff --git a/sys/modules/ipwfw/ipw_bss/Makefile b/sys/modules/ipwfw/ipw_bss/Makefile --- a/sys/modules/ipwfw/ipw_bss/Makefile +++ b/sys/modules/ipwfw/ipw_bss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_bss diff --git a/sys/modules/ipwfw/ipw_ibss/Makefile b/sys/modules/ipwfw/ipw_ibss/Makefile --- a/sys/modules/ipwfw/ipw_ibss/Makefile +++ b/sys/modules/ipwfw/ipw_ibss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_ibss diff --git a/sys/modules/ipwfw/ipw_monitor/Makefile b/sys/modules/ipwfw/ipw_monitor/Makefile --- a/sys/modules/ipwfw/ipw_monitor/Makefile +++ b/sys/modules/ipwfw/ipw_monitor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_monitor diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile --- a/sys/modules/iscsi/Makefile +++ b/sys/modules/iscsi/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/iser/Makefile b/sys/modules/iser/Makefile --- a/sys/modules/iser/Makefile +++ b/sys/modules/iser/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile --- a/sys/modules/isp/Makefile +++ b/sys/modules/isp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/isp KMOD= isp diff --git a/sys/modules/itwd/Makefile b/sys/modules/itwd/Makefile --- a/sys/modules/itwd/Makefile +++ b/sys/modules/itwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/itwd KMOD= itwd diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile --- a/sys/modules/iwi/Makefile +++ b/sys/modules/iwi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwi KMOD = if_iwi diff --git a/sys/modules/iwifw/Makefile b/sys/modules/iwifw/Makefile --- a/sys/modules/iwifw/Makefile +++ b/sys/modules/iwifw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwi_bss \ iwi_ibss \ iwi_monitor diff --git a/sys/modules/iwifw/iwi_bss/Makefile b/sys/modules/iwifw/iwi_bss/Makefile --- a/sys/modules/iwifw/iwi_bss/Makefile +++ b/sys/modules/iwifw/iwi_bss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_bss diff --git a/sys/modules/iwifw/iwi_ibss/Makefile b/sys/modules/iwifw/iwi_ibss/Makefile --- a/sys/modules/iwifw/iwi_ibss/Makefile +++ b/sys/modules/iwifw/iwi_ibss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_ibss diff --git a/sys/modules/iwifw/iwi_monitor/Makefile b/sys/modules/iwifw/iwi_monitor/Makefile --- a/sys/modules/iwifw/iwi_monitor/Makefile +++ b/sys/modules/iwifw/iwi_monitor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_monitor diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -1,4 +1,3 @@ - DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile --- a/sys/modules/iwlwififw/Makefile +++ b/sys/modules/iwlwififw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ iwlwifi-3160-fw \ iwlwifi-3168-fw \ diff --git a/sys/modules/iwlwififw/Makefile.inc b/sys/modules/iwlwififw/Makefile.inc --- a/sys/modules/iwlwififw/Makefile.inc +++ b/sys/modules/iwlwififw/Makefile.inc @@ -1,4 +1,3 @@ - # Common rules for building iwlwifi firmware. EXT?= ucode diff --git a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 3160 diff --git a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 29 NAME= 3168 diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 7260 diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 7265 diff --git a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 29 NAME= 7265D diff --git a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 36 NAME= 8000C diff --git a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 36 NAME= 8265 diff --git a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 46 NAME= 9000-pu-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 46 NAME= 9260-th-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-b0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-c0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-c0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= QuZ-a0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= QuZ-a0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= cc-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= gl-c0-fm-c0 diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= gl-c0-fm-c0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf-a0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf4-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf4-a0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 81 NAME= so-a0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= so-a0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= ty-a0-gf-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= ty-a0-gf-a0 EXT= pnvm diff --git a/sys/modules/iwm/Makefile b/sys/modules/iwm/Makefile --- a/sys/modules/iwm/Makefile +++ b/sys/modules/iwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwm KMOD= if_iwm diff --git a/sys/modules/iwmfw/Makefile b/sys/modules/iwmfw/Makefile --- a/sys/modules/iwmfw/Makefile +++ b/sys/modules/iwmfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwm3160fw \ iwm3168fw \ iwm7260fw \ diff --git a/sys/modules/iwmfw/iwm3160fw/Makefile b/sys/modules/iwmfw/iwm3160fw/Makefile --- a/sys/modules/iwmfw/iwm3160fw/Makefile +++ b/sys/modules/iwmfw/iwm3160fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm3160fw IMG= iwm-3160-17 diff --git a/sys/modules/iwmfw/iwm3168fw/Makefile b/sys/modules/iwmfw/iwm3168fw/Makefile --- a/sys/modules/iwmfw/iwm3168fw/Makefile +++ b/sys/modules/iwmfw/iwm3168fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm3168fw IMG= iwm-3168-22 diff --git a/sys/modules/iwmfw/iwm7260fw/Makefile b/sys/modules/iwmfw/iwm7260fw/Makefile --- a/sys/modules/iwmfw/iwm7260fw/Makefile +++ b/sys/modules/iwmfw/iwm7260fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7260fw IMG= iwm-7260-17 diff --git a/sys/modules/iwmfw/iwm7265Dfw/Makefile b/sys/modules/iwmfw/iwm7265Dfw/Makefile --- a/sys/modules/iwmfw/iwm7265Dfw/Makefile +++ b/sys/modules/iwmfw/iwm7265Dfw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7265Dfw IMG= iwm-7265D-22 diff --git a/sys/modules/iwmfw/iwm7265fw/Makefile b/sys/modules/iwmfw/iwm7265fw/Makefile --- a/sys/modules/iwmfw/iwm7265fw/Makefile +++ b/sys/modules/iwmfw/iwm7265fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7265fw IMG= iwm-7265-17 diff --git a/sys/modules/iwmfw/iwm8000Cfw/Makefile b/sys/modules/iwmfw/iwm8000Cfw/Makefile --- a/sys/modules/iwmfw/iwm8000Cfw/Makefile +++ b/sys/modules/iwmfw/iwm8000Cfw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm8000Cfw IMG= iwm-8000C-22 diff --git a/sys/modules/iwmfw/iwm8265fw/Makefile b/sys/modules/iwmfw/iwm8265fw/Makefile --- a/sys/modules/iwmfw/iwm8265fw/Makefile +++ b/sys/modules/iwmfw/iwm8265fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm8265fw IMG= iwm-8265-22 diff --git a/sys/modules/iwmfw/iwm9000fw/Makefile b/sys/modules/iwmfw/iwm9000fw/Makefile --- a/sys/modules/iwmfw/iwm9000fw/Makefile +++ b/sys/modules/iwmfw/iwm9000fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm9000fw IMG= iwm-9000-34 diff --git a/sys/modules/iwmfw/iwm9260fw/Makefile b/sys/modules/iwmfw/iwm9260fw/Makefile --- a/sys/modules/iwmfw/iwm9260fw/Makefile +++ b/sys/modules/iwmfw/iwm9260fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm9260fw IMG= iwm-9260-34 diff --git a/sys/modules/iwn/Makefile b/sys/modules/iwn/Makefile --- a/sys/modules/iwn/Makefile +++ b/sys/modules/iwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwn KMOD = if_iwn diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile --- a/sys/modules/iwnfw/Makefile +++ b/sys/modules/iwnfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwn100 \ iwn105 \ iwn135 \ diff --git a/sys/modules/iwnfw/iwn100/Makefile b/sys/modules/iwnfw/iwn100/Makefile --- a/sys/modules/iwnfw/iwn100/Makefile +++ b/sys/modules/iwnfw/iwn100/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn100fw IMG= iwlwifi-100-39.31.5.1 diff --git a/sys/modules/iwnfw/iwn1000/Makefile b/sys/modules/iwnfw/iwn1000/Makefile --- a/sys/modules/iwnfw/iwn1000/Makefile +++ b/sys/modules/iwnfw/iwn1000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn1000fw IMG= iwlwifi-1000-39.31.5.1 diff --git a/sys/modules/iwnfw/iwn105/Makefile b/sys/modules/iwnfw/iwn105/Makefile --- a/sys/modules/iwnfw/iwn105/Makefile +++ b/sys/modules/iwnfw/iwn105/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn105fw IMG= iwlwifi-105-6-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn135/Makefile b/sys/modules/iwnfw/iwn135/Makefile --- a/sys/modules/iwnfw/iwn135/Makefile +++ b/sys/modules/iwnfw/iwn135/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn135fw IMG= iwlwifi-135-6-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn2000/Makefile b/sys/modules/iwnfw/iwn2000/Makefile --- a/sys/modules/iwnfw/iwn2000/Makefile +++ b/sys/modules/iwnfw/iwn2000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn2000fw IMG= iwlwifi-2000-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn2030/Makefile b/sys/modules/iwnfw/iwn2030/Makefile --- a/sys/modules/iwnfw/iwn2030/Makefile +++ b/sys/modules/iwnfw/iwn2030/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn2030fw IMG= iwnwifi-2030-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn4965/Makefile b/sys/modules/iwnfw/iwn4965/Makefile --- a/sys/modules/iwnfw/iwn4965/Makefile +++ b/sys/modules/iwnfw/iwn4965/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn4965fw IMG= iwlwifi-4965-228.61.2.24 diff --git a/sys/modules/iwnfw/iwn5000/Makefile b/sys/modules/iwnfw/iwn5000/Makefile --- a/sys/modules/iwnfw/iwn5000/Makefile +++ b/sys/modules/iwnfw/iwn5000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn5000fw IMG= iwlwifi-5000-8.83.5.1 diff --git a/sys/modules/iwnfw/iwn5150/Makefile b/sys/modules/iwnfw/iwn5150/Makefile --- a/sys/modules/iwnfw/iwn5150/Makefile +++ b/sys/modules/iwnfw/iwn5150/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn5150fw IMG= iwlwifi-5150-8.24.2.2 diff --git a/sys/modules/iwnfw/iwn6000/Makefile b/sys/modules/iwnfw/iwn6000/Makefile --- a/sys/modules/iwnfw/iwn6000/Makefile +++ b/sys/modules/iwnfw/iwn6000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000fw IMG= iwlwifi-6000-9.221.4.1 diff --git a/sys/modules/iwnfw/iwn6000g2a/Makefile b/sys/modules/iwnfw/iwn6000g2a/Makefile --- a/sys/modules/iwnfw/iwn6000g2a/Makefile +++ b/sys/modules/iwnfw/iwn6000g2a/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000g2afw IMG= iwlwifi-6000g2a-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn6000g2b/Makefile b/sys/modules/iwnfw/iwn6000g2b/Makefile --- a/sys/modules/iwnfw/iwn6000g2b/Makefile +++ b/sys/modules/iwnfw/iwn6000g2b/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000g2bfw IMG= iwlwifi-6000g2b-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn6050/Makefile b/sys/modules/iwnfw/iwn6050/Makefile --- a/sys/modules/iwnfw/iwn6050/Makefile +++ b/sys/modules/iwnfw/iwn6050/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6050fw IMG= iwlwifi-6050-41.28.5.1 diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile --- a/sys/modules/ix/Makefile +++ b/sys/modules/ix/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ix diff --git a/sys/modules/ixl/Makefile b/sys/modules/ixl/Makefile --- a/sys/modules/ixl/Makefile +++ b/sys/modules/ixl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixl KMOD = if_ixl diff --git a/sys/modules/ixv/Makefile b/sys/modules/ixv/Makefile --- a/sys/modules/ixv/Makefile +++ b/sys/modules/ixv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ixv diff --git a/sys/modules/jme/Makefile b/sys/modules/jme/Makefile --- a/sys/modules/jme/Makefile +++ b/sys/modules/jme/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/jme KMOD= if_jme diff --git a/sys/modules/kgssapi/Makefile b/sys/modules/kgssapi/Makefile --- a/sys/modules/kgssapi/Makefile +++ b/sys/modules/kgssapi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kgssapi ${SRCTOP}/sys/rpc/rpcsec_gss KMOD= kgssapi diff --git a/sys/modules/kgssapi_krb5/Makefile b/sys/modules/kgssapi_krb5/Makefile --- a/sys/modules/kgssapi_krb5/Makefile +++ b/sys/modules/kgssapi_krb5/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kgssapi/krb5 KMOD= kgssapi_krb5 diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile --- a/sys/modules/khelp/Makefile +++ b/sys/modules/khelp/Makefile @@ -1,4 +1,3 @@ - SUBDIR= # Do we have the TCP_HHOOK symbol defined? If not, there is no point in diff --git a/sys/modules/khelp/h_ertt/Makefile b/sys/modules/khelp/h_ertt/Makefile --- a/sys/modules/khelp/h_ertt/Makefile +++ b/sys/modules/khelp/h_ertt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/khelp KMOD= h_ertt SRCS= h_ertt.c opt_kern_tls.h diff --git a/sys/modules/krpc/Makefile b/sys/modules/krpc/Makefile --- a/sys/modules/krpc/Makefile +++ b/sys/modules/krpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/rpc ${SRCTOP}/sys/rpc/rpcsec_tls KMOD= krpc SRCS= auth_none.c \ diff --git a/sys/modules/ksyms/Makefile b/sys/modules/ksyms/Makefile --- a/sys/modules/ksyms/Makefile +++ b/sys/modules/ksyms/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ksyms KMOD= ksyms diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile --- a/sys/modules/ktest/ktest/Makefile +++ b/sys/modules/ktest/ktest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile --- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile +++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile --- a/sys/modules/le/Makefile +++ b/sys/modules/le/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/le KMOD= if_le diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile --- a/sys/modules/lge/Makefile +++ b/sys/modules/lge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/lge KMOD= if_lge diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile --- a/sys/modules/libalias/Makefile +++ b/sys/modules/libalias/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libalias modules .include diff --git a/sys/modules/libalias/libalias/Makefile b/sys/modules/libalias/libalias/Makefile --- a/sys/modules/libalias/libalias/Makefile +++ b/sys/modules/libalias/libalias/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias KMOD= libalias diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile --- a/sys/modules/libalias/modules/Makefile +++ b/sys/modules/libalias/modules/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/modules.inc" SUBDIR= ${MODULES} diff --git a/sys/modules/libalias/modules/Makefile.inc b/sys/modules/libalias/modules/Makefile.inc --- a/sys/modules/libalias/modules/Makefile.inc +++ b/sys/modules/libalias/modules/Makefile.inc @@ -1,2 +1 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias diff --git a/sys/modules/libalias/modules/dummy/Makefile b/sys/modules/libalias/modules/dummy/Makefile --- a/sys/modules/libalias/modules/dummy/Makefile +++ b/sys/modules/libalias/modules/dummy/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_dummy SRCS= alias_dummy.c diff --git a/sys/modules/libalias/modules/ftp/Makefile b/sys/modules/libalias/modules/ftp/Makefile --- a/sys/modules/libalias/modules/ftp/Makefile +++ b/sys/modules/libalias/modules/ftp/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_ftp SRCS= alias_ftp.c diff --git a/sys/modules/libalias/modules/irc/Makefile b/sys/modules/libalias/modules/irc/Makefile --- a/sys/modules/libalias/modules/irc/Makefile +++ b/sys/modules/libalias/modules/irc/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_irc SRCS= alias_irc.c diff --git a/sys/modules/libalias/modules/modules.inc b/sys/modules/libalias/modules/modules.inc --- a/sys/modules/libalias/modules/modules.inc +++ b/sys/modules/libalias/modules/modules.inc @@ -1,4 +1,3 @@ - MODULES = MODULES += dummy MODULES += ftp diff --git a/sys/modules/libalias/modules/nbt/Makefile b/sys/modules/libalias/modules/nbt/Makefile --- a/sys/modules/libalias/modules/nbt/Makefile +++ b/sys/modules/libalias/modules/nbt/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_nbt SRCS= alias_nbt.c diff --git a/sys/modules/libalias/modules/pptp/Makefile b/sys/modules/libalias/modules/pptp/Makefile --- a/sys/modules/libalias/modules/pptp/Makefile +++ b/sys/modules/libalias/modules/pptp/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_pptp SRCS= alias_pptp.c diff --git a/sys/modules/libalias/modules/skinny/Makefile b/sys/modules/libalias/modules/skinny/Makefile --- a/sys/modules/libalias/modules/skinny/Makefile +++ b/sys/modules/libalias/modules/skinny/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_skinny SRCS= alias_skinny.c diff --git a/sys/modules/libalias/modules/smedia/Makefile b/sys/modules/libalias/modules/smedia/Makefile --- a/sys/modules/libalias/modules/smedia/Makefile +++ b/sys/modules/libalias/modules/smedia/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_smedia SRCS= alias_smedia.c diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile --- a/sys/modules/libiconv/Makefile +++ b/sys/modules/libiconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/libkern ${SRCTOP}/sys/sys KMOD= libiconv diff --git a/sys/modules/libmchain/Makefile b/sys/modules/libmchain/Makefile --- a/sys/modules/libmchain/Makefile +++ b/sys/modules/libmchain/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= libmchain diff --git a/sys/modules/lindebugfs/Makefile b/sys/modules/lindebugfs/Makefile --- a/sys/modules/lindebugfs/Makefile +++ b/sys/modules/lindebugfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/lindebugfs KMOD= lindebugfs diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linprocfs KMOD= linprocfs diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linsysfs KMOD= linsysfs diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -1,4 +1,3 @@ - .if ${MACHINE_CPUARCH} == "amd64" SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE}/linux .if ${MACHINE_CPUARCH} == "amd64" .PATH: ${SRCTOP}/sys/x86/linux diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linux .if ${MACHINE_CPUARCH} == "amd64" .PATH: ${SRCTOP}/sys/x86/linux diff --git a/sys/modules/lio/Makefile b/sys/modules/lio/Makefile --- a/sys/modules/lio/Makefile +++ b/sys/modules/lio/Makefile @@ -1,4 +1,3 @@ - #.PATH: ${.CURDIR} .PATH: ${.CURDIR}/../../dev/liquidio .PATH: ${.CURDIR}/../../dev/liquidio/base diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile --- a/sys/modules/lpt/Makefile +++ b/sys/modules/lpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= lpt SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/mac_biba/Makefile b/sys/modules/mac_biba/Makefile --- a/sys/modules/mac_biba/Makefile +++ b/sys/modules/mac_biba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_biba KMOD= mac_biba diff --git a/sys/modules/mac_bsdextended/Makefile b/sys/modules/mac_bsdextended/Makefile --- a/sys/modules/mac_bsdextended/Makefile +++ b/sys/modules/mac_bsdextended/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_bsdextended KMOD= mac_bsdextended diff --git a/sys/modules/mac_ifoff/Makefile b/sys/modules/mac_ifoff/Makefile --- a/sys/modules/mac_ifoff/Makefile +++ b/sys/modules/mac_ifoff/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ifoff KMOD= mac_ifoff diff --git a/sys/modules/mac_ipacl/Makefile b/sys/modules/mac_ipacl/Makefile --- a/sys/modules/mac_ipacl/Makefile +++ b/sys/modules/mac_ipacl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ipacl KMOD= mac_ipacl diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile --- a/sys/modules/mac_lomac/Makefile +++ b/sys/modules/mac_lomac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_lomac KMOD= mac_lomac diff --git a/sys/modules/mac_mls/Makefile b/sys/modules/mac_mls/Makefile --- a/sys/modules/mac_mls/Makefile +++ b/sys/modules/mac_mls/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_mls KMOD= mac_mls diff --git a/sys/modules/mac_none/Makefile b/sys/modules/mac_none/Makefile --- a/sys/modules/mac_none/Makefile +++ b/sys/modules/mac_none/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_none KMOD= mac_none diff --git a/sys/modules/mac_ntpd/Makefile b/sys/modules/mac_ntpd/Makefile --- a/sys/modules/mac_ntpd/Makefile +++ b/sys/modules/mac_ntpd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ntpd KMOD= mac_ntpd diff --git a/sys/modules/mac_partition/Makefile b/sys/modules/mac_partition/Makefile --- a/sys/modules/mac_partition/Makefile +++ b/sys/modules/mac_partition/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_partition KMOD= mac_partition diff --git a/sys/modules/mac_pimd/Makefile b/sys/modules/mac_pimd/Makefile --- a/sys/modules/mac_pimd/Makefile +++ b/sys/modules/mac_pimd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_pimd KMOD= mac_pimd diff --git a/sys/modules/mac_portacl/Makefile b/sys/modules/mac_portacl/Makefile --- a/sys/modules/mac_portacl/Makefile +++ b/sys/modules/mac_portacl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_portacl KMOD= mac_portacl diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile --- a/sys/modules/mac_seeotheruids/Makefile +++ b/sys/modules/mac_seeotheruids/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_seeotheruids KMOD= mac_seeotheruids diff --git a/sys/modules/mac_stub/Makefile b/sys/modules/mac_stub/Makefile --- a/sys/modules/mac_stub/Makefile +++ b/sys/modules/mac_stub/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_stub KMOD= mac_stub diff --git a/sys/modules/mac_test/Makefile b/sys/modules/mac_test/Makefile --- a/sys/modules/mac_test/Makefile +++ b/sys/modules/mac_test/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_test KMOD= mac_test diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/security/mac_veriexec KMOD = mac_veriexec diff --git a/sys/modules/mac_veriexec_sha1/Makefile b/sys/modules/mac_veriexec_sha1/Makefile --- a/sys/modules/mac_veriexec_sha1/Makefile +++ b/sys/modules/mac_veriexec_sha1/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/security/mac_veriexec .PATH: ${.PARSEDIR:H:H}/crypto diff --git a/sys/modules/mac_veriexec_sha256/Makefile b/sys/modules/mac_veriexec_sha256/Makefile --- a/sys/modules/mac_veriexec_sha256/Makefile +++ b/sys/modules/mac_veriexec_sha256/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/mac_veriexec_sha384/Makefile b/sys/modules/mac_veriexec_sha384/Makefile --- a/sys/modules/mac_veriexec_sha384/Makefile +++ b/sys/modules/mac_veriexec_sha384/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/mac_veriexec_sha512/Makefile b/sys/modules/mac_veriexec_sha512/Makefile --- a/sys/modules/mac_veriexec_sha512/Makefile +++ b/sys/modules/mac_veriexec_sha512/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/malo/Makefile b/sys/modules/malo/Makefile --- a/sys/modules/malo/Makefile +++ b/sys/modules/malo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/malo KMOD = if_malo diff --git a/sys/modules/mana/Makefile b/sys/modules/mana/Makefile --- a/sys/modules/mana/Makefile +++ b/sys/modules/mana/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mana KMOD = if_mana diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/md KMOD= geom_md diff --git a/sys/modules/mdio/Makefile b/sys/modules/mdio/Makefile --- a/sys/modules/mdio/Makefile +++ b/sys/modules/mdio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mdio KMOD= mdio diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile --- a/sys/modules/mem/Makefile +++ b/sys/modules/mem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mem .PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} .PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile --- a/sys/modules/mfi/Makefile +++ b/sys/modules/mfi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi SUBDIR= mfip diff --git a/sys/modules/mfi/mfi_linux/Makefile b/sys/modules/mfi/mfi_linux/Makefile --- a/sys/modules/mfi/mfi_linux/Makefile +++ b/sys/modules/mfi/mfi_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfi_linux diff --git a/sys/modules/mfi/mfip/Makefile b/sys/modules/mfi/mfip/Makefile --- a/sys/modules/mfi/mfip/Makefile +++ b/sys/modules/mfi/mfip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfip diff --git a/sys/modules/mgb/Makefile b/sys/modules/mgb/Makefile --- a/sys/modules/mgb/Makefile +++ b/sys/modules/mgb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mgb KMOD = if_mgb diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mii KMOD= miibus diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile --- a/sys/modules/mlx/Makefile +++ b/sys/modules/mlx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mlx KMOD= mlx diff --git a/sys/modules/mmc/Makefile b/sys/modules/mmc/Makefile --- a/sys/modules/mmc/Makefile +++ b/sys/modules/mmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmc diff --git a/sys/modules/mmcnull/Makefile b/sys/modules/mmcnull/Makefile --- a/sys/modules/mmcnull/Makefile +++ b/sys/modules/mmcnull/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/mmcnull KMOD= mmcnull diff --git a/sys/modules/mmcsd/Makefile b/sys/modules/mmcsd/Makefile --- a/sys/modules/mmcsd/Makefile +++ b/sys/modules/mmcsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmcsd diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile --- a/sys/modules/mpi3mr/Makefile +++ b/sys/modules/mpi3mr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpi3mr KMOD= mpi3mr diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile --- a/sys/modules/mpr/Makefile +++ b/sys/modules/mpr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpr KMOD= mpr diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile --- a/sys/modules/mps/Makefile +++ b/sys/modules/mps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mps KMOD= mps diff --git a/sys/modules/mpt/Makefile b/sys/modules/mpt/Makefile --- a/sys/modules/mpt/Makefile +++ b/sys/modules/mpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpt KMOD= mpt diff --git a/sys/modules/mqueue/Makefile b/sys/modules/mqueue/Makefile --- a/sys/modules/mqueue/Makefile +++ b/sys/modules/mqueue/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= mqueuefs diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile --- a/sys/modules/msdosfs/Makefile +++ b/sys/modules/msdosfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile --- a/sys/modules/msdosfs_iconv/Makefile +++ b/sys/modules/msdosfs_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs_iconv SRCS= msdosfs_iconv.c diff --git a/sys/modules/msk/Makefile b/sys/modules/msk/Makefile --- a/sys/modules/msk/Makefile +++ b/sys/modules/msk/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/msk KMOD= if_msk diff --git a/sys/modules/mt76/Makefile b/sys/modules/mt76/Makefile --- a/sys/modules/mt76/Makefile +++ b/sys/modules/mt76/Makefile @@ -1,4 +1,3 @@ - SUBDIR= core SUBDIR+= mt7915 SUBDIR+= mt7921 diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -1,4 +1,3 @@ - # Common information shared by all submodule builds. COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,4 +1,3 @@ - KMOD= mt76_core # Basic stuff. diff --git a/sys/modules/mt76/mt7915/Makefile b/sys/modules/mt76/mt7915/Makefile --- a/sys/modules/mt76/mt7915/Makefile +++ b/sys/modules/mt76/mt7915/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7915 .PATH: ${DEVDIR} diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7921 .PATH: ${DEVDIR} diff --git a/sys/modules/mvs/Makefile b/sys/modules/mvs/Makefile --- a/sys/modules/mvs/Makefile +++ b/sys/modules/mvs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mvs KMOD= mvs diff --git a/sys/modules/mwlfw/Makefile b/sys/modules/mwlfw/Makefile --- a/sys/modules/mwlfw/Makefile +++ b/sys/modules/mwlfw/Makefile @@ -1,4 +1,3 @@ - KMOD= mw88W8363fw FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot diff --git a/sys/modules/mxge/Makefile b/sys/modules/mxge/Makefile --- a/sys/modules/mxge/Makefile +++ b/sys/modules/mxge/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mxge SUBDIR+=mxge_eth_z8e SUBDIR+=mxge_ethp_z8e diff --git a/sys/modules/mxge/mxge/Makefile b/sys/modules/mxge/mxge/Makefile --- a/sys/modules/mxge/mxge/Makefile +++ b/sys/modules/mxge/mxge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= if_mxge diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile --- a/sys/modules/mxge/mxge_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_eth_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_eth_z8e SRCS= mxge_eth_z8e.c diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile --- a/sys/modules/mxge/mxge_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_ethp_z8e SRCS= mxge_ethp_z8e.c diff --git a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile --- a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_eth_z8e SRCS= mxge_rss_eth_z8e.c diff --git a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile --- a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_ethp_z8e SRCS= mxge_rss_ethp_z8e.c diff --git a/sys/modules/my/Makefile b/sys/modules/my/Makefile --- a/sys/modules/my/Makefile +++ b/sys/modules/my/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/my KMOD= if_my diff --git a/sys/modules/nctgpio/Makefile b/sys/modules/nctgpio/Makefile --- a/sys/modules/nctgpio/Makefile +++ b/sys/modules/nctgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nctgpio KMOD= nctgpio SRCS= nctgpio.c diff --git a/sys/modules/ncthwm/Makefile b/sys/modules/ncthwm/Makefile --- a/sys/modules/ncthwm/Makefile +++ b/sys/modules/ncthwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ncthwm KMOD= ncthwm SRCS= ncthwm.c diff --git a/sys/modules/neta/Makefile b/sys/modules/neta/Makefile --- a/sys/modules/neta/Makefile +++ b/sys/modules/neta/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/neta CFLAGS+= -DFDT diff --git a/sys/modules/netgraph/bluetooth/Makefile.inc b/sys/modules/netgraph/bluetooth/Makefile.inc --- a/sys/modules/netgraph/bluetooth/Makefile.inc +++ b/sys/modules/netgraph/bluetooth/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile --- a/sys/modules/netgraph/bridge/Makefile +++ b/sys/modules/netgraph/bridge/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_bridge SRCS= ng_bridge.c diff --git a/sys/modules/netgraph/car/Makefile b/sys/modules/netgraph/car/Makefile --- a/sys/modules/netgraph/car/Makefile +++ b/sys/modules/netgraph/car/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_car SRCS= ng_car.c diff --git a/sys/modules/netgraph/checksum/Makefile b/sys/modules/netgraph/checksum/Makefile --- a/sys/modules/netgraph/checksum/Makefile +++ b/sys/modules/netgraph/checksum/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/netgraph/deflate/Makefile b/sys/modules/netgraph/deflate/Makefile --- a/sys/modules/netgraph/deflate/Makefile +++ b/sys/modules/netgraph/deflate/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_deflate SRCS= ng_deflate.c diff --git a/sys/modules/netgraph/eiface/Makefile b/sys/modules/netgraph/eiface/Makefile --- a/sys/modules/netgraph/eiface/Makefile +++ b/sys/modules/netgraph/eiface/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_eiface SRCS= ng_eiface.c diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile --- a/sys/modules/netgraph/ether/Makefile +++ b/sys/modules/netgraph/ether/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ether SRCS= ng_ether.c diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile --- a/sys/modules/netgraph/gif/Makefile +++ b/sys/modules/netgraph/gif/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_gif SRCS= ng_gif.c opt_inet.h opt_inet6.h diff --git a/sys/modules/netgraph/gif_demux/Makefile b/sys/modules/netgraph/gif_demux/Makefile --- a/sys/modules/netgraph/gif_demux/Makefile +++ b/sys/modules/netgraph/gif_demux/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_gif_demux SRCS= ng_gif_demux.c diff --git a/sys/modules/netgraph/hub/Makefile b/sys/modules/netgraph/hub/Makefile --- a/sys/modules/netgraph/hub/Makefile +++ b/sys/modules/netgraph/hub/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_hub SRCS= ng_hub.c diff --git a/sys/modules/netgraph/ip_input/Makefile b/sys/modules/netgraph/ip_input/Makefile --- a/sys/modules/netgraph/ip_input/Makefile +++ b/sys/modules/netgraph/ip_input/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ip_input SRCS= ng_ip_input.c diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile --- a/sys/modules/netgraph/ipfw/Makefile +++ b/sys/modules/netgraph/ipfw/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ipfw SRCS= ng_ipfw.c opt_inet.h opt_inet6.h diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile --- a/sys/modules/netgraph/ksocket/Makefile +++ b/sys/modules/netgraph/ksocket/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ksocket SRCS= ng_ksocket.c diff --git a/sys/modules/netgraph/l2tp/Makefile b/sys/modules/netgraph/l2tp/Makefile --- a/sys/modules/netgraph/l2tp/Makefile +++ b/sys/modules/netgraph/l2tp/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_l2tp SRCS= ng_l2tp.c diff --git a/sys/modules/netgraph/macfilter/Makefile b/sys/modules/netgraph/macfilter/Makefile --- a/sys/modules/netgraph/macfilter/Makefile +++ b/sys/modules/netgraph/macfilter/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_macfilter SRCS= ng_macfilter.c diff --git a/sys/modules/netgraph/nat/Makefile b/sys/modules/netgraph/nat/Makefile --- a/sys/modules/netgraph/nat/Makefile +++ b/sys/modules/netgraph/nat/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_nat SRCS= ng_nat.c diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile --- a/sys/modules/netgraph/one2many/Makefile +++ b/sys/modules/netgraph/one2many/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_one2many SRCS= ng_one2many.c diff --git a/sys/modules/netgraph/patch/Makefile b/sys/modules/netgraph/patch/Makefile --- a/sys/modules/netgraph/patch/Makefile +++ b/sys/modules/netgraph/patch/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_patch SRCS= ng_patch.c diff --git a/sys/modules/netgraph/pipe/Makefile b/sys/modules/netgraph/pipe/Makefile --- a/sys/modules/netgraph/pipe/Makefile +++ b/sys/modules/netgraph/pipe/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_pipe SRCS= ng_pipe.c diff --git a/sys/modules/netgraph/pred1/Makefile b/sys/modules/netgraph/pred1/Makefile --- a/sys/modules/netgraph/pred1/Makefile +++ b/sys/modules/netgraph/pred1/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_pred1 SRCS= ng_pred1.c diff --git a/sys/modules/netgraph/sample/Makefile b/sys/modules/netgraph/sample/Makefile --- a/sys/modules/netgraph/sample/Makefile +++ b/sys/modules/netgraph/sample/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_sample SRCS= ng_sample.c diff --git a/sys/modules/netgraph/source/Makefile b/sys/modules/netgraph/source/Makefile --- a/sys/modules/netgraph/source/Makefile +++ b/sys/modules/netgraph/source/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_source SRCS= ng_source.c # 4.x only diff --git a/sys/modules/netgraph/tag/Makefile b/sys/modules/netgraph/tag/Makefile --- a/sys/modules/netgraph/tag/Makefile +++ b/sys/modules/netgraph/tag/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_tag SRCS= ng_tag.c diff --git a/sys/modules/netgraph/tcpmss/Makefile b/sys/modules/netgraph/tcpmss/Makefile --- a/sys/modules/netgraph/tcpmss/Makefile +++ b/sys/modules/netgraph/tcpmss/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_tcpmss SRCS= ng_tcpmss.c diff --git a/sys/modules/netgraph/vlan/Makefile b/sys/modules/netgraph/vlan/Makefile --- a/sys/modules/netgraph/vlan/Makefile +++ b/sys/modules/netgraph/vlan/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_vlan SRCS= ng_vlan.c diff --git a/sys/modules/netgraph/vlan_rotate/Makefile b/sys/modules/netgraph/vlan_rotate/Makefile --- a/sys/modules/netgraph/vlan_rotate/Makefile +++ b/sys/modules/netgraph/vlan_rotate/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_vlan_rotate SRCS= ng_vlan_rotate.c diff --git a/sys/modules/nfe/Makefile b/sys/modules/nfe/Makefile --- a/sys/modules/nfe/Makefile +++ b/sys/modules/nfe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nfe KMOD= if_nfe diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile --- a/sys/modules/nfscl/Makefile +++ b/sys/modules/nfscl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfsclient ${SRCTOP}/sys/nfs KMOD= nfscl SRCS= vnode_if.h \ diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile --- a/sys/modules/nfscommon/Makefile +++ b/sys/modules/nfscommon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfs KMOD= nfscommon SRCS= vnode_if.h \ diff --git a/sys/modules/nfsd/Makefile b/sys/modules/nfsd/Makefile --- a/sys/modules/nfsd/Makefile +++ b/sys/modules/nfsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfsserver KMOD= nfsd SRCS= vnode_if.h \ diff --git a/sys/modules/nfslockd/Makefile b/sys/modules/nfslockd/Makefile --- a/sys/modules/nfslockd/Makefile +++ b/sys/modules/nfslockd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/nlm ${SRCTOP}/sys/rpc KMOD= nfslockd SRCS= vnode_if.h \ diff --git a/sys/modules/nfssvc/Makefile b/sys/modules/nfssvc/Makefile --- a/sys/modules/nfssvc/Makefile +++ b/sys/modules/nfssvc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/nfs KMOD= nfssvc SRCS= nfs_nfssvc.c \ diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile --- a/sys/modules/nge/Makefile +++ b/sys/modules/nge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nge KMOD= if_nge diff --git a/sys/modules/nlsysevent/Makefile b/sys/modules/nlsysevent/Makefile --- a/sys/modules/nlsysevent/Makefile +++ b/sys/modules/nlsysevent/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netlink/ KMOD= nlsysevent diff --git a/sys/modules/nmdm/Makefile b/sys/modules/nmdm/Makefile --- a/sys/modules/nmdm/Makefile +++ b/sys/modules/nmdm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nmdm KMOD= nmdm diff --git a/sys/modules/ntb/Makefile b/sys/modules/ntb/Makefile --- a/sys/modules/ntb/Makefile +++ b/sys/modules/ntb/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ntb ntb_hw_amd ntb_hw_intel ntb_hw_plx ntb_transport ntb_tool if_ntb .include diff --git a/sys/modules/ntb/if_ntb/Makefile b/sys/modules/ntb/if_ntb/Makefile --- a/sys/modules/ntb/if_ntb/Makefile +++ b/sys/modules/ntb/if_ntb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/if_ntb KMOD = if_ntb diff --git a/sys/modules/ntb/ntb/Makefile b/sys/modules/ntb/ntb/Makefile --- a/sys/modules/ntb/ntb/Makefile +++ b/sys/modules/ntb/ntb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb diff --git a/sys/modules/ntb/ntb_hw_amd/Makefile b/sys/modules/ntb/ntb_hw_amd/Makefile --- a/sys/modules/ntb/ntb_hw_amd/Makefile +++ b/sys/modules/ntb/ntb_hw_amd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_amd diff --git a/sys/modules/ntb/ntb_hw_intel/Makefile b/sys/modules/ntb/ntb_hw_intel/Makefile --- a/sys/modules/ntb/ntb_hw_intel/Makefile +++ b/sys/modules/ntb/ntb_hw_intel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_intel diff --git a/sys/modules/ntb/ntb_hw_plx/Makefile b/sys/modules/ntb/ntb_hw_plx/Makefile --- a/sys/modules/ntb/ntb_hw_plx/Makefile +++ b/sys/modules/ntb/ntb_hw_plx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_plx diff --git a/sys/modules/ntb/ntb_tool/Makefile b/sys/modules/ntb/ntb_tool/Makefile --- a/sys/modules/ntb/ntb_tool/Makefile +++ b/sys/modules/ntb/ntb_tool/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/test KMOD = ntb_tool diff --git a/sys/modules/ntb/ntb_transport/Makefile b/sys/modules/ntb/ntb_transport/Makefile --- a/sys/modules/ntb/ntb_transport/Makefile +++ b/sys/modules/ntb/ntb_transport/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb_transport diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile --- a/sys/modules/nullfs/Makefile +++ b/sys/modules/nullfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nullfs KMOD= nullfs diff --git a/sys/modules/nvd/Makefile b/sys/modules/nvd/Makefile --- a/sys/modules/nvd/Makefile +++ b/sys/modules/nvd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvd KMOD= nvd diff --git a/sys/modules/nvdimm/Makefile b/sys/modules/nvdimm/Makefile --- a/sys/modules/nvdimm/Makefile +++ b/sys/modules/nvdimm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvdimm KMOD= nvdimm diff --git a/sys/modules/nvme/Makefile b/sys/modules/nvme/Makefile --- a/sys/modules/nvme/Makefile +++ b/sys/modules/nvme/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvme KMOD = nvme diff --git a/sys/modules/nvram/Makefile b/sys/modules/nvram/Makefile --- a/sys/modules/nvram/Makefile +++ b/sys/modules/nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvram KMOD= nvram diff --git a/sys/modules/ocs_fc/Makefile b/sys/modules/ocs_fc/Makefile --- a/sys/modules/ocs_fc/Makefile +++ b/sys/modules/ocs_fc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ocs_fc KMOD = ocs_fc diff --git a/sys/modules/opal_nvram/Makefile b/sys/modules/opal_nvram/Makefile --- a/sys/modules/opal_nvram/Makefile +++ b/sys/modules/opal_nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/powerpc/powernv KMOD= opal_nvram diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/compat/opensolaris/kern diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/openssl .PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH} diff --git a/sys/modules/otus/Makefile b/sys/modules/otus/Makefile --- a/sys/modules/otus/Makefile +++ b/sys/modules/otus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/otus KMOD = if_otus diff --git a/sys/modules/otusfw/Makefile b/sys/modules/otusfw/Makefile --- a/sys/modules/otusfw/Makefile +++ b/sys/modules/otusfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR=otusfw_init otusfw_main .include diff --git a/sys/modules/otusfw/otusfw_init/Makefile b/sys/modules/otusfw/otusfw_init/Makefile --- a/sys/modules/otusfw/otusfw_init/Makefile +++ b/sys/modules/otusfw/otusfw_init/Makefile @@ -1,4 +1,3 @@ - KMOD= otusfw_init FIRMWS= otusfw_init:otusfw_init:1 diff --git a/sys/modules/otusfw/otusfw_main/Makefile b/sys/modules/otusfw/otusfw_main/Makefile --- a/sys/modules/otusfw/otusfw_main/Makefile +++ b/sys/modules/otusfw/otusfw_main/Makefile @@ -1,4 +1,3 @@ - KMOD= otusfw_main FIRMWS= otusfw_main:otusfw_main:1 diff --git a/sys/modules/ow/Makefile b/sys/modules/ow/Makefile --- a/sys/modules/ow/Makefile +++ b/sys/modules/ow/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/ow/ow/Makefile b/sys/modules/ow/ow/Makefile --- a/sys/modules/ow/ow/Makefile +++ b/sys/modules/ow/ow/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= ow diff --git a/sys/modules/ow/ow_temp/Makefile b/sys/modules/ow/ow_temp/Makefile --- a/sys/modules/ow/ow_temp/Makefile +++ b/sys/modules/ow/ow_temp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= ow_temp diff --git a/sys/modules/ow/owc/Makefile b/sys/modules/ow/owc/Makefile --- a/sys/modules/ow/owc/Makefile +++ b/sys/modules/ow/owc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= owc diff --git a/sys/modules/padlock/Makefile b/sys/modules/padlock/Makefile --- a/sys/modules/padlock/Makefile +++ b/sys/modules/padlock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/via KMOD= padlock diff --git a/sys/modules/padlock_rng/Makefile b/sys/modules/padlock_rng/Makefile --- a/sys/modules/padlock_rng/Makefile +++ b/sys/modules/padlock_rng/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD= padlock_rng diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile --- a/sys/modules/pcfclock/Makefile +++ b/sys/modules/pcfclock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pcfclock diff --git a/sys/modules/pchtherm/Makefile b/sys/modules/pchtherm/Makefile --- a/sys/modules/pchtherm/Makefile +++ b/sys/modules/pchtherm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intel KMOD= pchtherm SRCS= pchtherm.c diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pf diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pflog diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile --- a/sys/modules/pfsync/Makefile +++ b/sys/modules/pfsync/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pfsync diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile --- a/sys/modules/plip/Makefile +++ b/sys/modules/plip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= plip SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/pms/Makefile.inc b/sys/modules/pms/Makefile.inc --- a/sys/modules/pms/Makefile.inc +++ b/sys/modules/pms/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/powermac_nvram/Makefile b/sys/modules/powermac_nvram/Makefile --- a/sys/modules/powermac_nvram/Makefile +++ b/sys/modules/powermac_nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/powermac_nvram KMOD= powermac_nvram diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile --- a/sys/modules/ppbus/Makefile +++ b/sys/modules/ppbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppbus SRCS= bus_if.h device_if.h ppbus_if.h ppbus_if.c \ diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile --- a/sys/modules/ppc/Makefile +++ b/sys/modules/ppc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppc KMOD= ppc SRCS= bus_if.h device_if.h ppbus_if.h isa_if.h pci_if.h serdev_if.h \ diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile --- a/sys/modules/ppi/Makefile +++ b/sys/modules/ppi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppi SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile --- a/sys/modules/pps/Makefile +++ b/sys/modules/pps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pps SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile --- a/sys/modules/procfs/Makefile +++ b/sys/modules/procfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/procfs KMOD= procfs diff --git a/sys/modules/proto/Makefile b/sys/modules/proto/Makefile --- a/sys/modules/proto/Makefile +++ b/sys/modules/proto/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/proto KMOD= proto diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile --- a/sys/modules/pseudofs/Makefile +++ b/sys/modules/pseudofs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/pseudofs KMOD= pseudofs diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile --- a/sys/modules/pst/Makefile +++ b/sys/modules/pst/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pst KMOD= pst diff --git a/sys/modules/pty/Makefile b/sys/modules/pty/Makefile --- a/sys/modules/pty/Makefile +++ b/sys/modules/pty/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pty KMOD= pty diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile --- a/sys/modules/puc/Makefile +++ b/sys/modules/puc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/puc KMOD= puc diff --git a/sys/modules/pwm/Makefile b/sys/modules/pwm/Makefile --- a/sys/modules/pwm/Makefile +++ b/sys/modules/pwm/Makefile @@ -1,4 +1,3 @@ - # Modules for dev/pwm drivers. SUBDIR = \ diff --git a/sys/modules/pwm/pwm_backlight/Makefile b/sys/modules/pwm/pwm_backlight/Makefile --- a/sys/modules/pwm/pwm_backlight/Makefile +++ b/sys/modules/pwm/pwm_backlight/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwm_backlight SRCS= pwm_backlight.c diff --git a/sys/modules/pwm/pwmbus/Makefile b/sys/modules/pwm/pwmbus/Makefile --- a/sys/modules/pwm/pwmbus/Makefile +++ b/sys/modules/pwm/pwmbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwmbus diff --git a/sys/modules/pwm/pwmc/Makefile b/sys/modules/pwm/pwmc/Makefile --- a/sys/modules/pwm/pwmc/Makefile +++ b/sys/modules/pwm/pwmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwmc SRCS= pwmc.c diff --git a/sys/modules/qat_c2xxx/Makefile b/sys/modules/qat_c2xxx/Makefile --- a/sys/modules/qat_c2xxx/Makefile +++ b/sys/modules/qat_c2xxx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/qat_c2xxx KMOD= qat_c2xxx diff --git a/sys/modules/qat_c2xxxfw/Makefile b/sys/modules/qat_c2xxxfw/Makefile --- a/sys/modules/qat_c2xxxfw/Makefile +++ b/sys/modules/qat_c2xxxfw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/qat_c2xxx KMOD= qat_c2xxxfw diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile --- a/sys/modules/ral/Makefile +++ b/sys/modules/ral/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ral KMOD= if_ral diff --git a/sys/modules/ralfw/Makefile b/sys/modules/ralfw/Makefile --- a/sys/modules/ralfw/Makefile +++ b/sys/modules/ralfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rt2561 rt2561s rt2661 rt2860 .include diff --git a/sys/modules/ralfw/Makefile.inc b/sys/modules/ralfw/Makefile.inc --- a/sys/modules/ralfw/Makefile.inc +++ b/sys/modules/ralfw/Makefile.inc @@ -1,4 +1,3 @@ - # # Common rules for building firmware. Note this gets auto-included # by the subdir Makefile's as a consequence of included bsd.kmod.mk. diff --git a/sys/modules/ralfw/rt2561/Makefile b/sys/modules/ralfw/rt2561/Makefile --- a/sys/modules/ralfw/rt2561/Makefile +++ b/sys/modules/ralfw/rt2561/Makefile @@ -1,4 +1,3 @@ - IMG= rt2561 .include diff --git a/sys/modules/ralfw/rt2561s/Makefile b/sys/modules/ralfw/rt2561s/Makefile --- a/sys/modules/ralfw/rt2561s/Makefile +++ b/sys/modules/ralfw/rt2561s/Makefile @@ -1,4 +1,3 @@ - IMG= rt2561s .include diff --git a/sys/modules/ralfw/rt2661/Makefile b/sys/modules/ralfw/rt2661/Makefile --- a/sys/modules/ralfw/rt2661/Makefile +++ b/sys/modules/ralfw/rt2661/Makefile @@ -1,4 +1,3 @@ - IMG= rt2661 .include diff --git a/sys/modules/ralfw/rt2860/Makefile b/sys/modules/ralfw/rt2860/Makefile --- a/sys/modules/ralfw/rt2860/Makefile +++ b/sys/modules/ralfw/rt2860/Makefile @@ -1,4 +1,3 @@ - IMG= rt2860 .include diff --git a/sys/modules/random_fortuna/Makefile b/sys/modules/random_fortuna/Makefile --- a/sys/modules/random_fortuna/Makefile +++ b/sys/modules/random_fortuna/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD = random_fortuna diff --git a/sys/modules/random_other/Makefile b/sys/modules/random_other/Makefile --- a/sys/modules/random_other/Makefile +++ b/sys/modules/random_other/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD = random_OTHER diff --git a/sys/modules/rc4/Makefile b/sys/modules/rc4/Makefile --- a/sys/modules/rc4/Makefile +++ b/sys/modules/rc4/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/rc4 KMOD= rc4 diff --git a/sys/modules/rccgpio/Makefile b/sys/modules/rccgpio/Makefile --- a/sys/modules/rccgpio/Makefile +++ b/sys/modules/rccgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rccgpio KMOD= rccgpio SRCS= rccgpio.c diff --git a/sys/modules/rdma/Makefile b/sys/modules/rdma/Makefile --- a/sys/modules/rdma/Makefile +++ b/sys/modules/rdma/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= krping .include diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD= rdrand_rng diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile --- a/sys/modules/re/Makefile +++ b/sys/modules/re/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/re KMOD= if_re diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile --- a/sys/modules/rl/Makefile +++ b/sys/modules/rl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rl KMOD= if_rl diff --git a/sys/modules/rndtest/Makefile b/sys/modules/rndtest/Makefile --- a/sys/modules/rndtest/Makefile +++ b/sys/modules/rndtest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rndtest KMOD = rndtest SRCS = rndtest.c diff --git a/sys/modules/rockchip/rk805/Makefile b/sys/modules/rockchip/rk805/Makefile --- a/sys/modules/rockchip/rk805/Makefile +++ b/sys/modules/rockchip/rk805/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/pmic/rockchip KMOD= rk805 diff --git a/sys/modules/rockchip/rk808/Makefile b/sys/modules/rockchip/rk808/Makefile --- a/sys/modules/rockchip/rk808/Makefile +++ b/sys/modules/rockchip/rk808/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/pmic/rockchip KMOD= rk808 diff --git a/sys/modules/rockchip/rk_dwmmc/Makefile b/sys/modules/rockchip/rk_dwmmc/Makefile --- a/sys/modules/rockchip/rk_dwmmc/Makefile +++ b/sys/modules/rockchip/rk_dwmmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc/host/ KMOD= rk_dwmmc diff --git a/sys/modules/rockchip/rk_i2c/Makefile b/sys/modules/rockchip/rk_i2c/Makefile --- a/sys/modules/rockchip/rk_i2c/Makefile +++ b/sys/modules/rockchip/rk_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm64/rockchip KMOD= rk_i2c diff --git a/sys/modules/rockchip/rk_spi/Makefile b/sys/modules/rockchip/rk_spi/Makefile --- a/sys/modules/rockchip/rk_spi/Makefile +++ b/sys/modules/rockchip/rk_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm64/rockchip KMOD= rk_spi diff --git a/sys/modules/rpi_ft5406/Makefile b/sys/modules/rpi_ft5406/Makefile --- a/sys/modules/rpi_ft5406/Makefile +++ b/sys/modules/rpi_ft5406/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= rpi_ft5406 diff --git a/sys/modules/rtsx/Makefile b/sys/modules/rtsx/Makefile --- a/sys/modules/rtsx/Makefile +++ b/sys/modules/rtsx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtsx KMOD= rtsx diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -1,4 +1,3 @@ - DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} diff --git a/sys/modules/rtw88fw/Makefile b/sys/modules/rtw88fw/Makefile --- a/sys/modules/rtw88fw/Makefile +++ b/sys/modules/rtw88fw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ rtw8723d \ rtw8821c \ diff --git a/sys/modules/rtw88fw/rtw8723d/Makefile b/sys/modules/rtw88fw/rtw8723d/Makefile --- a/sys/modules/rtw88fw/rtw8723d/Makefile +++ b/sys/modules/rtw88fw/rtw8723d/Makefile @@ -1,4 +1,3 @@ - VERSION= 48 NAME= 8723d diff --git a/sys/modules/rtw88fw/rtw8821c/Makefile b/sys/modules/rtw88fw/rtw8821c/Makefile --- a/sys/modules/rtw88fw/rtw8821c/Makefile +++ b/sys/modules/rtw88fw/rtw8821c/Makefile @@ -1,4 +1,3 @@ - VERSION= 2408 NAME= 8821c diff --git a/sys/modules/rtw88fw/rtw8822b/Makefile b/sys/modules/rtw88fw/rtw8822b/Makefile --- a/sys/modules/rtw88fw/rtw8822b/Makefile +++ b/sys/modules/rtw88fw/rtw8822b/Makefile @@ -1,4 +1,3 @@ - VERSION= 0 NAME= 8822b diff --git a/sys/modules/rtw88fw/rtw8822c/Makefile b/sys/modules/rtw88fw/rtw8822c/Makefile --- a/sys/modules/rtw88fw/rtw8822c/Makefile +++ b/sys/modules/rtw88fw/rtw8822c/Makefile @@ -1,4 +1,3 @@ - VERSION= 9910 NAME= 8822c diff --git a/sys/modules/rtw88fw/rtw8822c_wow/Makefile b/sys/modules/rtw88fw/rtw8822c_wow/Makefile --- a/sys/modules/rtw88fw/rtw8822c_wow/Makefile +++ b/sys/modules/rtw88fw/rtw8822c_wow/Makefile @@ -1,4 +1,3 @@ - VERSION= 994 NAME= 8822c_wow diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -1,4 +1,3 @@ - DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR} diff --git a/sys/modules/rtw89fw/Makefile b/sys/modules/rtw89fw/Makefile --- a/sys/modules/rtw89fw/Makefile +++ b/sys/modules/rtw89fw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ rtw8852a \ rtw8852c diff --git a/sys/modules/rtw89fw/rtw8852a/Makefile b/sys/modules/rtw89fw/rtw8852a/Makefile --- a/sys/modules/rtw89fw/rtw8852a/Makefile +++ b/sys/modules/rtw89fw/rtw8852a/Makefile @@ -1,4 +1,3 @@ - VERSION= 013360 NAME= 8852a diff --git a/sys/modules/rtw89fw/rtw8852c/Makefile b/sys/modules/rtw89fw/rtw8852c/Makefile --- a/sys/modules/rtw89fw/rtw8852c/Makefile +++ b/sys/modules/rtw89fw/rtw8852c/Makefile @@ -1,4 +1,3 @@ - VERSION= 027200 NAME= 8852c diff --git a/sys/modules/rtwn/Makefile b/sys/modules/rtwn/Makefile --- a/sys/modules/rtwn/Makefile +++ b/sys/modules/rtwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwn_pci/Makefile b/sys/modules/rtwn_pci/Makefile --- a/sys/modules/rtwn_pci/Makefile +++ b/sys/modules/rtwn_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn/pci SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwn_usb/Makefile b/sys/modules/rtwn_usb/Makefile --- a/sys/modules/rtwn_usb/Makefile +++ b/sys/modules/rtwn_usb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn/usb SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwnfw/Makefile b/sys/modules/rtwnfw/Makefile --- a/sys/modules/rtwnfw/Makefile +++ b/sys/modules/rtwnfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rtwnrtl8188eu rtwnrtl8192cT rtwnrtl8192cU rtwnrtl8192eu rtwnrtl8812au \ rtwnrtl8821au rtwnrtl8192cE rtwnrtl8192cEB rtwnrtl8188ee diff --git a/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile b/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8188eefw IMG= rtwn-rtl8188eefw diff --git a/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile b/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8188eufw IMG= rtwn-rtl8188eufw diff --git a/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwE IMG= rtwn-rtl8192cfwE diff --git a/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwE_B IMG= rtwn-rtl8192cfwE_B diff --git a/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwT IMG= rtwn-rtl8192cfwT diff --git a/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwU IMG= rtwn-rtl8192cfwU diff --git a/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile b/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192eufw IMG= rtwn-rtl8192eufw diff --git a/sys/modules/rtwnfw/rtwnrtl8812au/Makefile b/sys/modules/rtwnfw/rtwnrtl8812au/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8812au/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8812au/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8812aufw IMG= rtwn-rtl8812aufw diff --git a/sys/modules/rtwnfw/rtwnrtl8821au/Makefile b/sys/modules/rtwnfw/rtwnrtl8821au/Makefile --- a/sys/modules/rtwnfw/rtwnrtl8821au/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8821au/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8821aufw IMG= rtwn-rtl8821aufw diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile --- a/sys/modules/s3/Makefile +++ b/sys/modules/s3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= s3 diff --git a/sys/modules/sbni/Makefile b/sys/modules/sbni/Makefile --- a/sys/modules/sbni/Makefile +++ b/sys/modules/sbni/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sbni KMOD= if_sbni diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile --- a/sys/modules/scc/Makefile +++ b/sys/modules/scc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/scc .if ${MACHINE_CPUARCH} == "powerpc" diff --git a/sys/modules/sctp/Makefile b/sys/modules/sctp/Makefile --- a/sys/modules/sctp/Makefile +++ b/sys/modules/sctp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet .PATH: ${SRCTOP}/sys/netinet6 diff --git a/sys/modules/sdhci/Makefile b/sys/modules/sdhci/Makefile --- a/sys/modules/sdhci/Makefile +++ b/sys/modules/sdhci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci diff --git a/sys/modules/sdhci_acpi/Makefile b/sys/modules/sdhci_acpi/Makefile --- a/sys/modules/sdhci_acpi/Makefile +++ b/sys/modules/sdhci_acpi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_acpi diff --git a/sys/modules/sdhci_pci/Makefile b/sys/modules/sdhci_pci/Makefile --- a/sys/modules/sdhci_pci/Makefile +++ b/sys/modules/sdhci_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_pci diff --git a/sys/modules/sdio/Makefile b/sys/modules/sdio/Makefile --- a/sys/modules/sdio/Makefile +++ b/sys/modules/sdio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/sdio KMOD= sdio diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile --- a/sys/modules/sem/Makefile +++ b/sys/modules/sem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sem diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -1,4 +1,3 @@ - KMOD= sfxge SFXGE= ${SRCTOP}/sys/dev/sfxge diff --git a/sys/modules/sge/Makefile b/sys/modules/sge/Makefile --- a/sys/modules/sge/Makefile +++ b/sys/modules/sge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sge KMOD= if_sge diff --git a/sys/modules/sgx/Makefile b/sys/modules/sgx/Makefile --- a/sys/modules/sgx/Makefile +++ b/sys/modules/sgx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/amd64/sgx KMOD= sgx diff --git a/sys/modules/sgx_linux/Makefile b/sys/modules/sgx_linux/Makefile --- a/sys/modules/sgx_linux/Makefile +++ b/sys/modules/sgx_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/amd64/sgx KMOD= sgx_linux diff --git a/sys/modules/siftr/Makefile b/sys/modules/siftr/Makefile --- a/sys/modules/siftr/Makefile +++ b/sys/modules/siftr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= siftr SRCS= siftr.c opt_kern_tls.h diff --git a/sys/modules/siis/Makefile b/sys/modules/siis/Makefile --- a/sys/modules/siis/Makefile +++ b/sys/modules/siis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/siis KMOD= siis diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile --- a/sys/modules/sis/Makefile +++ b/sys/modules/sis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sis KMOD= if_sis diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile --- a/sys/modules/sk/Makefile +++ b/sys/modules/sk/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sk KMOD= if_sk diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ ${SRCTOP}/sys/kern \ diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile --- a/sys/modules/snp/Makefile +++ b/sys/modules/snp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/snp KMOD= snp diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile --- a/sys/modules/sound/Makefile +++ b/sys/modules/sound/Makefile @@ -1,4 +1,3 @@ - SUBDIR = SUBDIR += sound SUBDIR += driver diff --git a/sys/modules/sound/Makefile.inc b/sys/modules/sound/Makefile.inc --- a/sys/modules/sound/Makefile.inc +++ b/sys/modules/sound/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/sound/driver/Makefile.inc b/sys/modules/sound/driver/Makefile.inc --- a/sys/modules/sound/driver/Makefile.inc +++ b/sys/modules/sound/driver/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h .include "../Makefile.inc" diff --git a/sys/modules/sound/driver/ai2s/Makefile b/sys/modules/sound/driver/ai2s/Makefile --- a/sys/modules/sound/driver/ai2s/Makefile +++ b/sys/modules/sound/driver/ai2s/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_ai2s diff --git a/sys/modules/sound/driver/als4000/Makefile b/sys/modules/sound/driver/als4000/Makefile --- a/sys/modules/sound/driver/als4000/Makefile +++ b/sys/modules/sound/driver/als4000/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_als4000 diff --git a/sys/modules/sound/driver/atiixp/Makefile b/sys/modules/sound/driver/atiixp/Makefile --- a/sys/modules/sound/driver/atiixp/Makefile +++ b/sys/modules/sound/driver/atiixp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_atiixp diff --git a/sys/modules/sound/driver/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile --- a/sys/modules/sound/driver/cmi/Makefile +++ b/sys/modules/sound/driver/cmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cmi diff --git a/sys/modules/sound/driver/cs4281/Makefile b/sys/modules/sound/driver/cs4281/Makefile --- a/sys/modules/sound/driver/cs4281/Makefile +++ b/sys/modules/sound/driver/cs4281/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cs4281 diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile --- a/sys/modules/sound/driver/csa/Makefile +++ b/sys/modules/sound/driver/csa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_csa diff --git a/sys/modules/sound/driver/davbus/Makefile b/sys/modules/sound/driver/davbus/Makefile --- a/sys/modules/sound/driver/davbus/Makefile +++ b/sys/modules/sound/driver/davbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_davbus diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile --- a/sys/modules/sound/driver/driver/Makefile +++ b/sys/modules/sound/driver/driver/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_driver diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile --- a/sys/modules/sound/driver/emu10k1/Makefile +++ b/sys/modules/sound/driver/emu10k1/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_emu10k1 diff --git a/sys/modules/sound/driver/envy24/Makefile b/sys/modules/sound/driver/envy24/Makefile --- a/sys/modules/sound/driver/envy24/Makefile +++ b/sys/modules/sound/driver/envy24/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24 diff --git a/sys/modules/sound/driver/envy24ht/Makefile b/sys/modules/sound/driver/envy24ht/Makefile --- a/sys/modules/sound/driver/envy24ht/Makefile +++ b/sys/modules/sound/driver/envy24ht/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24ht diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile --- a/sys/modules/sound/driver/es137x/Makefile +++ b/sys/modules/sound/driver/es137x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_es137x diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile --- a/sys/modules/sound/driver/fm801/Makefile +++ b/sys/modules/sound/driver/fm801/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_fm801 diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile --- a/sys/modules/sound/driver/hda/Makefile +++ b/sys/modules/sound/driver/hda/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci/hda KMOD= snd_hda diff --git a/sys/modules/sound/driver/hdspe/Makefile b/sys/modules/sound/driver/hdspe/Makefile --- a/sys/modules/sound/driver/hdspe/Makefile +++ b/sys/modules/sound/driver/hdspe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_hdspe diff --git a/sys/modules/sound/driver/ich/Makefile b/sys/modules/sound/driver/ich/Makefile --- a/sys/modules/sound/driver/ich/Makefile +++ b/sys/modules/sound/driver/ich/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD = snd_ich SRCS = device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile --- a/sys/modules/sound/driver/maestro3/Makefile +++ b/sys/modules/sound/driver/maestro3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_maestro3 diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile --- a/sys/modules/sound/driver/neomagic/Makefile +++ b/sys/modules/sound/driver/neomagic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_neomagic diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile --- a/sys/modules/sound/driver/solo/Makefile +++ b/sys/modules/sound/driver/solo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_solo diff --git a/sys/modules/sound/driver/spicds/Makefile b/sys/modules/sound/driver/spicds/Makefile --- a/sys/modules/sound/driver/spicds/Makefile +++ b/sys/modules/sound/driver/spicds/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_spicds diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile --- a/sys/modules/sound/driver/t4dwave/Makefile +++ b/sys/modules/sound/driver/t4dwave/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_t4dwave diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile --- a/sys/modules/sound/driver/uaudio/Makefile +++ b/sys/modules/sound/driver/uaudio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/usb KMOD= snd_uaudio diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile --- a/sys/modules/sound/driver/via8233/Makefile +++ b/sys/modules/sound/driver/via8233/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via8233 diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile --- a/sys/modules/sound/driver/via82c686/Makefile +++ b/sys/modules/sound/driver/via82c686/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via82c686 diff --git a/sys/modules/sound/driver/vibes/Makefile b/sys/modules/sound/driver/vibes/Makefile --- a/sys/modules/sound/driver/vibes/Makefile +++ b/sys/modules/sound/driver/vibes/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_vibes diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/sound diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile --- a/sys/modules/speaker/Makefile +++ b/sys/modules/speaker/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/speaker KMOD= speaker diff --git a/sys/modules/spi/Makefile b/sys/modules/spi/Makefile --- a/sys/modules/spi/Makefile +++ b/sys/modules/spi/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ ../spigen \ at45d \ diff --git a/sys/modules/spi/at45d/Makefile b/sys/modules/spi/at45d/Makefile --- a/sys/modules/spi/at45d/Makefile +++ b/sys/modules/spi/at45d/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash KMOD= at45d diff --git a/sys/modules/spi/mx25l/Makefile b/sys/modules/spi/mx25l/Makefile --- a/sys/modules/spi/mx25l/Makefile +++ b/sys/modules/spi/mx25l/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash KMOD= mx25l diff --git a/sys/modules/spi/spibus/Makefile b/sys/modules/spi/spibus/Makefile --- a/sys/modules/spi/spibus/Makefile +++ b/sys/modules/spi/spibus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus KMOD= spibus diff --git a/sys/modules/spigen/Makefile b/sys/modules/spigen/Makefile --- a/sys/modules/spigen/Makefile +++ b/sys/modules/spigen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus KMOD= spigen SRCS= spigen.c diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile --- a/sys/modules/splash/Makefile +++ b/sys/modules/splash/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bmp pcx txt .include diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc --- a/sys/modules/splash/Makefile.inc +++ b/sys/modules/splash/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile --- a/sys/modules/splash/bmp/Makefile +++ b/sys/modules/splash/bmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_bmp diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile --- a/sys/modules/splash/pcx/Makefile +++ b/sys/modules/splash/pcx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_pcx diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile --- a/sys/modules/ste/Makefile +++ b/sys/modules/ste/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ste KMOD= if_ste diff --git a/sys/modules/stge/Makefile b/sys/modules/stge/Makefile --- a/sys/modules/stge/Makefile +++ b/sys/modules/stge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/stge KMOD= if_stge diff --git a/sys/modules/sume/Makefile b/sys/modules/sume/Makefile --- a/sys/modules/sume/Makefile +++ b/sys/modules/sume/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sume KMOD= if_sume diff --git a/sys/modules/superio/Makefile b/sys/modules/superio/Makefile --- a/sys/modules/superio/Makefile +++ b/sys/modules/superio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/superio KMOD= superio diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile --- a/sys/modules/sym/Makefile +++ b/sys/modules/sym/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sym KMOD= sym diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile --- a/sys/modules/syscons/Makefile +++ b/sys/modules/syscons/Makefile @@ -1,4 +1,3 @@ - SUBDIR= beastie \ blank \ daemon \ diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc --- a/sys/modules/syscons/Makefile.inc +++ b/sys/modules/syscons/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/syscons/beastie/Makefile b/sys/modules/syscons/beastie/Makefile --- a/sys/modules/syscons/beastie/Makefile +++ b/sys/modules/syscons/beastie/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= beastie_saver diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile --- a/sys/modules/syscons/blank/Makefile +++ b/sys/modules/syscons/blank/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/blank KMOD= blank_saver diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile --- a/sys/modules/syscons/daemon/Makefile +++ b/sys/modules/syscons/daemon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/daemon KMOD= daemon_saver diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile --- a/sys/modules/syscons/dragon/Makefile +++ b/sys/modules/syscons/dragon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/dragon KMOD= dragon_saver diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile --- a/sys/modules/syscons/fade/Makefile +++ b/sys/modules/syscons/fade/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/fade KMOD= fade_saver diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile --- a/sys/modules/syscons/fire/Makefile +++ b/sys/modules/syscons/fire/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/fire KMOD= fire_saver diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile --- a/sys/modules/syscons/green/Makefile +++ b/sys/modules/syscons/green/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/green KMOD= green_saver diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile --- a/sys/modules/syscons/logo/Makefile +++ b/sys/modules/syscons/logo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= logo_saver diff --git a/sys/modules/syscons/plasma/Makefile b/sys/modules/syscons/plasma/Makefile --- a/sys/modules/syscons/plasma/Makefile +++ b/sys/modules/syscons/plasma/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/plasma KMOD= plasma_saver diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile --- a/sys/modules/syscons/rain/Makefile +++ b/sys/modules/syscons/rain/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/rain KMOD= rain_saver diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile --- a/sys/modules/syscons/snake/Makefile +++ b/sys/modules/syscons/snake/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/snake KMOD= snake_saver diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile --- a/sys/modules/syscons/star/Makefile +++ b/sys/modules/syscons/star/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/star KMOD= star_saver diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile --- a/sys/modules/syscons/warp/Makefile +++ b/sys/modules/syscons/warp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/warp KMOD= warp_saver diff --git a/sys/modules/sysvipc/Makefile b/sys/modules/sysvipc/Makefile --- a/sys/modules/sysvipc/Makefile +++ b/sys/modules/sysvipc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= sysvmsg sysvsem sysvshm .include diff --git a/sys/modules/sysvipc/Makefile.inc b/sys/modules/sysvipc/Makefile.inc --- a/sys/modules/sysvipc/Makefile.inc +++ b/sys/modules/sysvipc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile --- a/sys/modules/sysvipc/sysvmsg/Makefile +++ b/sys/modules/sysvipc/sysvmsg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvmsg diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile --- a/sys/modules/sysvipc/sysvsem/Makefile +++ b/sys/modules/sysvipc/sysvsem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvsem diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile --- a/sys/modules/sysvipc/sysvshm/Makefile +++ b/sys/modules/sysvipc/sysvshm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvshm diff --git a/sys/modules/tarfs/Makefile b/sys/modules/tarfs/Makefile --- a/sys/modules/tarfs/Makefile +++ b/sys/modules/tarfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H:H}/fs/tarfs KMOD= tarfs diff --git a/sys/modules/tcp/tcpmd5/Makefile b/sys/modules/tcp/tcpmd5/Makefile --- a/sys/modules/tcp/tcpmd5/Makefile +++ b/sys/modules/tcp/tcpmd5/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netipsec KMOD= tcpmd5 diff --git a/sys/modules/tests/Makefile b/sys/modules/tests/Makefile --- a/sys/modules/tests/Makefile +++ b/sys/modules/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= framework SUBDIR+= .WAIT SUBDIR+= callout_test diff --git a/sys/modules/tests/fib_lookup/Makefile b/sys/modules/tests/fib_lookup/Makefile --- a/sys/modules/tests/fib_lookup/Makefile +++ b/sys/modules/tests/fib_lookup/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile --- a/sys/modules/tmpfs/Makefile +++ b/sys/modules/tmpfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/tmpfs KMOD= tmpfs diff --git a/sys/modules/toecore/Makefile b/sys/modules/toecore/Makefile --- a/sys/modules/toecore/Makefile +++ b/sys/modules/toecore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= toecore diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile --- a/sys/modules/tpm/Makefile +++ b/sys/modules/tpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tpm KMOD= tpm diff --git a/sys/modules/tsec/Makefile b/sys/modules/tsec/Makefile --- a/sys/modules/tsec/Makefile +++ b/sys/modules/tsec/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/tsec diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/uart .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile --- a/sys/modules/ubser/Makefile +++ b/sys/modules/ubser/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/uchcom/Makefile b/sys/modules/uchcom/Makefile --- a/sys/modules/uchcom/Makefile +++ b/sys/modules/uchcom/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile --- a/sys/modules/ucycom/Makefile +++ b/sys/modules/ucycom/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile --- a/sys/modules/udf/Makefile +++ b/sys/modules/udf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/udf KMOD= udf diff --git a/sys/modules/udf_iconv/Makefile b/sys/modules/udf_iconv/Makefile --- a/sys/modules/udf_iconv/Makefile +++ b/sys/modules/udf_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/udf KMOD= udf_iconv SRCS= udf_iconv.c diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile --- a/sys/modules/ufs/Makefile +++ b/sys/modules/ufs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/ufs/ufs ${SRCTOP}/sys/ufs/ffs KMOD= ufs diff --git a/sys/modules/uinput/Makefile b/sys/modules/uinput/Makefile --- a/sys/modules/uinput/Makefile +++ b/sys/modules/uinput/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/evdev KMOD= uinput diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile --- a/sys/modules/unionfs/Makefile +++ b/sys/modules/unionfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/unionfs KMOD= unionfs diff --git a/sys/modules/usb/atp/Makefile b/sys/modules/usb/atp/Makefile --- a/sys/modules/usb/atp/Makefile +++ b/sys/modules/usb/atp/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/axge/Makefile b/sys/modules/usb/axge/Makefile --- a/sys/modules/usb/axge/Makefile +++ b/sys/modules/usb/axge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_axge diff --git a/sys/modules/usb/cfumass/Makefile b/sys/modules/usb/cfumass/Makefile --- a/sys/modules/usb/cfumass/Makefile +++ b/sys/modules/usb/cfumass/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/storage KMOD= cfumass diff --git a/sys/modules/usb/muge/Makefile b/sys/modules/usb/muge/Makefile --- a/sys/modules/usb/muge/Makefile +++ b/sys/modules/usb/muge/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/rsu/Makefile b/sys/modules/usb/rsu/Makefile --- a/sys/modules/usb/rsu/Makefile +++ b/sys/modules/usb/rsu/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_rsu diff --git a/sys/modules/usb/rsufw/Makefile b/sys/modules/usb/rsufw/Makefile --- a/sys/modules/usb/rsufw/Makefile +++ b/sys/modules/usb/rsufw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rsurtl8712fw .include diff --git a/sys/modules/usb/rsufw/rsurtl8712fw/Makefile b/sys/modules/usb/rsufw/rsurtl8712fw/Makefile --- a/sys/modules/usb/rsufw/rsurtl8712fw/Makefile +++ b/sys/modules/usb/rsufw/rsurtl8712fw/Makefile @@ -1,4 +1,3 @@ - KMOD= rsu-rtl8712fw IMG= rsu-rtl8712fw diff --git a/sys/modules/usb/runfw/Makefile b/sys/modules/usb/runfw/Makefile --- a/sys/modules/usb/runfw/Makefile +++ b/sys/modules/usb/runfw/Makefile @@ -1,4 +1,3 @@ - KMOD= runfw FIRMWS= run.fw:runfw:1 diff --git a/sys/modules/usb/uath/Makefile b/sys/modules/usb/uath/Makefile --- a/sys/modules/usb/uath/Makefile +++ b/sys/modules/usb/uath/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_uath diff --git a/sys/modules/usb/udl/Makefile b/sys/modules/usb/udl/Makefile --- a/sys/modules/usb/udl/Makefile +++ b/sys/modules/usb/udl/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/video diff --git a/sys/modules/usb/uep/Makefile b/sys/modules/usb/uep/Makefile --- a/sys/modules/usb/uep/Makefile +++ b/sys/modules/usb/uep/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/upgt/Makefile b/sys/modules/usb/upgt/Makefile --- a/sys/modules/usb/upgt/Makefile +++ b/sys/modules/usb/upgt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_upgt diff --git a/sys/modules/usb/ure/Makefile b/sys/modules/usb/ure/Makefile --- a/sys/modules/usb/ure/Makefile +++ b/sys/modules/usb/ure/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_ure diff --git a/sys/modules/usb/urtw/Makefile b/sys/modules/usb/urtw/Makefile --- a/sys/modules/usb/urtw/Makefile +++ b/sys/modules/usb/urtw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_urtw diff --git a/sys/modules/usb/usbhid/Makefile b/sys/modules/usb/usbhid/Makefile --- a/sys/modules/usb/usbhid/Makefile +++ b/sys/modules/usb/usbhid/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/wmt/Makefile b/sys/modules/usb/wmt/Makefile --- a/sys/modules/usb/wmt/Makefile +++ b/sys/modules/usb/wmt/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/veriexec/Makefile b/sys/modules/veriexec/Makefile --- a/sys/modules/veriexec/Makefile +++ b/sys/modules/veriexec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/dev/veriexec .include diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile --- a/sys/modules/vesa/Makefile +++ b/sys/modules/vesa/Makefile @@ -1,4 +1,3 @@ - KMOD= vesa SRCS= opt_vga.h opt_vesa.h SRCS+= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile --- a/sys/modules/vge/Makefile +++ b/sys/modules/vge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vge KMOD= if_vge diff --git a/sys/modules/viawd/Makefile b/sys/modules/viawd/Makefile --- a/sys/modules/viawd/Makefile +++ b/sys/modules/viawd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/viawd KMOD= viawd diff --git a/sys/modules/vmd/Makefile b/sys/modules/vmd/Makefile --- a/sys/modules/vmd/Makefile +++ b/sys/modules/vmd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmd KMOD= vmd diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -1,4 +1,3 @@ - .include KMOD= vmm diff --git a/sys/modules/vmware/pvscsi/Makefile b/sys/modules/vmware/pvscsi/Makefile --- a/sys/modules/vmware/pvscsi/Makefile +++ b/sys/modules/vmware/pvscsi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmware/pvscsi KMOD= pvscsi diff --git a/sys/modules/vmware/vmci/Makefile b/sys/modules/vmware/vmci/Makefile --- a/sys/modules/vmware/vmci/Makefile +++ b/sys/modules/vmware/vmci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmware/vmci KMOD= vmci diff --git a/sys/modules/vnic/Makefile b/sys/modules/vnic/Makefile --- a/sys/modules/vnic/Makefile +++ b/sys/modules/vnic/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/mrmlbus/Makefile b/sys/modules/vnic/mrmlbus/Makefile --- a/sys/modules/vnic/mrmlbus/Makefile +++ b/sys/modules/vnic/mrmlbus/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/thunder_bgx/Makefile b/sys/modules/vnic/thunder_bgx/Makefile --- a/sys/modules/vnic/thunder_bgx/Makefile +++ b/sys/modules/vnic/thunder_bgx/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/thunder_mdio/Makefile b/sys/modules/vnic/thunder_mdio/Makefile --- a/sys/modules/vnic/thunder_mdio/Makefile +++ b/sys/modules/vnic/thunder_mdio/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/vnicpf/Makefile b/sys/modules/vnic/vnicpf/Makefile --- a/sys/modules/vnic/vnicpf/Makefile +++ b/sys/modules/vnic/vnicpf/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/vnicvf/Makefile b/sys/modules/vnic/vnicvf/Makefile --- a/sys/modules/vnic/vnicvf/Makefile +++ b/sys/modules/vnic/vnicvf/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile --- a/sys/modules/vr/Makefile +++ b/sys/modules/vr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vr KMOD= if_vr diff --git a/sys/modules/vte/Makefile b/sys/modules/vte/Makefile --- a/sys/modules/vte/Makefile +++ b/sys/modules/vte/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vte KMOD= if_vte diff --git a/sys/modules/wbwd/Makefile b/sys/modules/wbwd/Makefile --- a/sys/modules/wbwd/Makefile +++ b/sys/modules/wbwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wbwd KMOD= wbwd diff --git a/sys/modules/wdatwd/Makefile b/sys/modules/wdatwd/Makefile --- a/sys/modules/wdatwd/Makefile +++ b/sys/modules/wdatwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wdatwd KMOD= wdatwd diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile --- a/sys/modules/wlan_acl/Makefile +++ b/sys/modules/wlan_acl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_acl diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile --- a/sys/modules/wlan_amrr/Makefile +++ b/sys/modules/wlan_amrr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_amrr diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile --- a/sys/modules/wlan_ccmp/Makefile +++ b/sys/modules/wlan_ccmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 .PATH: ${SRCTOP}/sys/crypto/rijndael diff --git a/sys/modules/wlan_rssadapt/Makefile b/sys/modules/wlan_rssadapt/Makefile --- a/sys/modules/wlan_rssadapt/Makefile +++ b/sys/modules/wlan_rssadapt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_rssadapt diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile --- a/sys/modules/wlan_tkip/Makefile +++ b/sys/modules/wlan_tkip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_tkip diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile --- a/sys/modules/wlan_wep/Makefile +++ b/sys/modules/wlan_wep/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_wep diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile --- a/sys/modules/wlan_xauth/Makefile +++ b/sys/modules/wlan_xauth/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_xauth diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile --- a/sys/modules/wpi/Makefile +++ b/sys/modules/wpi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wpi KMOD = if_wpi diff --git a/sys/modules/wpifw/Makefile b/sys/modules/wpifw/Makefile --- a/sys/modules/wpifw/Makefile +++ b/sys/modules/wpifw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/wpi KMOD= wpifw diff --git a/sys/modules/wtap/Makefile b/sys/modules/wtap/Makefile --- a/sys/modules/wtap/Makefile +++ b/sys/modules/wtap/Makefile @@ -1,4 +1,3 @@ - KMOD= wtap .PATH: ${SRCTOP}/sys/dev/wtap diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile --- a/sys/modules/x86bios/Makefile +++ b/sys/modules/x86bios/Makefile @@ -1,4 +1,3 @@ - KMOD= x86bios SRCS= opt_x86bios.h SRCS+= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/xdr/Makefile b/sys/modules/xdr/Makefile --- a/sys/modules/xdr/Makefile +++ b/sys/modules/xdr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/xdr KMOD= xdr SRCS= xdr.c \ diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile --- a/sys/modules/xl/Makefile +++ b/sys/modules/xl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/xl KMOD= if_xl diff --git a/sys/modules/xz/Makefile b/sys/modules/xz/Makefile --- a/sys/modules/xz/Makefile +++ b/sys/modules/xz/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/xz .PATH: ${SRCTOP}/sys/contrib/xz-embedded/freebsd .PATH: ${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,4 +1,3 @@ - SRCDIR=${SRCTOP}/sys/contrib/openzfs/module INCDIR=${SRCTOP}/sys/contrib/openzfs/include diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile --- a/sys/modules/zlib/Makefile +++ b/sys/modules/zlib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/libkern .PATH: ${SRCTOP}/sys/dev/zlib .PATH: ${SRCTOP}/sys/contrib/zlib diff --git a/sys/netgraph/ng_ether.h b/sys/netgraph/ng_ether.h --- a/sys/netgraph/ng_ether.h +++ b/sys/netgraph/ng_ether.h @@ -1,4 +1,3 @@ - /* * ng_ether.h */ diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -1,4 +1,3 @@ - /* * ng_ether.c */ diff --git a/sys/netgraph/ng_tee.h b/sys/netgraph/ng_tee.h --- a/sys/netgraph/ng_tee.h +++ b/sys/netgraph/ng_tee.h @@ -1,4 +1,3 @@ - /* * ng_tee.h */ diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c --- a/sys/netgraph/ng_tee.c +++ b/sys/netgraph/ng_tee.c @@ -1,4 +1,3 @@ - /* * ng_tee.c */ diff --git a/sys/netgraph/ng_tty.h b/sys/netgraph/ng_tty.h --- a/sys/netgraph/ng_tty.h +++ b/sys/netgraph/ng_tty.h @@ -1,4 +1,3 @@ - /* * ng_tty.h */ diff --git a/sys/netgraph/ng_vjc.h b/sys/netgraph/ng_vjc.h --- a/sys/netgraph/ng_vjc.h +++ b/sys/netgraph/ng_vjc.h @@ -1,4 +1,3 @@ - /* * ng_vjc.h */ diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c --- a/sys/netgraph/ng_vjc.c +++ b/sys/netgraph/ng_vjc.c @@ -1,4 +1,3 @@ - /* * ng_vjc.c */ diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY --- a/sys/netinet/libalias/HISTORY +++ b/sys/netinet/libalias/HISTORY @@ -1,4 +1,3 @@ - Version 1.0: August 11, 1996 (cjm) Version 1.1: August 20, 1996 (cjm) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE --- a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE +++ b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE @@ -1,4 +1,3 @@ - Copyright (C) 1993-2002 by Darren Reed. The author accepts no responsibility for the use of this software and diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.h b/sys/netpfil/ipfilter/netinet/ip_auth.h --- a/sys/netpfil/ipfilter/netinet/ip_auth.h +++ b/sys/netpfil/ipfilter/netinet/ip_auth.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.c b/sys/netpfil/ipfilter/netinet/ip_auth.c --- a/sys/netpfil/ipfilter/netinet/ip_auth.c +++ b/sys/netpfil/ipfilter/netinet/ip_auth.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.h b/sys/netpfil/ipfilter/netinet/ip_frag.h --- a/sys/netpfil/ipfilter/netinet/ip_frag.h +++ b/sys/netpfil/ipfilter/netinet/ip_frag.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.c b/sys/netpfil/ipfilter/netinet/ip_frag.c --- a/sys/netpfil/ipfilter/netinet/ip_frag.c +++ b/sys/netpfil/ipfilter/netinet/ip_frag.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c --- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_log.c b/sys/netpfil/ipfilter/netinet/ip_log.c --- a/sys/netpfil/ipfilter/netinet/ip_log.c +++ b/sys/netpfil/ipfilter/netinet/ip_log.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.h b/sys/netpfil/ipfilter/netinet/ip_nat.h --- a/sys/netpfil/ipfilter/netinet/ip_nat.h +++ b/sys/netpfil/ipfilter/netinet/ip_nat.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.h b/sys/netpfil/ipfilter/netinet/ip_proxy.h --- a/sys/netpfil/ipfilter/netinet/ip_proxy.h +++ b/sys/netpfil/ipfilter/netinet/ip_proxy.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c --- a/sys/netpfil/ipfilter/netinet/ip_proxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_proxy.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c b/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c --- a/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c --- a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_rules.h b/sys/netpfil/ipfilter/netinet/ip_rules.h --- a/sys/netpfil/ipfilter/netinet/ip_rules.h +++ b/sys/netpfil/ipfilter/netinet/ip_rules.h @@ -1,4 +1,3 @@ - extern int ipfrule_add(void); extern int ipfrule_remove(void); diff --git a/sys/netpfil/ipfilter/netinet/ip_rules.c b/sys/netpfil/ipfilter/netinet/ip_rules.c --- a/sys/netpfil/ipfilter/netinet/ip_rules.c +++ b/sys/netpfil/ipfilter/netinet/ip_rules.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_state.h b/sys/netpfil/ipfilter/netinet/ip_state.h --- a/sys/netpfil/ipfilter/netinet/ip_state.h +++ b/sys/netpfil/ipfilter/netinet/ip_state.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ip_sync.c b/sys/netpfil/ipfilter/netinet/ip_sync.c --- a/sys/netpfil/ipfilter/netinet/ip_sync.c +++ b/sys/netpfil/ipfilter/netinet/ip_sync.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/ipl.h b/sys/netpfil/ipfilter/netinet/ipl.h --- a/sys/netpfil/ipfilter/netinet/ipl.h +++ b/sys/netpfil/ipfilter/netinet/ipl.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2012 by Darren Reed. * See the IPFILTER.LICENCE file for details on licencing. diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S --- a/sys/powerpc/aim/locore.S +++ b/sys/powerpc/aim/locore.S @@ -1,4 +1,3 @@ - #ifdef __powerpc64__ #include #else diff --git a/sys/powerpc/aim/locore32.S b/sys/powerpc/aim/locore32.S --- a/sys/powerpc/aim/locore32.S +++ b/sys/powerpc/aim/locore32.S @@ -1,4 +1,3 @@ - /*- * Copyright (C) 2010-2016 Nathan Whitehorn * All rights reserved. diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S --- a/sys/powerpc/aim/locore64.S +++ b/sys/powerpc/aim/locore64.S @@ -1,4 +1,3 @@ - /*- * Copyright (C) 2010-2016 Nathan Whitehorn * All rights reserved. diff --git a/sys/powerpc/conf/LINT b/sys/powerpc/conf/LINT --- a/sys/powerpc/conf/LINT +++ b/sys/powerpc/conf/LINT @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include NOTES machine powerpc powerpc diff --git a/sys/powerpc/conf/LINT64 b/sys/powerpc/conf/LINT64 --- a/sys/powerpc/conf/LINT64 +++ b/sys/powerpc/conf/LINT64 @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include NOTES machine powerpc powerpc64 diff --git a/sys/powerpc/conf/LINT64LE b/sys/powerpc/conf/LINT64LE --- a/sys/powerpc/conf/LINT64LE +++ b/sys/powerpc/conf/LINT64LE @@ -1,4 +1,3 @@ - include "../../conf/NOTES" include NOTES machine powerpc powerpc64le diff --git a/sys/powerpc/conf/dpaa/config.dpaa b/sys/powerpc/conf/dpaa/config.dpaa --- a/sys/powerpc/conf/dpaa/config.dpaa +++ b/sys/powerpc/conf/dpaa/config.dpaa @@ -1,4 +1,3 @@ - files "dpaa/files.dpaa" makeoptions DPAA_COMPILE_CMD="${LINUXKPI_C} ${DPAAWARNFLAGS} \ diff --git a/sys/powerpc/conf/dpaa/files.dpaa b/sys/powerpc/conf/dpaa/files.dpaa --- a/sys/powerpc/conf/dpaa/files.dpaa +++ b/sys/powerpc/conf/dpaa/files.dpaa @@ -1,4 +1,3 @@ - # NetCommSw drivers contrib/ncsw/etc/error.c optional dpaa \ no-depend compile-with "${DPAA_COMPILE_CMD}" diff --git a/sys/powerpc/ps3/ps3-hvcall.S b/sys/powerpc/ps3/ps3-hvcall.S --- a/sys/powerpc/ps3/ps3-hvcall.S +++ b/sys/powerpc/ps3/ps3-hvcall.S @@ -1,4 +1,3 @@ - #include #define hc .long 0x44000022 diff --git a/sys/riscv/allwinner/files.allwinner b/sys/riscv/allwinner/files.allwinner --- a/sys/riscv/allwinner/files.allwinner +++ b/sys/riscv/allwinner/files.allwinner @@ -1,2 +1 @@ - arm/allwinner/aw_wdog.c optional aw_wdog diff --git a/sys/riscv/conf/LINT b/sys/riscv/conf/LINT --- a/sys/riscv/conf/LINT +++ b/sys/riscv/conf/LINT @@ -1,3 +1,2 @@ - include "../../conf/NOTES" include NOTES diff --git a/sys/riscv/conf/QEMU b/sys/riscv/conf/QEMU --- a/sys/riscv/conf/QEMU +++ b/sys/riscv/conf/QEMU @@ -1,4 +1,3 @@ - #NO_UNIVERSE include "GENERIC" diff --git a/sys/riscv/include/bus_dma.h b/sys/riscv/include/bus_dma.h --- a/sys/riscv/include/bus_dma.h +++ b/sys/riscv/include/bus_dma.h @@ -1,4 +1,3 @@ - #ifndef _MACHINE_BUS_DMA_H_ #define _MACHINE_BUS_DMA_H_ diff --git a/sys/riscv/include/floatingpoint.h b/sys/riscv/include/floatingpoint.h --- a/sys/riscv/include/floatingpoint.h +++ b/sys/riscv/include/floatingpoint.h @@ -1,2 +1 @@ - #include diff --git a/sys/riscv/include/ieeefp.h b/sys/riscv/include/ieeefp.h --- a/sys/riscv/include/ieeefp.h +++ b/sys/riscv/include/ieeefp.h @@ -1,4 +1,3 @@ - #ifndef _MACHINE_IEEEFP_H_ #define _MACHINE_IEEEFP_H_ diff --git a/sys/riscv/sifive/files.sifive b/sys/riscv/sifive/files.sifive --- a/sys/riscv/sifive/files.sifive +++ b/sys/riscv/sifive/files.sifive @@ -1,4 +1,3 @@ - riscv/sifive/fe310_aon.c optional fe310aon riscv/sifive/fu740_pci_dw.c optional fu740_pci_dw pci fdt riscv/sifive/sifive_gpio.c optional sifive_gpio gpio diff --git a/sys/teken/demo/Makefile b/sys/teken/demo/Makefile --- a/sys/teken/demo/Makefile +++ b/sys/teken/demo/Makefile @@ -1,4 +1,3 @@ - PROG= teken_demo LDADD= -lncursesw -lteken -lutil MAN= diff --git a/sys/teken/libteken/Makefile b/sys/teken/libteken/Makefile --- a/sys/teken/libteken/Makefile +++ b/sys/teken/libteken/Makefile @@ -1,4 +1,3 @@ - LIB= teken SHLIB_MAJOR= 0 diff --git a/sys/teken/stress/Makefile b/sys/teken/stress/Makefile --- a/sys/teken/stress/Makefile +++ b/sys/teken/stress/Makefile @@ -1,4 +1,3 @@ - PROG= teken_stress LDADD= -lteken MAN= diff --git a/sys/tools/sound/emu10k1-mkalsa.sh b/sys/tools/sound/emu10k1-mkalsa.sh --- a/sys/tools/sound/emu10k1-mkalsa.sh +++ b/sys/tools/sound/emu10k1-mkalsa.sh @@ -1,4 +1,3 @@ - GREP=${GREP:-grep} CC=${CC:-cc} AWK=${AWK:-awk} diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls --- a/sys/ufs/ufs/README.acls +++ b/sys/ufs/ufs/README.acls @@ -1,4 +1,3 @@ - UFS Access Control Lists Copyright The UFS Access Control Lists implementation is copyright Robert Watson, diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr --- a/sys/ufs/ufs/README.extattr +++ b/sys/ufs/ufs/README.extattr @@ -1,4 +1,3 @@ - UFS Extended Attributes Copyright The UFS Extended Attributes implementation is copyright Robert Watson, and diff --git a/targets/Makefile b/targets/Makefile --- a/targets/Makefile +++ b/targets/Makefile @@ -1,4 +1,3 @@ - # This is the top-level makefile - derived from the Junos version # # If a subdir that matches the requested target exists, we assume diff --git a/targets/Makefile.inc b/targets/Makefile.inc --- a/targets/Makefile.inc +++ b/targets/Makefile.inc @@ -1,4 +1,3 @@ - .if !target(__${_this}__) __${_this}__: diff --git a/targets/pseudo/Makefile.inc b/targets/pseudo/Makefile.inc --- a/targets/pseudo/Makefile.inc +++ b/targets/pseudo/Makefile.inc @@ -1,4 +1,3 @@ - # we don't do anything in these dirs # they are just for triggering building of other things diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -1,4 +1,3 @@ - # building clang is particularly tedious - so avoid re-inventing wheels all: bootstrap-toolchain diff --git a/targets/pseudo/bootstrap-tools/Makefile.depend.host b/targets/pseudo/bootstrap-tools/Makefile.depend.host --- a/targets/pseudo/bootstrap-tools/Makefile.depend.host +++ b/targets/pseudo/bootstrap-tools/Makefile.depend.host @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = diff --git a/targets/pseudo/clang/Makefile b/targets/pseudo/clang/Makefile --- a/targets/pseudo/clang/Makefile +++ b/targets/pseudo/clang/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend --- a/targets/pseudo/clang/Makefile.depend +++ b/targets/pseudo/clang/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/gcc/Makefile b/targets/pseudo/gcc/Makefile --- a/targets/pseudo/gcc/Makefile +++ b/targets/pseudo/gcc/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/gcc/Makefile.depend b/targets/pseudo/gcc/Makefile.depend --- a/targets/pseudo/gcc/Makefile.depend +++ b/targets/pseudo/gcc/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/hosttools/Makefile b/targets/pseudo/hosttools/Makefile --- a/targets/pseudo/hosttools/Makefile +++ b/targets/pseudo/hosttools/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host --- a/targets/pseudo/hosttools/Makefile.depend.host +++ b/targets/pseudo/hosttools/Makefile.depend.host @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_KERBEROS) diff --git a/targets/pseudo/kernel/Makefile b/targets/pseudo/kernel/Makefile --- a/targets/pseudo/kernel/Makefile +++ b/targets/pseudo/kernel/Makefile @@ -1,4 +1,3 @@ - # Build the kernel ${KERNCONF} KERNCONF?= ${KERNEL:UGENERIC} diff --git a/targets/pseudo/kernel/Makefile.depend b/targets/pseudo/kernel/Makefile.depend --- a/targets/pseudo/kernel/Makefile.depend +++ b/targets/pseudo/kernel/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile --- a/targets/pseudo/stage/Makefile +++ b/targets/pseudo/stage/Makefile @@ -1,4 +1,3 @@ - # this makefile gets hooked into everyone's dependencies so that # distrib-dirs can be done in STAGE_OBJTOP all: diff --git a/targets/pseudo/tests/Makefile b/targets/pseudo/tests/Makefile --- a/targets/pseudo/tests/Makefile +++ b/targets/pseudo/tests/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/tests/Makefile.depend b/targets/pseudo/tests/Makefile.depend --- a/targets/pseudo/tests/Makefile.depend +++ b/targets/pseudo/tests/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/the-lot/Makefile b/targets/pseudo/the-lot/Makefile --- a/targets/pseudo/the-lot/Makefile +++ b/targets/pseudo/the-lot/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/the-lot/Makefile.depend b/targets/pseudo/the-lot/Makefile.depend --- a/targets/pseudo/the-lot/Makefile.depend +++ b/targets/pseudo/the-lot/Makefile.depend @@ -1,4 +1,3 @@ - .include # This file is not autogenerated - take care! diff --git a/targets/pseudo/toolchain/Makefile b/targets/pseudo/toolchain/Makefile --- a/targets/pseudo/toolchain/Makefile +++ b/targets/pseudo/toolchain/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/toolchain/Makefile.depend b/targets/pseudo/toolchain/Makefile.depend --- a/targets/pseudo/toolchain/Makefile.depend +++ b/targets/pseudo/toolchain/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_CLANG) diff --git a/targets/pseudo/universe/Makefile b/targets/pseudo/universe/Makefile --- a/targets/pseudo/universe/Makefile +++ b/targets/pseudo/universe/Makefile @@ -1,4 +1,3 @@ - # This target is "special". # # The actual work is done via another target; diff --git a/targets/pseudo/universe/Makefile.depend b/targets/pseudo/universe/Makefile.depend --- a/targets/pseudo/universe/Makefile.depend +++ b/targets/pseudo/universe/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! # this is not normally needed, but we are not normal diff --git a/targets/pseudo/userland/Makefile b/targets/pseudo/userland/Makefile --- a/targets/pseudo/userland/Makefile +++ b/targets/pseudo/userland/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/Makefile.inc b/targets/pseudo/userland/Makefile.inc --- a/targets/pseudo/userland/Makefile.inc +++ b/targets/pseudo/userland/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile b/targets/pseudo/userland/cddl/Makefile --- a/targets/pseudo/userland/cddl/Makefile +++ b/targets/pseudo/userland/cddl/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_CTF) diff --git a/targets/pseudo/userland/games/Makefile b/targets/pseudo/userland/games/Makefile --- a/targets/pseudo/userland/games/Makefile +++ b/targets/pseudo/userland/games/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/games/Makefile.depend b/targets/pseudo/userland/games/Makefile.depend --- a/targets/pseudo/userland/games/Makefile.depend +++ b/targets/pseudo/userland/games/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/gnu/Makefile b/targets/pseudo/userland/gnu/Makefile --- a/targets/pseudo/userland/gnu/Makefile +++ b/targets/pseudo/userland/gnu/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -1,4 +1,3 @@ - .include "${SRCTOP}/share/mk/src.opts.mk" # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/include/Makefile b/targets/pseudo/userland/include/Makefile --- a/targets/pseudo/userland/include/Makefile +++ b/targets/pseudo/userland/include/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/include/Makefile.depend b/targets/pseudo/userland/include/Makefile.depend --- a/targets/pseudo/userland/include/Makefile.depend +++ b/targets/pseudo/userland/include/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/kerberos5/Makefile b/targets/pseudo/userland/kerberos5/Makefile --- a/targets/pseudo/userland/kerberos5/Makefile +++ b/targets/pseudo/userland/kerberos5/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/kerberos5/Makefile.depend b/targets/pseudo/userland/kerberos5/Makefile.depend --- a/targets/pseudo/userland/kerberos5/Makefile.depend +++ b/targets/pseudo/userland/kerberos5/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/lib/Makefile b/targets/pseudo/userland/lib/Makefile --- a/targets/pseudo/userland/lib/Makefile +++ b/targets/pseudo/userland/lib/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend --- a/targets/pseudo/userland/lib/Makefile.depend +++ b/targets/pseudo/userland/lib/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/libexec/Makefile b/targets/pseudo/userland/libexec/Makefile --- a/targets/pseudo/userland/libexec/Makefile +++ b/targets/pseudo/userland/libexec/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/libexec/Makefile.depend b/targets/pseudo/userland/libexec/Makefile.depend --- a/targets/pseudo/userland/libexec/Makefile.depend +++ b/targets/pseudo/userland/libexec/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/misc/Makefile b/targets/pseudo/userland/misc/Makefile --- a/targets/pseudo/userland/misc/Makefile +++ b/targets/pseudo/userland/misc/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/targets/pseudo/userland/misc/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_FORTH) diff --git a/targets/pseudo/userland/secure/Makefile b/targets/pseudo/userland/secure/Makefile --- a/targets/pseudo/userland/secure/Makefile +++ b/targets/pseudo/userland/secure/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/secure/Makefile.depend b/targets/pseudo/userland/secure/Makefile.depend --- a/targets/pseudo/userland/secure/Makefile.depend +++ b/targets/pseudo/userland/secure/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/share/Makefile b/targets/pseudo/userland/share/Makefile --- a/targets/pseudo/userland/share/Makefile +++ b/targets/pseudo/userland/share/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend --- a/targets/pseudo/userland/share/Makefile.depend +++ b/targets/pseudo/userland/share/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/tests/Makefile b/tests/Makefile --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE} diff --git a/tests/Makefile.inc0 b/tests/Makefile.inc0 --- a/tests/Makefile.inc0 +++ b/tests/Makefile.inc0 @@ -1,4 +1,3 @@ - # tests/... doesn't conform to bsd.lib.mk and bsd.prog.mk, so specify a sane # default for MK_CHECK_USE_SANDBOX. src.opts.mk will override the value if the # user sets it to no. diff --git a/tests/etc/Makefile b/tests/etc/Makefile --- a/tests/etc/Makefile +++ b/tests/etc/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/etc diff --git a/tests/etc/Makefile.inc b/tests/etc/Makefile.inc --- a/tests/etc/Makefile.inc +++ b/tests/etc/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/etc/rc.d/Makefile b/tests/etc/rc.d/Makefile --- a/tests/etc/rc.d/Makefile +++ b/tests/etc/rc.d/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/etc/rc.d ATF_TESTS_SH+= routing_test diff --git a/tests/examples/Makefile b/tests/examples/Makefile --- a/tests/examples/Makefile +++ b/tests/examples/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/examples diff --git a/tests/sys/Makefile b/tests/sys/Makefile --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc --- a/tests/sys/Makefile.inc +++ b/tests/sys/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile --- a/tests/sys/acl/Makefile +++ b/tests/sys/acl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/acl diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile --- a/tests/sys/aio/Makefile +++ b/tests/sys/aio/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/aio ATF_TESTS_C+= aio_test diff --git a/tests/sys/audit/Makefile b/tests/sys/audit/Makefile --- a/tests/sys/audit/Makefile +++ b/tests/sys/audit/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/audit ATF_TESTS_C= file-attribute-access diff --git a/tests/sys/auditpipe/Makefile b/tests/sys/auditpipe/Makefile --- a/tests/sys/auditpipe/Makefile +++ b/tests/sys/auditpipe/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/auditpipe ATF_TESTS_C= auditpipe_test diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile --- a/tests/sys/capsicum/Makefile +++ b/tests/sys/capsicum/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/capsicum diff --git a/tests/sys/cddl/Makefile b/tests/sys/cddl/Makefile --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/cddl diff --git a/tests/sys/cddl/zfs/Makefile b/tests/sys/cddl/zfs/Makefile --- a/tests/sys/cddl/zfs/Makefile +++ b/tests/sys/cddl/zfs/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/cddl/zfs diff --git a/tests/sys/cddl/zfs/bin/Makefile b/tests/sys/cddl/zfs/bin/Makefile --- a/tests/sys/cddl/zfs/bin/Makefile +++ b/tests/sys/cddl/zfs/bin/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/include/Makefile b/tests/sys/cddl/zfs/include/Makefile --- a/tests/sys/cddl/zfs/include/Makefile +++ b/tests/sys/cddl/zfs/include/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/Makefile b/tests/sys/cddl/zfs/tests/Makefile --- a/tests/sys/cddl/zfs/tests/Makefile +++ b/tests/sys/cddl/zfs/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/Makefile.inc b/tests/sys/cddl/zfs/tests/Makefile.inc --- a/tests/sys/cddl/zfs/tests/Makefile.inc +++ b/tests/sys/cddl/zfs/tests/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 0 diff --git a/tests/sys/cddl/zfs/tests/acl/Makefile b/tests/sys/cddl/zfs/tests/acl/Makefile --- a/tests/sys/cddl/zfs/tests/acl/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile --- a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile --- a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile --- a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/atime/Makefile b/tests/sys/cddl/zfs/tests/atime/Makefile --- a/tests/sys/cddl/zfs/tests/atime/Makefile +++ b/tests/sys/cddl/zfs/tests/atime/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/bootfs/Makefile b/tests/sys/cddl/zfs/tests/bootfs/Makefile --- a/tests/sys/cddl/zfs/tests/bootfs/Makefile +++ b/tests/sys/cddl/zfs/tests/bootfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cache/Makefile b/tests/sys/cddl/zfs/tests/cache/Makefile --- a/tests/sys/cddl/zfs/tests/cache/Makefile +++ b/tests/sys/cddl/zfs/tests/cache/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cachefile/Makefile b/tests/sys/cddl/zfs/tests/cachefile/Makefile --- a/tests/sys/cddl/zfs/tests/cachefile/Makefile +++ b/tests/sys/cddl/zfs/tests/cachefile/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile --- a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile +++ b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/Makefile b/tests/sys/cddl/zfs/tests/cli_root/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/Makefile b/tests/sys/cddl/zfs/tests/cli_user/Makefile --- a/tests/sys/cddl/zfs/tests/cli_user/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile --- a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile --- a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile --- a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile --- a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/compression/Makefile b/tests/sys/cddl/zfs/tests/compression/Makefile --- a/tests/sys/cddl/zfs/tests/compression/Makefile +++ b/tests/sys/cddl/zfs/tests/compression/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/ctime/Makefile b/tests/sys/cddl/zfs/tests/ctime/Makefile --- a/tests/sys/cddl/zfs/tests/ctime/Makefile +++ b/tests/sys/cddl/zfs/tests/ctime/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/delegate/Makefile b/tests/sys/cddl/zfs/tests/delegate/Makefile --- a/tests/sys/cddl/zfs/tests/delegate/Makefile +++ b/tests/sys/cddl/zfs/tests/delegate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/devices/Makefile b/tests/sys/cddl/zfs/tests/devices/Makefile --- a/tests/sys/cddl/zfs/tests/devices/Makefile +++ b/tests/sys/cddl/zfs/tests/devices/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/exec/Makefile b/tests/sys/cddl/zfs/tests/exec/Makefile --- a/tests/sys/cddl/zfs/tests/exec/Makefile +++ b/tests/sys/cddl/zfs/tests/exec/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/grow_pool/Makefile b/tests/sys/cddl/zfs/tests/grow_pool/Makefile --- a/tests/sys/cddl/zfs/tests/grow_pool/Makefile +++ b/tests/sys/cddl/zfs/tests/grow_pool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile --- a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile +++ b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/history/Makefile b/tests/sys/cddl/zfs/tests/history/Makefile --- a/tests/sys/cddl/zfs/tests/history/Makefile +++ b/tests/sys/cddl/zfs/tests/history/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/hotplug/Makefile b/tests/sys/cddl/zfs/tests/hotplug/Makefile --- a/tests/sys/cddl/zfs/tests/hotplug/Makefile +++ b/tests/sys/cddl/zfs/tests/hotplug/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/hotspare/Makefile b/tests/sys/cddl/zfs/tests/hotspare/Makefile --- a/tests/sys/cddl/zfs/tests/hotspare/Makefile +++ b/tests/sys/cddl/zfs/tests/hotspare/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/inheritance/Makefile b/tests/sys/cddl/zfs/tests/inheritance/Makefile --- a/tests/sys/cddl/zfs/tests/inheritance/Makefile +++ b/tests/sys/cddl/zfs/tests/inheritance/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/interop/Makefile b/tests/sys/cddl/zfs/tests/interop/Makefile --- a/tests/sys/cddl/zfs/tests/interop/Makefile +++ b/tests/sys/cddl/zfs/tests/interop/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/inuse/Makefile b/tests/sys/cddl/zfs/tests/inuse/Makefile --- a/tests/sys/cddl/zfs/tests/inuse/Makefile +++ b/tests/sys/cddl/zfs/tests/inuse/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/iscsi/Makefile b/tests/sys/cddl/zfs/tests/iscsi/Makefile --- a/tests/sys/cddl/zfs/tests/iscsi/Makefile +++ b/tests/sys/cddl/zfs/tests/iscsi/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/large_files/Makefile b/tests/sys/cddl/zfs/tests/large_files/Makefile --- a/tests/sys/cddl/zfs/tests/large_files/Makefile +++ b/tests/sys/cddl/zfs/tests/large_files/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/largest_pool/Makefile b/tests/sys/cddl/zfs/tests/largest_pool/Makefile --- a/tests/sys/cddl/zfs/tests/largest_pool/Makefile +++ b/tests/sys/cddl/zfs/tests/largest_pool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/link_count/Makefile b/tests/sys/cddl/zfs/tests/link_count/Makefile --- a/tests/sys/cddl/zfs/tests/link_count/Makefile +++ b/tests/sys/cddl/zfs/tests/link_count/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/migration/Makefile b/tests/sys/cddl/zfs/tests/migration/Makefile --- a/tests/sys/cddl/zfs/tests/migration/Makefile +++ b/tests/sys/cddl/zfs/tests/migration/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mmap/Makefile b/tests/sys/cddl/zfs/tests/mmap/Makefile --- a/tests/sys/cddl/zfs/tests/mmap/Makefile +++ b/tests/sys/cddl/zfs/tests/mmap/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mount/Makefile b/tests/sys/cddl/zfs/tests/mount/Makefile --- a/tests/sys/cddl/zfs/tests/mount/Makefile +++ b/tests/sys/cddl/zfs/tests/mount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mv_files/Makefile b/tests/sys/cddl/zfs/tests/mv_files/Makefile --- a/tests/sys/cddl/zfs/tests/mv_files/Makefile +++ b/tests/sys/cddl/zfs/tests/mv_files/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/nestedfs/Makefile b/tests/sys/cddl/zfs/tests/nestedfs/Makefile --- a/tests/sys/cddl/zfs/tests/nestedfs/Makefile +++ b/tests/sys/cddl/zfs/tests/nestedfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/no_space/Makefile b/tests/sys/cddl/zfs/tests/no_space/Makefile --- a/tests/sys/cddl/zfs/tests/no_space/Makefile +++ b/tests/sys/cddl/zfs/tests/no_space/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/online_offline/Makefile b/tests/sys/cddl/zfs/tests/online_offline/Makefile --- a/tests/sys/cddl/zfs/tests/online_offline/Makefile +++ b/tests/sys/cddl/zfs/tests/online_offline/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/pool_names/Makefile b/tests/sys/cddl/zfs/tests/pool_names/Makefile --- a/tests/sys/cddl/zfs/tests/pool_names/Makefile +++ b/tests/sys/cddl/zfs/tests/pool_names/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/poolversion/Makefile b/tests/sys/cddl/zfs/tests/poolversion/Makefile --- a/tests/sys/cddl/zfs/tests/poolversion/Makefile +++ b/tests/sys/cddl/zfs/tests/poolversion/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/quota/Makefile b/tests/sys/cddl/zfs/tests/quota/Makefile --- a/tests/sys/cddl/zfs/tests/quota/Makefile +++ b/tests/sys/cddl/zfs/tests/quota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/redundancy/Makefile b/tests/sys/cddl/zfs/tests/redundancy/Makefile --- a/tests/sys/cddl/zfs/tests/redundancy/Makefile +++ b/tests/sys/cddl/zfs/tests/redundancy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/refquota/Makefile b/tests/sys/cddl/zfs/tests/refquota/Makefile --- a/tests/sys/cddl/zfs/tests/refquota/Makefile +++ b/tests/sys/cddl/zfs/tests/refquota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/refreserv/Makefile b/tests/sys/cddl/zfs/tests/refreserv/Makefile --- a/tests/sys/cddl/zfs/tests/refreserv/Makefile +++ b/tests/sys/cddl/zfs/tests/refreserv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile --- a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile +++ b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/replacement/Makefile b/tests/sys/cddl/zfs/tests/replacement/Makefile --- a/tests/sys/cddl/zfs/tests/replacement/Makefile +++ b/tests/sys/cddl/zfs/tests/replacement/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/reservation/Makefile b/tests/sys/cddl/zfs/tests/reservation/Makefile --- a/tests/sys/cddl/zfs/tests/reservation/Makefile +++ b/tests/sys/cddl/zfs/tests/reservation/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/rootpool/Makefile b/tests/sys/cddl/zfs/tests/rootpool/Makefile --- a/tests/sys/cddl/zfs/tests/rootpool/Makefile +++ b/tests/sys/cddl/zfs/tests/rootpool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/rsend/Makefile b/tests/sys/cddl/zfs/tests/rsend/Makefile --- a/tests/sys/cddl/zfs/tests/rsend/Makefile +++ b/tests/sys/cddl/zfs/tests/rsend/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile --- a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile +++ b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/slog/Makefile b/tests/sys/cddl/zfs/tests/slog/Makefile --- a/tests/sys/cddl/zfs/tests/slog/Makefile +++ b/tests/sys/cddl/zfs/tests/slog/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/snapshot/Makefile b/tests/sys/cddl/zfs/tests/snapshot/Makefile --- a/tests/sys/cddl/zfs/tests/snapshot/Makefile +++ b/tests/sys/cddl/zfs/tests/snapshot/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/snapused/Makefile b/tests/sys/cddl/zfs/tests/snapused/Makefile --- a/tests/sys/cddl/zfs/tests/snapused/Makefile +++ b/tests/sys/cddl/zfs/tests/snapused/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/sparse/Makefile b/tests/sys/cddl/zfs/tests/sparse/Makefile --- a/tests/sys/cddl/zfs/tests/sparse/Makefile +++ b/tests/sys/cddl/zfs/tests/sparse/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/threadsappend/Makefile b/tests/sys/cddl/zfs/tests/threadsappend/Makefile --- a/tests/sys/cddl/zfs/tests/threadsappend/Makefile +++ b/tests/sys/cddl/zfs/tests/threadsappend/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/truncate/Makefile b/tests/sys/cddl/zfs/tests/truncate/Makefile --- a/tests/sys/cddl/zfs/tests/truncate/Makefile +++ b/tests/sys/cddl/zfs/tests/truncate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile --- a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile +++ b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/userquota/Makefile b/tests/sys/cddl/zfs/tests/userquota/Makefile --- a/tests/sys/cddl/zfs/tests/userquota/Makefile +++ b/tests/sys/cddl/zfs/tests/userquota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/utils_test/Makefile b/tests/sys/cddl/zfs/tests/utils_test/Makefile --- a/tests/sys/cddl/zfs/tests/utils_test/Makefile +++ b/tests/sys/cddl/zfs/tests/utils_test/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/write_dirs/Makefile b/tests/sys/cddl/zfs/tests/write_dirs/Makefile --- a/tests/sys/cddl/zfs/tests/write_dirs/Makefile +++ b/tests/sys/cddl/zfs/tests/write_dirs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/xattr/Makefile b/tests/sys/cddl/zfs/tests/xattr/Makefile --- a/tests/sys/cddl/zfs/tests/xattr/Makefile +++ b/tests/sys/cddl/zfs/tests/xattr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zfsd/Makefile b/tests/sys/cddl/zfs/tests/zfsd/Makefile --- a/tests/sys/cddl/zfs/tests/zfsd/Makefile +++ b/tests/sys/cddl/zfs/tests/zfsd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zil/Makefile b/tests/sys/cddl/zfs/tests/zil/Makefile --- a/tests/sys/cddl/zfs/tests/zil/Makefile +++ b/tests/sys/cddl/zfs/tests/zil/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zinject/Makefile b/tests/sys/cddl/zfs/tests/zinject/Makefile --- a/tests/sys/cddl/zfs/tests/zinject/Makefile +++ b/tests/sys/cddl/zfs/tests/zinject/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zones/Makefile b/tests/sys/cddl/zfs/tests/zones/Makefile --- a/tests/sys/cddl/zfs/tests/zones/Makefile +++ b/tests/sys/cddl/zfs/tests/zones/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/Makefile b/tests/sys/cddl/zfs/tests/zvol/Makefile --- a/tests/sys/cddl/zfs/tests/zvol/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile --- a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile --- a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile --- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile --- a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile --- a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/common/Makefile b/tests/sys/common/Makefile --- a/tests/sys/common/Makefile +++ b/tests/sys/common/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/common ${PACKAGE}FILES+= vnet.subr diff --git a/tests/sys/compat32/Makefile b/tests/sys/compat32/Makefile --- a/tests/sys/compat32/Makefile +++ b/tests/sys/compat32/Makefile @@ -1,4 +1,3 @@ - .if exists(${.CURDIR}/${MACHINE_ARCH}) SUBDIR+= ${MACHINE_ARCH} .endif diff --git a/tests/sys/compat32/Makefile.inc b/tests/sys/compat32/Makefile.inc --- a/tests/sys/compat32/Makefile.inc +++ b/tests/sys/compat32/Makefile.inc @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/compat32 .include "../Makefile.inc" diff --git a/tests/sys/devrandom/Makefile b/tests/sys/devrandom/Makefile --- a/tests/sys/devrandom/Makefile +++ b/tests/sys/devrandom/Makefile @@ -1,4 +1,3 @@ - .include SDEVRANDOM= ${SRCTOP}/sys/dev/random diff --git a/tests/sys/fifo/Makefile b/tests/sys/fifo/Makefile --- a/tests/sys/fifo/Makefile +++ b/tests/sys/fifo/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/fifo PLAIN_TESTS_C+= fifo_create diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile --- a/tests/sys/file/Makefile +++ b/tests/sys/file/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/file BINDIR= ${TESTSDIR} diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile --- a/tests/sys/fs/Makefile +++ b/tests/sys/fs/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/tests/sys/fs/Makefile.inc b/tests/sys/fs/Makefile.inc --- a/tests/sys/fs/Makefile.inc +++ b/tests/sys/fs/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/fs/tmpfs/Makefile b/tests/sys/fs/tmpfs/Makefile --- a/tests/sys/fs/tmpfs/Makefile +++ b/tests/sys/fs/tmpfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests FILESYSTEM?= ${.CURDIR:T} diff --git a/tests/sys/geom/Makefile b/tests/sys/geom/Makefile --- a/tests/sys/geom/Makefile +++ b/tests/sys/geom/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/geom TESTS_SUBDIRS+= class diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile --- a/tests/sys/geom/class/Makefile +++ b/tests/sys/geom/class/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/geom/class/Makefile.inc b/tests/sys/geom/class/Makefile.inc --- a/tests/sys/geom/class/Makefile.inc +++ b/tests/sys/geom/class/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/geom/class/concat/Makefile b/tests/sys/geom/class/concat/Makefile --- a/tests/sys/geom/class/concat/Makefile +++ b/tests/sys/geom/class/concat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile --- a/tests/sys/geom/class/eli/Makefile +++ b/tests/sys/geom/class/eli/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 PACKAGE= tests diff --git a/tests/sys/geom/class/eli/attach_test.sh b/tests/sys/geom/class/eli/attach_test.sh --- a/tests/sys/geom/class/eli/attach_test.sh +++ b/tests/sys/geom/class/eli/attach_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh atf_test_case attach_d cleanup diff --git a/tests/sys/geom/class/eli/configure_test.sh b/tests/sys/geom/class/eli/configure_test.sh --- a/tests/sys/geom/class/eli/configure_test.sh +++ b/tests/sys/geom/class/eli/configure_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh atf_test_case configure_b_B cleanup diff --git a/tests/sys/geom/class/eli/detach_test.sh b/tests/sys/geom/class/eli/detach_test.sh --- a/tests/sys/geom/class/eli/detach_test.sh +++ b/tests/sys/geom/class/eli/detach_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh atf_test_case detach_l cleanup diff --git a/tests/sys/geom/class/eli/integrity_test.sh b/tests/sys/geom/class/eli/integrity_test.sh --- a/tests/sys/geom/class/eli/integrity_test.sh +++ b/tests/sys/geom/class/eli/integrity_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh copy_test() { diff --git a/tests/sys/geom/class/eli/kill_test.sh b/tests/sys/geom/class/eli/kill_test.sh --- a/tests/sys/geom/class/eli/kill_test.sh +++ b/tests/sys/geom/class/eli/kill_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh atf_test_case kill cleanup diff --git a/tests/sys/geom/class/eli/onetime_test.sh b/tests/sys/geom/class/eli/onetime_test.sh --- a/tests/sys/geom/class/eli/onetime_test.sh +++ b/tests/sys/geom/class/eli/onetime_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/conf.sh onetime_test() diff --git a/tests/sys/geom/class/eli/reentrancy_test.sh b/tests/sys/geom/class/eli/reentrancy_test.sh --- a/tests/sys/geom/class/eli/reentrancy_test.sh +++ b/tests/sys/geom/class/eli/reentrancy_test.sh @@ -1,4 +1,3 @@ - # Test various operations for geli-on-geli providers, to ensure that geli is # reentrant. diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile --- a/tests/sys/geom/class/gate/Makefile +++ b/tests/sys/geom/class/gate/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/gate/ggate_test.sh b/tests/sys/geom/class/gate/ggate_test.sh --- a/tests/sys/geom/class/gate/ggate_test.sh +++ b/tests/sys/geom/class/gate/ggate_test.sh @@ -1,4 +1,3 @@ - PIDFILE=ggated.pid PLAINFILES=plainfiles PORT=33080 diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile --- a/tests/sys/geom/class/mirror/Makefile +++ b/tests/sys/geom/class/mirror/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/mirror/component_selection.sh b/tests/sys/geom/class/mirror/component_selection.sh --- a/tests/sys/geom/class/mirror/component_selection.sh +++ b/tests/sys/geom/class/mirror/component_selection.sh @@ -1,4 +1,3 @@ - ATF_TEST=true class=mirror . $(atf_get_srcdir)/conf.sh diff --git a/tests/sys/geom/class/mirror/sync_error.sh b/tests/sys/geom/class/mirror/sync_error.sh --- a/tests/sys/geom/class/mirror/sync_error.sh +++ b/tests/sys/geom/class/mirror/sync_error.sh @@ -1,4 +1,3 @@ - ATF_TEST=true . $(atf_get_srcdir)/conf.sh diff --git a/tests/sys/geom/class/multipath/Makefile b/tests/sys/geom/class/multipath/Makefile --- a/tests/sys/geom/class/multipath/Makefile +++ b/tests/sys/geom/class/multipath/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile --- a/tests/sys/geom/class/nop/Makefile +++ b/tests/sys/geom/class/nop/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/part/Makefile b/tests/sys/geom/class/part/Makefile --- a/tests/sys/geom/class/part/Makefile +++ b/tests/sys/geom/class/part/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile --- a/tests/sys/geom/class/raid3/Makefile +++ b/tests/sys/geom/class/raid3/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile --- a/tests/sys/geom/class/shsec/Makefile +++ b/tests/sys/geom/class/shsec/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile --- a/tests/sys/geom/class/stripe/Makefile +++ b/tests/sys/geom/class/stripe/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/kern/Makefile.inc b/tests/sys/kern/Makefile.inc --- a/tests/sys/kern/Makefile.inc +++ b/tests/sys/kern/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/kern/acct/Makefile b/tests/sys/kern/acct/Makefile --- a/tests/sys/kern/acct/Makefile +++ b/tests/sys/kern/acct/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/acct ATF_TESTS_C= acct_test diff --git a/tests/sys/kern/execve/Makefile b/tests/sys/kern/execve/Makefile --- a/tests/sys/kern/execve/Makefile +++ b/tests/sys/kern/execve/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/execve BINDIR= ${TESTSDIR} diff --git a/tests/sys/kern/execve/execve_test.sh b/tests/sys/kern/execve/execve_test.sh --- a/tests/sys/kern/execve/execve_test.sh +++ b/tests/sys/kern/execve/execve_test.sh @@ -1,4 +1,3 @@ - bad_interp_len_head() { atf_set "descr" "Bad interpreter length" diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile --- a/tests/sys/kern/pipe/Makefile +++ b/tests/sys/kern/pipe/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/pipe PLAIN_TESTS_C+= big_pipe_test diff --git a/tests/sys/kqueue/Makefile b/tests/sys/kqueue/Makefile --- a/tests/sys/kqueue/Makefile +++ b/tests/sys/kqueue/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel/kqueue TESTSDIR= ${TESTSBASE}/sys/kqueue diff --git a/tests/sys/kqueue/Makefile.inc b/tests/sys/kqueue/Makefile.inc --- a/tests/sys/kqueue/Makefile.inc +++ b/tests/sys/kqueue/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/kqueue/libkqueue/Makefile b/tests/sys/kqueue/libkqueue/Makefile --- a/tests/sys/kqueue/libkqueue/Makefile +++ b/tests/sys/kqueue/libkqueue/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kqueue/libkqueue BINDIR= ${TESTSDIR} diff --git a/tests/sys/kqueue/libkqueue/config.h b/tests/sys/kqueue/libkqueue/config.h --- a/tests/sys/kqueue/libkqueue/config.h +++ b/tests/sys/kqueue/libkqueue/config.h @@ -1,4 +1,3 @@ - #define HAVE_ERR_H 1 #define HAVE_SYS_EVENT_H 1 #define HAVE_EV_DISPATCH 1 diff --git a/tests/sys/mac/Makefile b/tests/sys/mac/Makefile --- a/tests/sys/mac/Makefile +++ b/tests/sys/mac/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mac TESTS_SUBDIRS+= bsdextended diff --git a/tests/sys/mac/Makefile.inc b/tests/sys/mac/Makefile.inc --- a/tests/sys/mac/Makefile.inc +++ b/tests/sys/mac/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile --- a/tests/sys/mac/bsdextended/Makefile +++ b/tests/sys/mac/bsdextended/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mac/bsdextended ATF_TESTS_SH+= matches_test diff --git a/tests/sys/mac/ipacl/Makefile b/tests/sys/mac/ipacl/Makefile --- a/tests/sys/mac/ipacl/Makefile +++ b/tests/sys/mac/ipacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/mac/ipacl diff --git a/tests/sys/mac/portacl/LICENSE b/tests/sys/mac/portacl/LICENSE --- a/tests/sys/mac/portacl/LICENSE +++ b/tests/sys/mac/portacl/LICENSE @@ -1,4 +1,3 @@ - License for all mac_portacl regression tests: Copyright (c) 2009 Pawel Jakub Dawidek diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/mac/portacl diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile --- a/tests/sys/mqueue/Makefile +++ b/tests/sys/mqueue/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test diff --git a/tests/sys/mqueue/mqtest1.c b/tests/sys/mqueue/mqtest1.c --- a/tests/sys/mqueue/mqtest1.c +++ b/tests/sys/mqueue/mqtest1.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tests/sys/mqueue/mqtest2.c b/tests/sys/mqueue/mqtest2.c --- a/tests/sys/mqueue/mqtest2.c +++ b/tests/sys/mqueue/mqtest2.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tests/sys/mqueue/mqtest3.c b/tests/sys/mqueue/mqtest3.c --- a/tests/sys/mqueue/mqtest3.c +++ b/tests/sys/mqueue/mqtest3.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tests/sys/mqueue/mqtest4.c b/tests/sys/mqueue/mqtest4.c --- a/tests/sys/mqueue/mqtest4.c +++ b/tests/sys/mqueue/mqtest4.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tests/sys/mqueue/mqtest5.c b/tests/sys/mqueue/mqtest5.c --- a/tests/sys/mqueue/mqtest5.c +++ b/tests/sys/mqueue/mqtest5.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/net diff --git a/tests/sys/net/if_tun_test.sh b/tests/sys/net/if_tun_test.sh --- a/tests/sys/net/if_tun_test.sh +++ b/tests/sys/net/if_tun_test.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/../common/vnet.subr atf_test_case "235704" "cleanup" diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh --- a/tests/sys/net/if_vlan.sh +++ b/tests/sys/net/if_vlan.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/../common/vnet.subr atf_test_case "basic" "cleanup" diff --git a/tests/sys/net/routing/Makefile b/tests/sys/net/routing/Makefile --- a/tests/sys/net/routing/Makefile +++ b/tests/sys/net/routing/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 1 diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netgraph diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet diff --git a/tests/sys/netinet/libalias/Makefile b/tests/sys/netinet/libalias/Makefile --- a/tests/sys/netinet/libalias/Makefile +++ b/tests/sys/netinet/libalias/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet/libalias diff --git a/tests/sys/netinet6/Makefile b/tests/sys/netinet6/Makefile --- a/tests/sys/netinet6/Makefile +++ b/tests/sys/netinet6/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet6 diff --git a/tests/sys/netinet6/frag6/Makefile b/tests/sys/netinet6/frag6/Makefile --- a/tests/sys/netinet6/frag6/Makefile +++ b/tests/sys/netinet6/frag6/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet6/frag6 diff --git a/tests/sys/netinet6/frag6/sniffer.py b/tests/sys/netinet6/frag6/sniffer.py --- a/tests/sys/netinet6/frag6/sniffer.py +++ b/tests/sys/netinet6/frag6/sniffer.py @@ -1,4 +1,3 @@ - import threading import logging logging.getLogger("scapy").setLevel(logging.CRITICAL) diff --git a/tests/sys/netipsec/Makefile b/tests/sys/netipsec/Makefile --- a/tests/sys/netipsec/Makefile +++ b/tests/sys/netipsec/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/netipsec TESTS_SUBDIRS+= tunnel diff --git a/tests/sys/netipsec/tunnel/Makefile b/tests/sys/netipsec/tunnel/Makefile --- a/tests/sys/netipsec/tunnel/Makefile +++ b/tests/sys/netipsec/tunnel/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netipsec/tunnel diff --git a/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh b/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh --- a/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh +++ b/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh b/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh --- a/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh +++ b/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aes_gcm_128.sh b/tests/sys/netipsec/tunnel/aes_gcm_128.sh --- a/tests/sys/netipsec/tunnel/aes_gcm_128.sh +++ b/tests/sys/netipsec/tunnel/aes_gcm_128.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aes_gcm_256.sh b/tests/sys/netipsec/tunnel/aes_gcm_256.sh --- a/tests/sys/netipsec/tunnel/aes_gcm_256.sh +++ b/tests/sys/netipsec/tunnel/aes_gcm_256.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh b/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh --- a/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh +++ b/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh b/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh --- a/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh +++ b/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh b/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh --- a/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh +++ b/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh b/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh --- a/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh +++ b/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/chacha20_poly1305.sh b/tests/sys/netipsec/tunnel/chacha20_poly1305.sh --- a/tests/sys/netipsec/tunnel/chacha20_poly1305.sh +++ b/tests/sys/netipsec/tunnel/chacha20_poly1305.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netipsec/tunnel/empty.sh b/tests/sys/netipsec/tunnel/empty.sh --- a/tests/sys/netipsec/tunnel/empty.sh +++ b/tests/sys/netipsec/tunnel/empty.sh @@ -1,4 +1,3 @@ - . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" diff --git a/tests/sys/netlink/Makefile b/tests/sys/netlink/Makefile --- a/tests/sys/netlink/Makefile +++ b/tests/sys/netlink/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 1 diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile --- a/tests/sys/netmap/Makefile +++ b/tests/sys/netmap/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netmap diff --git a/tests/sys/netpfil/Makefile b/tests/sys/netpfil/Makefile --- a/tests/sys/netpfil/Makefile +++ b/tests/sys/netpfil/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/netpfil diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/common diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf diff --git a/tests/sys/netpfil/pf/ioctl/Makefile b/tests/sys/netpfil/pf/ioctl/Makefile --- a/tests/sys/netpfil/pf/ioctl/Makefile +++ b/tests/sys/netpfil/pf/ioctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf/ioctl diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile --- a/tests/sys/opencrypto/Makefile +++ b/tests/sys/opencrypto/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/opencrypto diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile --- a/tests/sys/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SUBDIR+= pjdfstest diff --git a/tests/sys/pjdfstest/Makefile.inc b/tests/sys/pjdfstest/Makefile.inc --- a/tests/sys/pjdfstest/Makefile.inc +++ b/tests/sys/pjdfstest/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile --- a/tests/sys/pjdfstest/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/pjdfstest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .PATH: ${SRCTOP}/contrib/pjdfstest diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile --- a/tests/sys/pjdfstest/tests/Makefile +++ b/tests/sys/pjdfstest/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest diff --git a/tests/sys/pjdfstest/tests/Makefile.inc b/tests/sys/pjdfstest/tests/Makefile.inc --- a/tests/sys/pjdfstest/tests/Makefile.inc +++ b/tests/sys/pjdfstest/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/pjdfstest/tests/chflags/Makefile b/tests/sys/pjdfstest/tests/chflags/Makefile --- a/tests/sys/pjdfstest/tests/chflags/Makefile +++ b/tests/sys/pjdfstest/tests/chflags/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/chmod/Makefile b/tests/sys/pjdfstest/tests/chmod/Makefile --- a/tests/sys/pjdfstest/tests/chmod/Makefile +++ b/tests/sys/pjdfstest/tests/chmod/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/chown/Makefile b/tests/sys/pjdfstest/tests/chown/Makefile --- a/tests/sys/pjdfstest/tests/chown/Makefile +++ b/tests/sys/pjdfstest/tests/chown/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/ftruncate/Makefile b/tests/sys/pjdfstest/tests/ftruncate/Makefile --- a/tests/sys/pjdfstest/tests/ftruncate/Makefile +++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/granular/Makefile b/tests/sys/pjdfstest/tests/granular/Makefile --- a/tests/sys/pjdfstest/tests/granular/Makefile +++ b/tests/sys/pjdfstest/tests/granular/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/link/Makefile b/tests/sys/pjdfstest/tests/link/Makefile --- a/tests/sys/pjdfstest/tests/link/Makefile +++ b/tests/sys/pjdfstest/tests/link/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mkdir/Makefile b/tests/sys/pjdfstest/tests/mkdir/Makefile --- a/tests/sys/pjdfstest/tests/mkdir/Makefile +++ b/tests/sys/pjdfstest/tests/mkdir/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mkfifo/Makefile b/tests/sys/pjdfstest/tests/mkfifo/Makefile --- a/tests/sys/pjdfstest/tests/mkfifo/Makefile +++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mknod/Makefile b/tests/sys/pjdfstest/tests/mknod/Makefile --- a/tests/sys/pjdfstest/tests/mknod/Makefile +++ b/tests/sys/pjdfstest/tests/mknod/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/open/Makefile b/tests/sys/pjdfstest/tests/open/Makefile --- a/tests/sys/pjdfstest/tests/open/Makefile +++ b/tests/sys/pjdfstest/tests/open/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/pjdfstest.test.mk b/tests/sys/pjdfstest/tests/pjdfstest.test.mk --- a/tests/sys/pjdfstest/tests/pjdfstest.test.mk +++ b/tests/sys/pjdfstest/tests/pjdfstest.test.mk @@ -1,4 +1,3 @@ - PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H:H}/contrib/pjdfstest .PATH: ${PJDFSTEST_SRCDIR}/tests/${.CURDIR:T} diff --git a/tests/sys/pjdfstest/tests/rename/Makefile b/tests/sys/pjdfstest/tests/rename/Makefile --- a/tests/sys/pjdfstest/tests/rename/Makefile +++ b/tests/sys/pjdfstest/tests/rename/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/rmdir/Makefile b/tests/sys/pjdfstest/tests/rmdir/Makefile --- a/tests/sys/pjdfstest/tests/rmdir/Makefile +++ b/tests/sys/pjdfstest/tests/rmdir/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/symlink/Makefile b/tests/sys/pjdfstest/tests/symlink/Makefile --- a/tests/sys/pjdfstest/tests/symlink/Makefile +++ b/tests/sys/pjdfstest/tests/symlink/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/truncate/Makefile b/tests/sys/pjdfstest/tests/truncate/Makefile --- a/tests/sys/pjdfstest/tests/truncate/Makefile +++ b/tests/sys/pjdfstest/tests/truncate/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/unlink/Makefile b/tests/sys/pjdfstest/tests/unlink/Makefile --- a/tests/sys/pjdfstest/tests/unlink/Makefile +++ b/tests/sys/pjdfstest/tests/unlink/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/utimensat/Makefile b/tests/sys/pjdfstest/tests/utimensat/Makefile --- a/tests/sys/pjdfstest/tests/utimensat/Makefile +++ b/tests/sys/pjdfstest/tests/utimensat/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile --- a/tests/sys/posixshm/Makefile +++ b/tests/sys/posixshm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/posixshm diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile --- a/tests/sys/sys/Makefile +++ b/tests/sys/sys/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/sys diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile --- a/tests/sys/vfs/Makefile +++ b/tests/sys/vfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vfs diff --git a/tests/sys/vfs/lookup_test.sh b/tests/sys/vfs/lookup_test.sh --- a/tests/sys/vfs/lookup_test.sh +++ b/tests/sys/vfs/lookup_test.sh @@ -1,4 +1,3 @@ - long_symlink_head() { atf_set "descr" "Test for 1023 (PATH_MAX-1) symlink support" diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vm diff --git a/tests/sys/vm/soxstack/Makefile b/tests/sys/vm/soxstack/Makefile --- a/tests/sys/vm/soxstack/Makefile +++ b/tests/sys/vm/soxstack/Makefile @@ -1,4 +1,3 @@ - SHLIB= soxstack SHLIB_NAME= libsoxstack.so SHLIB_MAJOR= 1 diff --git a/tests/sys/vm/stack/Makefile b/tests/sys/vm/stack/Makefile --- a/tests/sys/vm/stack/Makefile +++ b/tests/sys/vm/stack/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vm/stack diff --git a/tools/README b/tools/README --- a/tools/README +++ b/tools/README @@ -1,4 +1,3 @@ - This directory tree contains tools used for the maintenance and testing of FreeBSD. There is no toplevel Makefile structure since these tools are not meant to be built as part of the standard system, diff --git a/tools/boot/smbios/Makefile b/tools/boot/smbios/Makefile --- a/tools/boot/smbios/Makefile +++ b/tools/boot/smbios/Makefile @@ -1,4 +1,3 @@ - PROG= smbios MAN= .PATH: ${SRCTOP}/stand/libsa diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/bsdbox/README b/tools/bsdbox/README --- a/tools/bsdbox/README +++ b/tools/bsdbox/README @@ -1,4 +1,3 @@ - This is a very cut down implementation of a "busybox" style binary for FreeBSD. diff --git a/tools/build/Makefile b/tools/build/Makefile --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../include LIB= egacy diff --git a/tools/build/bootstrap-m4/Makefile b/tools/build/bootstrap-m4/Makefile --- a/tools/build/bootstrap-m4/Makefile +++ b/tools/build/bootstrap-m4/Makefile @@ -1,4 +1,3 @@ - # Build a bootstrap version of m4 (needed in order to build libelf and lex) .PATH: ${SRCTOP}/usr.bin/m4 ${.CURDIR} diff --git a/tools/build/cross-build/Makefile b/tools/build/cross-build/Makefile --- a/tools/build/cross-build/Makefile +++ b/tools/build/cross-build/Makefile @@ -1,4 +1,3 @@ - NO_OBJ= SCRIPTS= date.sh hostname.sh BINDIR= /usr/bin diff --git a/tools/build/cross-build/fake_chflags/Makefile b/tools/build/cross-build/fake_chflags/Makefile --- a/tools/build/cross-build/fake_chflags/Makefile +++ b/tools/build/cross-build/fake_chflags/Makefile @@ -1,6 +1,5 @@ - NO_OBJ= SCRIPTS= chflags BINDIR= /usr/bin .include \ No newline at end of file diff --git a/tools/build/cross-build/mkimg/Makefile b/tools/build/cross-build/mkimg/Makefile --- a/tools/build/cross-build/mkimg/Makefile +++ b/tools/build/cross-build/mkimg/Makefile @@ -1,4 +1,3 @@ - # allow building mkimg as a host tool. MKIMG_SRC = ${SRCTOP}/usr.bin/mkimg diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -1,4 +1,3 @@ - .MAKE.MODE= normal # Failure is handled by the invoker, don't kill other legs of a parallel build. diff --git a/tools/build/make_check/check.mk b/tools/build/make_check/check.mk --- a/tools/build/make_check/check.mk +++ b/tools/build/make_check/check.mk @@ -1,4 +1,3 @@ - all: ${MK} ${MK_ARG} diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot --- a/tools/build/mk/Makefile.boot +++ b/tools/build/mk/Makefile.boot @@ -1,4 +1,3 @@ - CFLAGS+= -I${WORLDTMP}/legacy/usr/include DPADD+= ${WORLDTMP}/legacy/usr/lib/libegacy.a LDADD+= -legacy diff --git a/tools/build/mk/Makefile.boot.pre b/tools/build/mk/Makefile.boot.pre --- a/tools/build/mk/Makefile.boot.pre +++ b/tools/build/mk/Makefile.boot.pre @@ -1,4 +1,3 @@ - # Various MK_* options need to be set before including bsd.prog.mk/bsd.lib.mk .if ${.MAKE.OS} != "FreeBSD" # Most Linux distributions don't ship the .a files for static linking. diff --git a/tools/build/mk/bsd.lib.mk b/tools/build/mk/bsd.lib.mk --- a/tools/build/mk/bsd.lib.mk +++ b/tools/build/mk/bsd.lib.mk @@ -1,4 +1,3 @@ - .include "Makefile.boot.pre" # Don't build shared libraries during bootstrap NO_PIC= yes diff --git a/tools/build/mk/bsd.prog.mk b/tools/build/mk/bsd.prog.mk --- a/tools/build/mk/bsd.prog.mk +++ b/tools/build/mk/bsd.prog.mk @@ -1,4 +1,3 @@ - .include "Makefile.boot.pre" .include "../../../share/mk/bsd.prog.mk" .include "Makefile.boot" diff --git a/tools/bus_space/C/Makefile b/tools/bus_space/C/Makefile --- a/tools/bus_space/C/Makefile +++ b/tools/bus_space/C/Makefile @@ -1,4 +1,3 @@ - LIB= bus SHLIB_MAJOR= 0 SRCS= lang.c diff --git a/tools/bus_space/Makefile b/tools/bus_space/Makefile --- a/tools/bus_space/Makefile +++ b/tools/bus_space/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ C \ Python diff --git a/tools/bus_space/Makefile.inc b/tools/bus_space/Makefile.inc --- a/tools/bus_space/Makefile.inc +++ b/tools/bus_space/Makefile.inc @@ -1,3 +1,2 @@ - .PATH: ${.CURDIR}/.. SRCS+= bus.c busdma.c diff --git a/tools/bus_space/Python/Makefile b/tools/bus_space/Python/Makefile --- a/tools/bus_space/Python/Makefile +++ b/tools/bus_space/Python/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= bus.so SRCS= lang.c diff --git a/tools/debugscripts/README b/tools/debugscripts/README --- a/tools/debugscripts/README +++ b/tools/debugscripts/README @@ -1,4 +1,3 @@ - This directory contains gdb macros for kernel debugging. When you build a debug kernel, the target "gdbinit" in the kernel Makefile will create the correct .gdbinit files in the kernel build directory. To diff --git a/tools/diag/README b/tools/diag/README --- a/tools/diag/README +++ b/tools/diag/README @@ -1,4 +1,3 @@ - This directory is for diagnostic programs. A diagnostic program is one that will inform you that something is wrong diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile --- a/tools/diag/dumpvfscache/Makefile +++ b/tools/diag/dumpvfscache/Makefile @@ -1,4 +1,3 @@ - PROG= dumpvfscache LIBADD= kvm diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile --- a/tools/diag/localeck/Makefile +++ b/tools/diag/localeck/Makefile @@ -1,4 +1,3 @@ - PROG= localeck MAN= WARNS?= 4 diff --git a/tools/diag/prtblknos/Makefile b/tools/diag/prtblknos/Makefile --- a/tools/diag/prtblknos/Makefile +++ b/tools/diag/prtblknos/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin PROG= prtblknos diff --git a/tools/diag/prtblknos/README b/tools/diag/prtblknos/README --- a/tools/diag/prtblknos/README +++ b/tools/diag/prtblknos/README @@ -1,4 +1,3 @@ - This is a little C-program that can be used to print out the list of blocks used by a requested list of inodes. diff --git a/tools/kerneldoc/Makefile b/tools/kerneldoc/Makefile --- a/tools/kerneldoc/Makefile +++ b/tools/kerneldoc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../kern SRCS+= kern diff --git a/tools/kerneldoc/subsys/notreviewed.dox b/tools/kerneldoc/subsys/notreviewed.dox --- a/tools/kerneldoc/subsys/notreviewed.dox +++ b/tools/kerneldoc/subsys/notreviewed.dox @@ -1,4 +1,3 @@ - /** @mainpage * IMPORTANT: This API documentation may contain both functions which * are public and functions that are for internal use only. Since we have not diff --git a/tools/regression/README b/tools/regression/README --- a/tools/regression/README +++ b/tools/regression/README @@ -1,4 +1,3 @@ - This directory is for regression test programs. A regression test program is one that will exercise a particular bit of the diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile --- a/tools/regression/aio/aiop/Makefile +++ b/tools/regression/aio/aiop/Makefile @@ -1,4 +1,3 @@ - PROG= aiop MAN= diff --git a/tools/regression/bpf/Makefile b/tools/regression/bpf/Makefile --- a/tools/regression/bpf/Makefile +++ b/tools/regression/bpf/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bpf_filter .include diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -1,4 +1,3 @@ - TEST_CASES?= test0001 test0002 test0003 test0004 \ test0005 test0006 test0007 test0008 \ test0009 test0010 test0011 test0012 \ diff --git a/tools/regression/capsicum/syscalls/Makefile b/tools/regression/capsicum/syscalls/Makefile --- a/tools/regression/capsicum/syscalls/Makefile +++ b/tools/regression/capsicum/syscalls/Makefile @@ -1,4 +1,3 @@ - SYSCALLS= cap_fcntls_limit cap_getmode cap_ioctls_limit CFLAGS= -O2 -pipe -std=gnu99 -fstack-protector diff --git a/tools/regression/ccd/layout/b.c b/tools/regression/ccd/layout/b.c --- a/tools/regression/ccd/layout/b.c +++ b/tools/regression/ccd/layout/b.c @@ -1,4 +1,3 @@ - #include #include diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile --- a/tools/regression/doat/Makefile +++ b/tools/regression/doat/Makefile @@ -1,4 +1,3 @@ - PROG= doat MAN= diff --git a/tools/regression/doat/README b/tools/regression/doat/README --- a/tools/regression/doat/README +++ b/tools/regression/doat/README @@ -1,4 +1,3 @@ - This is a simple testing program for *at family of syscalls. It creates "tmp" subdirectory in a current directory and creates files etc. in it. diff --git a/tools/regression/ethernet/ethermulti/Makefile b/tools/regression/ethernet/ethermulti/Makefile --- a/tools/regression/ethernet/ethermulti/Makefile +++ b/tools/regression/ethernet/ethermulti/Makefile @@ -1,4 +1,3 @@ - PROG= ethermulti SRCS+= ethermulti.c MAN= diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile --- a/tools/regression/fsx/Makefile +++ b/tools/regression/fsx/Makefile @@ -1,4 +1,3 @@ - PROG= fsx MAN= diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile --- a/tools/regression/gaithrstress/Makefile +++ b/tools/regression/gaithrstress/Makefile @@ -1,4 +1,3 @@ - PROG= gaithrstress LIBADD= pthread diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile --- a/tools/regression/geom/ConfCmp/Makefile +++ b/tools/regression/geom/ConfCmp/Makefile @@ -1,4 +1,3 @@ - PROG= ConfCmp SRCS+= ConfCmp.c SRCS+= subr_sbuf.c diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile --- a/tools/regression/geom/MdLoad/Makefile +++ b/tools/regression/geom/MdLoad/Makefile @@ -1,4 +1,3 @@ - PROG= MdLoad LIBADD= sbuf bsdxml NO_OBJ= t diff --git a/tools/regression/geom_gpt/Makefile b/tools/regression/geom_gpt/Makefile --- a/tools/regression/geom_gpt/Makefile +++ b/tools/regression/geom_gpt/Makefile @@ -1,4 +1,3 @@ - PROG= gctl_test_helper MAN= diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile --- a/tools/regression/include/stdatomic/Makefile +++ b/tools/regression/include/stdatomic/Makefile @@ -1,4 +1,3 @@ - PROG= logic MAN= diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile --- a/tools/regression/include/tgmath/Makefile +++ b/tools/regression/include/tgmath/Makefile @@ -1,4 +1,3 @@ - PROG= tgmath CSTD= c99 CFLAGS+= -fno-builtin diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile --- a/tools/regression/kgssapi/Makefile +++ b/tools/regression/kgssapi/Makefile @@ -1,4 +1,3 @@ - PROG= gsstest MAN= WARNS?= 2 diff --git a/tools/regression/kthread/kld/Makefile b/tools/regression/kthread/kld/Makefile --- a/tools/regression/kthread/kld/Makefile +++ b/tools/regression/kthread/kld/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR} KMOD= kthrdlk diff --git a/tools/regression/lib/libc/regex/Makefile b/tools/regression/lib/libc/regex/Makefile --- a/tools/regression/lib/libc/regex/Makefile +++ b/tools/regression/lib/libc/regex/Makefile @@ -1,4 +1,3 @@ - GROT= ../../../../../lib/libc/regex/grot .PHONY: tests diff --git a/tools/regression/mlock/Makefile b/tools/regression/mlock/Makefile --- a/tools/regression/mlock/Makefile +++ b/tools/regression/mlock/Makefile @@ -1,4 +1,3 @@ - PROG= mlock MAN= diff --git a/tools/regression/net80211/ccmp/Makefile b/tools/regression/net80211/ccmp/Makefile --- a/tools/regression/net80211/ccmp/Makefile +++ b/tools/regression/net80211/ccmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_ccmp diff --git a/tools/regression/net80211/tkip/Makefile b/tools/regression/net80211/tkip/Makefile --- a/tools/regression/net80211/tkip/Makefile +++ b/tools/regression/net80211/tkip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_tkip diff --git a/tools/regression/net80211/wep/Makefile b/tools/regression/net80211/wep/Makefile --- a/tools/regression/net80211/wep/Makefile +++ b/tools/regression/net80211/wep/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_wep diff --git a/tools/regression/netinet/arphold/Makefile b/tools/regression/netinet/arphold/Makefile --- a/tools/regression/netinet/arphold/Makefile +++ b/tools/regression/netinet/arphold/Makefile @@ -1,4 +1,3 @@ - PROG= arphold MAN= CFLAGS+= -Wall diff --git a/tools/regression/netinet/msocket/Makefile b/tools/regression/netinet/msocket/Makefile --- a/tools/regression/netinet/msocket/Makefile +++ b/tools/regression/netinet/msocket/Makefile @@ -1,4 +1,3 @@ - PROG= msocket MAN= CFLAGS+= -Wall diff --git a/tools/regression/netinet/msocket_ifnet_remove/Makefile b/tools/regression/netinet/msocket_ifnet_remove/Makefile --- a/tools/regression/netinet/msocket_ifnet_remove/Makefile +++ b/tools/regression/netinet/msocket_ifnet_remove/Makefile @@ -1,4 +1,3 @@ - PROG= msocket_ifnet_remove WARNS?= 3 MAN= diff --git a/tools/regression/netinet/tcpconnect/README.tcp-md5 b/tools/regression/netinet/tcpconnect/README.tcp-md5 --- a/tools/regression/netinet/tcpconnect/README.tcp-md5 +++ b/tools/regression/netinet/tcpconnect/README.tcp-md5 @@ -1,4 +1,3 @@ - To test tcp-md5 do: * compile and install kernel with TCP_SIGNATURE support diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile --- a/tools/regression/netinet/tcpfullwindowrst/Makefile +++ b/tools/regression/netinet/tcpfullwindowrst/Makefile @@ -1,4 +1,3 @@ - PROG= tcpfullwindowrsttest MAN= diff --git a/tools/regression/netinet/udpconnectjail/Makefile b/tools/regression/netinet/udpconnectjail/Makefile --- a/tools/regression/netinet/udpconnectjail/Makefile +++ b/tools/regression/netinet/udpconnectjail/Makefile @@ -1,4 +1,3 @@ - PROG= udpconnectjail MAN= WARNS?= 2 diff --git a/tools/regression/netinet/udpzerobyte/Makefile b/tools/regression/netinet/udpzerobyte/Makefile --- a/tools/regression/netinet/udpzerobyte/Makefile +++ b/tools/regression/netinet/udpzerobyte/Makefile @@ -1,4 +1,3 @@ - PROG= udpzerobyte MAN= WARNS?= 2 diff --git a/tools/regression/nfsmmap/Makefile b/tools/regression/nfsmmap/Makefile --- a/tools/regression/nfsmmap/Makefile +++ b/tools/regression/nfsmmap/Makefile @@ -1,4 +1,3 @@ - SUBDIR= test1 test2 .include diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile --- a/tools/regression/nfsmmap/test1/Makefile +++ b/tools/regression/nfsmmap/test1/Makefile @@ -1,4 +1,3 @@ - PROG= test1 MAN= NFSSERVER?= herring.nlsystems.com diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile --- a/tools/regression/nfsmmap/test2/Makefile +++ b/tools/regression/nfsmmap/test2/Makefile @@ -1,4 +1,3 @@ - PROG= test2 MAN= NFSSERVER?= herring.nlsystems.com diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile --- a/tools/regression/p1003_1b/Makefile +++ b/tools/regression/p1003_1b/Makefile @@ -1,4 +1,3 @@ - PROG=p1003_1b SRCS=\ diff --git a/tools/regression/p1003_1b/README b/tools/regression/p1003_1b/README --- a/tools/regression/p1003_1b/README +++ b/tools/regression/p1003_1b/README @@ -1,4 +1,3 @@ - p1003_1b: Regression tests for the scheduling facilities. The following should always work as of the release of 4.0: diff --git a/tools/regression/p1003_1b/main.c b/tools/regression/p1003_1b/main.c --- a/tools/regression/p1003_1b/main.c +++ b/tools/regression/p1003_1b/main.c @@ -1,4 +1,3 @@ - #include #include diff --git a/tools/regression/poll/Readme b/tools/regression/poll/Readme --- a/tools/regression/poll/Readme +++ b/tools/regression/poll/Readme @@ -1,4 +1,3 @@ - The directory contains poll(2) and select(2) compliance (and more) tests from Bruce Evans, together with canned test results from several systems for reference. diff --git a/tools/regression/poll/pipepoll.c b/tools/regression/poll/pipepoll.c --- a/tools/regression/poll/pipepoll.c +++ b/tools/regression/poll/pipepoll.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tools/regression/poll/pipeselect.c b/tools/regression/poll/pipeselect.c --- a/tools/regression/poll/pipeselect.c +++ b/tools/regression/poll/pipeselect.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tools/regression/poll/sockpoll.c b/tools/regression/poll/sockpoll.c --- a/tools/regression/poll/sockpoll.c +++ b/tools/regression/poll/sockpoll.c @@ -1,4 +1,3 @@ - #define _GNU_SOURCE /* expose POLLRDHUP when testing on Linux */ #include diff --git a/tools/regression/posixsem/Makefile b/tools/regression/posixsem/Makefile --- a/tools/regression/posixsem/Makefile +++ b/tools/regression/posixsem/Makefile @@ -1,4 +1,3 @@ - PROG= posixsem SRCS= posixsem.c test.c LIBADD= kvm diff --git a/tools/regression/posixsem2/Makefile b/tools/regression/posixsem2/Makefile --- a/tools/regression/posixsem2/Makefile +++ b/tools/regression/posixsem2/Makefile @@ -1,4 +1,3 @@ - PROG= semtest SRCS= semtest.c MAN= diff --git a/tools/regression/posixsem2/semtest.c b/tools/regression/posixsem2/semtest.c --- a/tools/regression/posixsem2/semtest.c +++ b/tools/regression/posixsem2/semtest.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile --- a/tools/regression/pthread/cv_cancel1/Makefile +++ b/tools/regression/pthread/cv_cancel1/Makefile @@ -1,4 +1,3 @@ - PROG= cv_cancel1 MAN= LIBADD= pthread diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile --- a/tools/regression/pthread/mutex_isowned_np/Makefile +++ b/tools/regression/pthread/mutex_isowned_np/Makefile @@ -1,4 +1,3 @@ - PROG= mutex_isowned_np MAN= LIBADD= pthread diff --git a/tools/regression/pthread/unwind/Test.cpp b/tools/regression/pthread/unwind/Test.cpp --- a/tools/regression/pthread/unwind/Test.cpp +++ b/tools/regression/pthread/unwind/Test.cpp @@ -1,4 +1,3 @@ - static int destructed; static int destructed2; diff --git a/tools/regression/redzone9/Makefile b/tools/regression/redzone9/Makefile --- a/tools/regression/redzone9/Makefile +++ b/tools/regression/redzone9/Makefile @@ -1,4 +1,3 @@ - KMOD= redzone SRCS= redzone.c diff --git a/tools/regression/redzone9/README b/tools/regression/redzone9/README --- a/tools/regression/redzone9/README +++ b/tools/regression/redzone9/README @@ -1,4 +1,3 @@ - To verify that redzone(9) works properly: # make diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile --- a/tools/regression/rpcsec_gss/Makefile +++ b/tools/regression/rpcsec_gss/Makefile @@ -1,4 +1,3 @@ - PROG= rpctest MAN= LIBADD= rpcsec_gss diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile --- a/tools/regression/security/access/Makefile +++ b/tools/regression/security/access/Makefile @@ -1,4 +1,3 @@ - PROG= testaccess MAN= diff --git a/tools/regression/security/cap_test/Makefile b/tools/regression/security/cap_test/Makefile --- a/tools/regression/security/cap_test/Makefile +++ b/tools/regression/security/cap_test/Makefile @@ -1,4 +1,3 @@ - PROG= cap_test SRCS= cap_test.c \ cap_test_capmode.c \ diff --git a/tools/regression/security/open_to_operation/Makefile b/tools/regression/security/open_to_operation/Makefile --- a/tools/regression/security/open_to_operation/Makefile +++ b/tools/regression/security/open_to_operation/Makefile @@ -1,4 +1,3 @@ - PROG= open_to_operation MAN= WARNS?= 3 diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile --- a/tools/regression/security/proc_to_proc/Makefile +++ b/tools/regression/security/proc_to_proc/Makefile @@ -1,4 +1,3 @@ - PROG= testuid MAN= diff --git a/tools/regression/security/proc_to_proc/README b/tools/regression/security/proc_to_proc/README --- a/tools/regression/security/proc_to_proc/README +++ b/tools/regression/security/proc_to_proc/README @@ -1,4 +1,3 @@ - Inter-Process Authorization Test Suite Robert Watson, TrustedBSD Project diff --git a/tools/regression/sigqueue/Makefile b/tools/regression/sigqueue/Makefile --- a/tools/regression/sigqueue/Makefile +++ b/tools/regression/sigqueue/Makefile @@ -1,4 +1,3 @@ - SUBDIR=sigqtest1 sigqtest2 .include diff --git a/tools/regression/sigqueue/sigqtest1/Makefile b/tools/regression/sigqueue/sigqtest1/Makefile --- a/tools/regression/sigqueue/sigqtest1/Makefile +++ b/tools/regression/sigqueue/sigqtest1/Makefile @@ -1,4 +1,3 @@ - PROG=sigqtest1 MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sigqueue/sigqtest2/Makefile b/tools/regression/sigqueue/sigqtest2/Makefile --- a/tools/regression/sigqueue/sigqtest2/Makefile +++ b/tools/regression/sigqueue/sigqtest2/Makefile @@ -1,4 +1,3 @@ - PROG=sigqtest2 MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile --- a/tools/regression/sockets/listen_backlog/Makefile +++ b/tools/regression/sockets/listen_backlog/Makefile @@ -1,4 +1,3 @@ - PROG= listen_backlog MAN= diff --git a/tools/regression/sockets/listen_kqueue/Makefile b/tools/regression/sockets/listen_kqueue/Makefile --- a/tools/regression/sockets/listen_kqueue/Makefile +++ b/tools/regression/sockets/listen_kqueue/Makefile @@ -1,4 +1,3 @@ - PROG= listen_kqueue MAN= diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile --- a/tools/regression/sockets/pr_atomic/Makefile +++ b/tools/regression/sockets/pr_atomic/Makefile @@ -1,4 +1,3 @@ - PROG= pr_atomic MAN= diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile --- a/tools/regression/sockets/rtsocket/Makefile +++ b/tools/regression/sockets/rtsocket/Makefile @@ -1,4 +1,3 @@ - PROG= rtsocket MAN= diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile --- a/tools/regression/sockets/so_setfib/Makefile +++ b/tools/regression/sockets/so_setfib/Makefile @@ -1,4 +1,3 @@ - .include PROG= so_setfib diff --git a/tools/regression/sockets/udp_pingpong/Makefile b/tools/regression/sockets/udp_pingpong/Makefile --- a/tools/regression/sockets/udp_pingpong/Makefile +++ b/tools/regression/sockets/udp_pingpong/Makefile @@ -1,4 +1,3 @@ - PROG= udp_pingpong MAN= diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile --- a/tools/regression/sockets/unix_bindconnect/Makefile +++ b/tools/regression/sockets/unix_bindconnect/Makefile @@ -1,4 +1,3 @@ - PROG= unix_bindconnect MAN= diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile --- a/tools/regression/sockets/unix_close_race/Makefile +++ b/tools/regression/sockets/unix_close_race/Makefile @@ -1,4 +1,3 @@ - PROG= unix_close_race MAN= diff --git a/tools/regression/sockets/unix_cmsg/Makefile b/tools/regression/sockets/unix_cmsg/Makefile --- a/tools/regression/sockets/unix_cmsg/Makefile +++ b/tools/regression/sockets/unix_cmsg/Makefile @@ -1,4 +1,3 @@ - PROG= unix_cmsg SRCS= ${AUTOSRCS} unix_cmsg.c uc_common.h uc_common.c \ t_generic.h t_generic.c t_peercred.h t_peercred.c \ diff --git a/tools/regression/sockets/unix_cmsg/README b/tools/regression/sockets/unix_cmsg/README --- a/tools/regression/sockets/unix_cmsg/README +++ b/tools/regression/sockets/unix_cmsg/README @@ -1,4 +1,3 @@ - About unix_cmsg =============== diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile --- a/tools/regression/sockets/unix_gc/Makefile +++ b/tools/regression/sockets/unix_gc/Makefile @@ -1,4 +1,3 @@ - PROG= unix_gc MAN= diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile --- a/tools/regression/sockets/unix_sendtorace/Makefile +++ b/tools/regression/sockets/unix_sendtorace/Makefile @@ -1,4 +1,3 @@ - PROG= unix_sendtorace MAN= diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile --- a/tools/regression/sockets/unix_socket/Makefile +++ b/tools/regression/sockets/unix_socket/Makefile @@ -1,4 +1,3 @@ - PROG= unix_socket MAN= diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile --- a/tools/regression/sockets/unix_sorflush/Makefile +++ b/tools/regression/sockets/unix_sorflush/Makefile @@ -1,4 +1,3 @@ - PROG= unix_sorflush MAN= diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile --- a/tools/regression/sockets/zerosend/Makefile +++ b/tools/regression/sockets/zerosend/Makefile @@ -1,4 +1,3 @@ - PROG= zerosend MAN= diff --git a/tools/regression/sysvmsg/README b/tools/regression/sysvmsg/README --- a/tools/regression/sysvmsg/README +++ b/tools/regression/sysvmsg/README @@ -1,4 +1,3 @@ - SysV IPC Message Queue Regression Utility. This regression utility will test the SysV Message Queue facility diff --git a/tools/regression/sysvsem/README b/tools/regression/sysvsem/README --- a/tools/regression/sysvsem/README +++ b/tools/regression/sysvsem/README @@ -1,4 +1,3 @@ - SysV IPC Semaphore Regression Utility. This regression utility will test the SysV semaphore functionality diff --git a/tools/regression/sysvshm/README b/tools/regression/sysvshm/README --- a/tools/regression/sysvshm/README +++ b/tools/regression/sysvshm/README @@ -1,4 +1,3 @@ - SysV IPC Shared Memory Regression Utility. This regression utility will test the SysV Shared Memory facility diff --git a/tools/regression/tls/Makefile b/tools/regression/tls/Makefile --- a/tools/regression/tls/Makefile +++ b/tools/regression/tls/Makefile @@ -1,4 +1,3 @@ - SUBDIR=libxx libyy ttls1 ttls2 ttls4 .if ${MACHINE_ARCH} == "i386" diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile --- a/tools/regression/tls/libxx/Makefile +++ b/tools/regression/tls/libxx/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= libxx.so SRCS= xx.c diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c --- a/tools/regression/tls/libxx/xx.c +++ b/tools/regression/tls/libxx/xx.c @@ -1,4 +1,3 @@ - extern int __thread yy1; int __thread xx1 = 1; int __thread xx2 = 2; diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile --- a/tools/regression/tls/libyy/Makefile +++ b/tools/regression/tls/libyy/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= libyy.so SRCS= yy.c diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c --- a/tools/regression/tls/libyy/yy.c +++ b/tools/regression/tls/libyy/yy.c @@ -1,2 +1 @@ - int __thread yy1 = 101; diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -1,4 +1,3 @@ - PROG= ttls1 LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy diff --git a/tools/regression/tls/ttls1/ttls1.c b/tools/regression/tls/ttls1/ttls1.c --- a/tools/regression/tls/ttls1/ttls1.c +++ b/tools/regression/tls/ttls1/ttls1.c @@ -1,4 +1,3 @@ - #include extern int __thread xx1; diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -1,4 +1,3 @@ - PROG= ttls2 LIBADD= pthread MAN= diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c --- a/tools/regression/tls/ttls2/ttls2.c +++ b/tools/regression/tls/ttls2/ttls2.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile --- a/tools/regression/tls/ttls3/Makefile +++ b/tools/regression/tls/ttls3/Makefile @@ -1,4 +1,3 @@ - all: ttls3 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile --- a/tools/regression/tls/ttls4/Makefile +++ b/tools/regression/tls/ttls4/Makefile @@ -1,4 +1,3 @@ - PROG= ttls4 LIBADD= pthread MAN= diff --git a/tools/regression/ufs/uprintf/Makefile b/tools/regression/ufs/uprintf/Makefile --- a/tools/regression/ufs/uprintf/Makefile +++ b/tools/regression/ufs/uprintf/Makefile @@ -1,4 +1,3 @@ - PROG= ufs_uprintf WARNS?= 3 MAN= diff --git a/tools/regression/usr.bin/cc/Makefile b/tools/regression/usr.bin/cc/Makefile --- a/tools/regression/usr.bin/cc/Makefile +++ b/tools/regression/usr.bin/cc/Makefile @@ -1,4 +1,3 @@ - TESTS= float CFLAGS+=-lm diff --git a/tools/regression/usr.bin/env/Makefile b/tools/regression/usr.bin/env/Makefile --- a/tools/regression/usr.bin/env/Makefile +++ b/tools/regression/usr.bin/env/Makefile @@ -1,4 +1,3 @@ - TESTPGM?=TestProgramNotSpecifed all: diff --git a/tools/regression/zfs/LICENSE b/tools/regression/zfs/LICENSE --- a/tools/regression/zfs/LICENSE +++ b/tools/regression/zfs/LICENSE @@ -1,4 +1,3 @@ - License for all ZFS regression tests: Copyright (c) 2008 Pawel Jakub Dawidek diff --git a/tools/regression/zfs/misc.sh b/tools/regression/zfs/misc.sh --- a/tools/regression/zfs/misc.sh +++ b/tools/regression/zfs/misc.sh @@ -1,4 +1,3 @@ - ntest=1 os=`uname -s` diff --git a/tools/test/README b/tools/test/README --- a/tools/test/README +++ b/tools/test/README @@ -1,4 +1,3 @@ - This directory is for standalone test programs. For the FreeBSD Test Suite, which uses Kyua, please see /usr/src/tests/ diff --git a/tools/test/auxinfo/Makefile b/tools/test/auxinfo/Makefile --- a/tools/test/auxinfo/Makefile +++ b/tools/test/auxinfo/Makefile @@ -1,4 +1,3 @@ - PROG= auxinfo MAN= diff --git a/tools/test/bsnmp/Makefile b/tools/test/bsnmp/Makefile --- a/tools/test/bsnmp/Makefile +++ b/tools/test/bsnmp/Makefile @@ -1,4 +1,3 @@ - CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/tests diff --git a/tools/test/callout_free/Makefile b/tools/test/callout_free/Makefile --- a/tools/test/callout_free/Makefile +++ b/tools/test/callout_free/Makefile @@ -1,4 +1,3 @@ - KMOD= callout_free SRCS= callout_free.c diff --git a/tools/test/gpioevents/Makefile b/tools/test/gpioevents/Makefile --- a/tools/test/gpioevents/Makefile +++ b/tools/test/gpioevents/Makefile @@ -1,4 +1,3 @@ - PROG= gpioevents SRCS= gpioevents.c diff --git a/tools/test/iconv/Makefile b/tools/test/iconv/Makefile --- a/tools/test/iconv/Makefile +++ b/tools/test/iconv/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tablegen refgen posix gnu ENCODING= ASCII ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 ISO8859-6 \ diff --git a/tools/test/iconv/gnu/Makefile b/tools/test/iconv/gnu/Makefile --- a/tools/test/iconv/gnu/Makefile +++ b/tools/test/iconv/gnu/Makefile @@ -1,4 +1,3 @@ - PROG= gnu MAN= diff --git a/tools/test/iconv/posix/Makefile b/tools/test/iconv/posix/Makefile --- a/tools/test/iconv/posix/Makefile +++ b/tools/test/iconv/posix/Makefile @@ -1,4 +1,3 @@ - PROG= posix MAN= diff --git a/tools/test/iconv/refgen/Makefile b/tools/test/iconv/refgen/Makefile --- a/tools/test/iconv/refgen/Makefile +++ b/tools/test/iconv/refgen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../tablegen PROG= refgen diff --git a/tools/test/iconv/tablegen/Makefile b/tools/test/iconv/tablegen/Makefile --- a/tools/test/iconv/tablegen/Makefile +++ b/tools/test/iconv/tablegen/Makefile @@ -1,4 +1,3 @@ - PROG= tablegen MAN= diff --git a/tools/test/net/Makefile b/tools/test/net/Makefile --- a/tools/test/net/Makefile +++ b/tools/test/net/Makefile @@ -1,4 +1,3 @@ - PROGS= listen connect MAN= diff --git a/tools/test/netfibs/Makefile b/tools/test/netfibs/Makefile --- a/tools/test/netfibs/Makefile +++ b/tools/test/netfibs/Makefile @@ -1,4 +1,3 @@ - PROG= reflect MAN= diff --git a/tools/test/netfibs/README b/tools/test/netfibs/README --- a/tools/test/netfibs/README +++ b/tools/test/netfibs/README @@ -1,4 +1,3 @@ - This directory holds scripts and a support program for multiple test cases exercising multi-IP FIBs. At this time only IPv6 test cases are provided. diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile --- a/tools/test/ppsapi/Makefile +++ b/tools/test/ppsapi/Makefile @@ -1,4 +1,3 @@ - PROG= ppsapitest MAN= diff --git a/tools/test/ppsapi/README b/tools/test/ppsapi/README --- a/tools/test/ppsapi/README +++ b/tools/test/ppsapi/README @@ -1,4 +1,3 @@ - This is a small test program which I have had around since we wrote the RFC 2783 API. diff --git a/tools/test/ptrace/Makefile b/tools/test/ptrace/Makefile --- a/tools/test/ptrace/Makefile +++ b/tools/test/ptrace/Makefile @@ -1,4 +1,3 @@ - PROG= scescx MAN= diff --git a/tools/test/sort/regression/Makefile b/tools/test/sort/regression/Makefile --- a/tools/test/sort/regression/Makefile +++ b/tools/test/sort/regression/Makefile @@ -1,4 +1,3 @@ - TESTFILE= test01 test02 test03 test04 test05 test06 test07 test08 \ test09 test10 test11 test12 test13 test14 test15 test16 test17 \ test_nums diff --git a/tools/test/sort/regression/data/test01 b/tools/test/sort/regression/data/test01 --- a/tools/test/sort/regression/data/test01 +++ b/tools/test/sort/regression/data/test01 @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01 b/tools/test/sort/regression/ref/test01 --- a/tools/test/sort/regression/ref/test01 +++ b/tools/test/sort/regression/ref/test01 @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01M b/tools/test/sort/regression/ref/test01M --- a/tools/test/sort/regression/ref/test01M +++ b/tools/test/sort/regression/ref/test01M @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01b b/tools/test/sort/regression/ref/test01b --- a/tools/test/sort/regression/ref/test01b +++ b/tools/test/sort/regression/ref/test01b @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01bd b/tools/test/sort/regression/ref/test01bd --- a/tools/test/sort/regression/ref/test01bd +++ b/tools/test/sort/regression/ref/test01bd @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01bs b/tools/test/sort/regression/ref/test01bs --- a/tools/test/sort/regression/ref/test01bs +++ b/tools/test/sort/regression/ref/test01bs @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01bu b/tools/test/sort/regression/ref/test01bu --- a/tools/test/sort/regression/ref/test01bu +++ b/tools/test/sort/regression/ref/test01bu @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01f b/tools/test/sort/regression/ref/test01f --- a/tools/test/sort/regression/ref/test01f +++ b/tools/test/sort/regression/ref/test01f @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01fs b/tools/test/sort/regression/ref/test01fs --- a/tools/test/sort/regression/ref/test01fs +++ b/tools/test/sort/regression/ref/test01fs @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01fu b/tools/test/sort/regression/ref/test01fu --- a/tools/test/sort/regression/ref/test01fu +++ b/tools/test/sort/regression/ref/test01fu @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01g b/tools/test/sort/regression/ref/test01g --- a/tools/test/sort/regression/ref/test01g +++ b/tools/test/sort/regression/ref/test01g @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01gs b/tools/test/sort/regression/ref/test01gs --- a/tools/test/sort/regression/ref/test01gs +++ b/tools/test/sort/regression/ref/test01gs @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01gu b/tools/test/sort/regression/ref/test01gu --- a/tools/test/sort/regression/ref/test01gu +++ b/tools/test/sort/regression/ref/test01gu @@ -1 +0,0 @@ - diff --git a/tools/test/sort/regression/ref/test01i b/tools/test/sort/regression/ref/test01i --- a/tools/test/sort/regression/ref/test01i +++ b/tools/test/sort/regression/ref/test01i @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01n b/tools/test/sort/regression/ref/test01n --- a/tools/test/sort/regression/ref/test01n +++ b/tools/test/sort/regression/ref/test01n @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01ns b/tools/test/sort/regression/ref/test01ns --- a/tools/test/sort/regression/ref/test01ns +++ b/tools/test/sort/regression/ref/test01ns @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/sort/regression/ref/test01nu b/tools/test/sort/regression/ref/test01nu --- a/tools/test/sort/regression/ref/test01nu +++ b/tools/test/sort/regression/ref/test01nu @@ -1 +0,0 @@ - diff --git a/tools/test/sort/regression/ref/test01u b/tools/test/sort/regression/ref/test01u --- a/tools/test/sort/regression/ref/test01u +++ b/tools/test/sort/regression/ref/test01u @@ -1,3 +1,2 @@ - flyer root diff --git a/tools/test/upsdl/Makefile b/tools/test/upsdl/Makefile --- a/tools/test/upsdl/Makefile +++ b/tools/test/upsdl/Makefile @@ -1,4 +1,3 @@ - PROG= upsdl MAN= diff --git a/tools/test/vm86/Makefile b/tools/test/vm86/Makefile --- a/tools/test/vm86/Makefile +++ b/tools/test/vm86/Makefile @@ -1,4 +1,3 @@ - all: vm86_test vm86_test: vm86_test_asm.s vm86_test.c diff --git a/tools/test/xregs_sig/Makefile b/tools/test/xregs_sig/Makefile --- a/tools/test/xregs_sig/Makefile +++ b/tools/test/xregs_sig/Makefile @@ -1,4 +1,3 @@ - .include PROG= xregs_sig diff --git a/tools/tools/README b/tools/tools/README --- a/tools/tools/README +++ b/tools/tools/README @@ -1,4 +1,3 @@ - This directory is for tools. A tool is something which is sometimes useful, and doesn't fit any of diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile --- a/tools/tools/aac/Makefile +++ b/tools/tools/aac/Makefile @@ -1,4 +1,3 @@ - PROG= aac_checkq MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/ansify/Makefile b/tools/tools/ansify/Makefile --- a/tools/tools/ansify/Makefile +++ b/tools/tools/ansify/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= ansify.pl BINDIR?= /usr/local/bin diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile --- a/tools/tools/ath/Makefile +++ b/tools/tools/ath/Makefile @@ -1,4 +1,3 @@ - SUBDIR= arcode athdebug athdecode athkey athpoke athprom athrd athregs athalq SUBDIR+= athstats ath_prom_read athradar athaggrstats SUBDIR+= ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print ath_ee_9300_print diff --git a/tools/tools/ath/Makefile.inc b/tools/tools/ath/Makefile.inc --- a/tools/tools/ath/Makefile.inc +++ b/tools/tools/ath/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/ath/arcode/Makefile b/tools/tools/ath/arcode/Makefile --- a/tools/tools/ath/arcode/Makefile +++ b/tools/tools/ath/arcode/Makefile @@ -1,4 +1,3 @@ - PROG= arcode MAN= diff --git a/tools/tools/ath/ath_ee_9287_print/9287.h b/tools/tools/ath/ath_ee_9287_print/9287.h --- a/tools/tools/ath/ath_ee_9287_print/9287.h +++ b/tools/tools/ath/ath_ee_9287_print/9287.h @@ -1,4 +1,3 @@ - #ifndef __9287_H__ #define __9287_H__ diff --git a/tools/tools/ath/ath_ee_9287_print/Makefile b/tools/tools/ath/ath_ee_9287_print/Makefile --- a/tools/tools/ath/ath_ee_9287_print/Makefile +++ b/tools/tools/ath/ath_ee_9287_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_9287_print diff --git a/tools/tools/ath/ath_ee_9287_print/eeprom.h b/tools/tools/ath/ath_ee_9287_print/eeprom.h --- a/tools/tools/ath/ath_ee_9287_print/eeprom.h +++ b/tools/tools/ath/ath_ee_9287_print/eeprom.h @@ -1,4 +1,3 @@ - #ifndef __EEPROM_H__ #define __EEPROM_H__ diff --git a/tools/tools/ath/ath_ee_9287_print/eeprom.c b/tools/tools/ath/ath_ee_9287_print/eeprom.c --- a/tools/tools/ath/ath_ee_9287_print/eeprom.c +++ b/tools/tools/ath/ath_ee_9287_print/eeprom.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_9287_print/main.c b/tools/tools/ath/ath_ee_9287_print/main.c --- a/tools/tools/ath/ath_ee_9287_print/main.c +++ b/tools/tools/ath/ath_ee_9287_print/main.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile b/tools/tools/ath/ath_ee_9300_print/Makefile --- a/tools/tools/ath/ath_ee_9300_print/Makefile +++ b/tools/tools/ath/ath_ee_9300_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_9300_print diff --git a/tools/tools/ath/ath_ee_9300_print/main.c b/tools/tools/ath/ath_ee_9300_print/main.c --- a/tools/tools/ath/ath_ee_9300_print/main.c +++ b/tools/tools/ath/ath_ee_9300_print/main.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_v14_print/Makefile b/tools/tools/ath/ath_ee_v14_print/Makefile --- a/tools/tools/ath/ath_ee_v14_print/Makefile +++ b/tools/tools/ath/ath_ee_v14_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_v14_print diff --git a/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c b/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c --- a/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c +++ b/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_v4k_print/Makefile b/tools/tools/ath/ath_ee_v4k_print/Makefile --- a/tools/tools/ath/ath_ee_v4k_print/Makefile +++ b/tools/tools/ath/ath_ee_v4k_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_v4k_print diff --git a/tools/tools/ath/ath_ee_v4k_print/eeprom.h b/tools/tools/ath/ath_ee_v4k_print/eeprom.h --- a/tools/tools/ath/ath_ee_v4k_print/eeprom.h +++ b/tools/tools/ath/ath_ee_v4k_print/eeprom.h @@ -1,4 +1,3 @@ - #ifndef __EEPROM_H__ #define __EEPROM_H__ diff --git a/tools/tools/ath/ath_ee_v4k_print/eeprom.c b/tools/tools/ath/ath_ee_v4k_print/eeprom.c --- a/tools/tools/ath/ath_ee_v4k_print/eeprom.c +++ b/tools/tools/ath/ath_ee_v4k_print/eeprom.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_v4k_print/main.c b/tools/tools/ath/ath_ee_v4k_print/main.c --- a/tools/tools/ath/ath_ee_v4k_print/main.c +++ b/tools/tools/ath/ath_ee_v4k_print/main.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_ee_v4k_print/v4k.h b/tools/tools/ath/ath_ee_v4k_print/v4k.h --- a/tools/tools/ath/ath_ee_v4k_print/v4k.h +++ b/tools/tools/ath/ath_ee_v4k_print/v4k.h @@ -1,4 +1,3 @@ - #ifndef __V4K_H__ #define __V4K_H__ diff --git a/tools/tools/ath/ath_ee_v4k_print/v4k.c b/tools/tools/ath/ath_ee_v4k_print/v4k.c --- a/tools/tools/ath/ath_ee_v4k_print/v4k.c +++ b/tools/tools/ath/ath_ee_v4k_print/v4k.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd. * diff --git a/tools/tools/ath/ath_prom_read/Makefile b/tools/tools/ath/ath_prom_read/Makefile --- a/tools/tools/ath/ath_prom_read/Makefile +++ b/tools/tools/ath/ath_prom_read/Makefile @@ -1,4 +1,3 @@ - PROG= ath_prom_read .include diff --git a/tools/tools/ath/athaggrstats/Makefile b/tools/tools/ath/athaggrstats/Makefile --- a/tools/tools/ath/athaggrstats/Makefile +++ b/tools/tools/ath/athaggrstats/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= athaggrstats diff --git a/tools/tools/ath/athalq/Makefile b/tools/tools/ath/athalq/Makefile --- a/tools/tools/ath/athalq/Makefile +++ b/tools/tools/ath/athalq/Makefile @@ -1,4 +1,3 @@ - PROG= athalq MAN= diff --git a/tools/tools/ath/athani/Makefile b/tools/tools/ath/athani/Makefile --- a/tools/tools/ath/athani/Makefile +++ b/tools/tools/ath/athani/Makefile @@ -1,4 +1,3 @@ - PROG= athani MAN= diff --git a/tools/tools/ath/athdebug/Makefile b/tools/tools/ath/athdebug/Makefile --- a/tools/tools/ath/athdebug/Makefile +++ b/tools/tools/ath/athdebug/Makefile @@ -1,4 +1,3 @@ - PROG= athdebug .include <../Makefile.inc> diff --git a/tools/tools/ath/athkey/Makefile b/tools/tools/ath/athkey/Makefile --- a/tools/tools/ath/athkey/Makefile +++ b/tools/tools/ath/athkey/Makefile @@ -1,4 +1,3 @@ - PROG= athkey SRCS= athkey.c diff --git a/tools/tools/ath/athpoke/Makefile b/tools/tools/ath/athpoke/Makefile --- a/tools/tools/ath/athpoke/Makefile +++ b/tools/tools/ath/athpoke/Makefile @@ -1,4 +1,3 @@ - PROG= athpoke LINKS= ${BINDIR}/${PROG} ${BINDIR}/athpeek diff --git a/tools/tools/ath/athpow/Makefile b/tools/tools/ath/athpow/Makefile --- a/tools/tools/ath/athpow/Makefile +++ b/tools/tools/ath/athpow/Makefile @@ -1,4 +1,3 @@ - PROG= athpow .include <../Makefile.inc> diff --git a/tools/tools/ath/athprom/Makefile b/tools/tools/ath/athprom/Makefile --- a/tools/tools/ath/athprom/Makefile +++ b/tools/tools/ath/athprom/Makefile @@ -1,4 +1,3 @@ - PROG= athprom .include <../Makefile.inc> diff --git a/tools/tools/ath/athradar/Makefile b/tools/tools/ath/athradar/Makefile --- a/tools/tools/ath/athradar/Makefile +++ b/tools/tools/ath/athradar/Makefile @@ -1,4 +1,3 @@ - PROG= athradar .include <../Makefile.inc> diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile --- a/tools/tools/ath/athratestats/Makefile +++ b/tools/tools/ath/athratestats/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal .PATH: ${.CURDIR}/../../../../sys/dev/ath/ diff --git a/tools/tools/ath/athrd/Makefile b/tools/tools/ath/athrd/Makefile --- a/tools/tools/ath/athrd/Makefile +++ b/tools/tools/ath/athrd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= athrd diff --git a/tools/tools/ath/athrd/run.sh b/tools/tools/ath/athrd/run.sh --- a/tools/tools/ath/athrd/run.sh +++ b/tools/tools/ath/athrd/run.sh @@ -1,4 +1,3 @@ - COUNTRIES=${@:-" DB NA AL DZ AR AM AU AT AZ BH BY BE BZ BO BR BN BG CA CL CN CO CR HR CY CZ DK DO EC EG SV EE FI FR GE diff --git a/tools/tools/ath/athregs/Makefile b/tools/tools/ath/athregs/Makefile --- a/tools/tools/ath/athregs/Makefile +++ b/tools/tools/ath/athregs/Makefile @@ -1,4 +1,3 @@ - PROG= athregs CFLAGS+= -I${.CURDIR}/../common/ diff --git a/tools/tools/ath/athspectral/Makefile b/tools/tools/ath/athspectral/Makefile --- a/tools/tools/ath/athspectral/Makefile +++ b/tools/tools/ath/athspectral/Makefile @@ -1,4 +1,3 @@ - PROG= athspectral .include <../Makefile.inc> diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile --- a/tools/tools/ath/athstats/Makefile +++ b/tools/tools/ath/athstats/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/tools/ath/athsurvey/Makefile b/tools/tools/ath/athsurvey/Makefile --- a/tools/tools/ath/athsurvey/Makefile +++ b/tools/tools/ath/athsurvey/Makefile @@ -1,4 +1,3 @@ - PROG= athsurvey .include <../Makefile.inc> diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile --- a/tools/tools/bootparttest/Makefile +++ b/tools/tools/bootparttest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/stand/common BINDIR?= /usr/bin diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile --- a/tools/tools/cfi/Makefile +++ b/tools/tools/cfi/Makefile @@ -1,4 +1,3 @@ - PROG= cfi BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/crypto/README b/tools/tools/crypto/README --- a/tools/tools/crypto/README +++ b/tools/tools/crypto/README @@ -1,4 +1,3 @@ - The cryptotest program repeatedly encrypts and decrypts a buffer with the built-in iv and key, using hardware crypto. At the end, it computes the data rate achieved. Operations are carried out by diff --git a/tools/tools/cxgbtool/Makefile b/tools/tools/cxgbtool/Makefile --- a/tools/tools/cxgbtool/Makefile +++ b/tools/tools/cxgbtool/Makefile @@ -1,4 +1,3 @@ - PROG= cxgbtool SRCS= cxgbtool.c MAN= diff --git a/tools/tools/decioctl/Makefile b/tools/tools/decioctl/Makefile --- a/tools/tools/decioctl/Makefile +++ b/tools/tools/decioctl/Makefile @@ -1,4 +1,3 @@ - PROG= decioctl SRCS= decioctl.c MAN= diff --git a/tools/tools/dmardump/Makefile b/tools/tools/dmardump/Makefile --- a/tools/tools/dmardump/Makefile +++ b/tools/tools/dmardump/Makefile @@ -1,4 +1,3 @@ - PROG= dmardump SRCS= dmardump.c MAN= diff --git a/tools/tools/drm/README b/tools/tools/drm/README --- a/tools/tools/drm/README +++ b/tools/tools/drm/README @@ -1,4 +1,3 @@ - gen-drm_pciids Generate drm_pciids.h based on Linux' drm_pciids.h, FreeBSD's drm_pciids.h and misc/pciids database. radeon Tools specific to the Radeon device driver. diff --git a/tools/tools/drm/radeon/README b/tools/tools/drm/radeon/README --- a/tools/tools/drm/radeon/README +++ b/tools/tools/drm/radeon/README @@ -1,3 +1,2 @@ - firmwares Tools to handle Radeon firmwares imported into the tree. mkregtable Generate headers used to build the Radeon driver. diff --git a/tools/tools/drm/radeon/firmwares/README b/tools/tools/drm/radeon/firmwares/README --- a/tools/tools/drm/radeon/firmwares/README +++ b/tools/tools/drm/radeon/firmwares/README @@ -1,4 +1,3 @@ - To update firmwares: 1. Clone the following Git repository: diff --git a/tools/tools/drm/radeon/mkregtable/Makefile b/tools/tools/drm/radeon/mkregtable/Makefile --- a/tools/tools/drm/radeon/mkregtable/Makefile +++ b/tools/tools/drm/radeon/mkregtable/Makefile @@ -1,4 +1,3 @@ - all: regtables PROG= mkregtable diff --git a/tools/tools/drm/radeon/mkregtable/README b/tools/tools/drm/radeon/mkregtable/README --- a/tools/tools/drm/radeon/mkregtable/README +++ b/tools/tools/drm/radeon/mkregtable/README @@ -1,4 +1,3 @@ - "mkregtable" is a tool used to generate headers for the radeonkms driver. Headers are regenerated by running "make" in this directory. diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile --- a/tools/tools/find-sb/Makefile +++ b/tools/tools/find-sb/Makefile @@ -1,4 +1,3 @@ - PROG= find-sb MAN= diff --git a/tools/tools/find-sb/README b/tools/tools/find-sb/README --- a/tools/tools/find-sb/README +++ b/tools/tools/find-sb/README @@ -1,4 +1,3 @@ - find-sb is a program which scans the input file you specify (normally a raw disk slice) for filesystems. It's not very smart, nor particularly efficient. All it does is read the input file one device block at a time, diff --git a/tools/tools/fixwhite/Makefile b/tools/tools/fixwhite/Makefile --- a/tools/tools/fixwhite/Makefile +++ b/tools/tools/fixwhite/Makefile @@ -1,4 +1,3 @@ - PROG= fixwhite BINDIR= /usr/bin diff --git a/tools/tools/genericize/Makefile b/tools/tools/genericize/Makefile --- a/tools/tools/genericize/Makefile +++ b/tools/tools/genericize/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= genericize.pl BINDIR?= /usr/local/bin diff --git a/tools/tools/git/HOWTO b/tools/tools/git/HOWTO --- a/tools/tools/git/HOWTO +++ b/tools/tools/git/HOWTO @@ -1,4 +1,3 @@ - This directory contains tools intended to help committers use git when interacting with standard FreeBSD project resources like Differential. diff --git a/tools/tools/hcomp/Makefile b/tools/tools/hcomp/Makefile --- a/tools/tools/hcomp/Makefile +++ b/tools/tools/hcomp/Makefile @@ -1,4 +1,3 @@ - BINDIR ?= ${HOME}/bin BINOWN ?= ${USER} BINGRP ?= ${USER} diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile --- a/tools/tools/ifinfo/Makefile +++ b/tools/tools/ifinfo/Makefile @@ -1,4 +1,3 @@ - PROG= ifinfo SRCS= ifinfo.c rfc1650.c MAN= diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile --- a/tools/tools/ifpifa/Makefile +++ b/tools/tools/ifpifa/Makefile @@ -1,4 +1,3 @@ - PROG= ifpifa MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/intel-ucode-split/Makefile b/tools/tools/intel-ucode-split/Makefile --- a/tools/tools/intel-ucode-split/Makefile +++ b/tools/tools/intel-ucode-split/Makefile @@ -1,4 +1,3 @@ - PROG= intel-ucode-split MAN= diff --git a/tools/tools/ioat/Makefile b/tools/tools/ioat/Makefile --- a/tools/tools/ioat/Makefile +++ b/tools/tools/ioat/Makefile @@ -1,4 +1,3 @@ - PROG= ioatcontrol MAN= ioatcontrol.8 BINDIR?= /usr/bin diff --git a/tools/tools/ipw/Makefile b/tools/tools/ipw/Makefile --- a/tools/tools/ipw/Makefile +++ b/tools/tools/ipw/Makefile @@ -1,4 +1,3 @@ - PROG= ipwstats MAN= diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile --- a/tools/tools/iwi/Makefile +++ b/tools/tools/iwi/Makefile @@ -1,4 +1,3 @@ - PROG= iwistats MAN= diff --git a/tools/tools/iwi/iwistats.c b/tools/tools/iwi/iwistats.c --- a/tools/tools/iwi/iwistats.c +++ b/tools/tools/iwi/iwistats.c @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2005 * Damien Bergamini . All rights reserved. diff --git a/tools/tools/iwn/Makefile b/tools/tools/iwn/Makefile --- a/tools/tools/iwn/Makefile +++ b/tools/tools/iwn/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwnstats .include diff --git a/tools/tools/iwn/iwnstats/Makefile b/tools/tools/iwn/iwnstats/Makefile --- a/tools/tools/iwn/iwnstats/Makefile +++ b/tools/tools/iwn/iwnstats/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/tools/kttcp/Makefile b/tools/tools/kttcp/Makefile --- a/tools/tools/kttcp/Makefile +++ b/tools/tools/kttcp/Makefile @@ -1,4 +1,3 @@ - SHELL= /bin/sh PROG= kttcp diff --git a/tools/tools/kttcp/README b/tools/tools/kttcp/README --- a/tools/tools/kttcp/README +++ b/tools/tools/kttcp/README @@ -1,4 +1,3 @@ - This is a port of Jason Thorpe's kttcp tool for testing network performance for in-kernel applications (like NFS). The tool consists of a loadable module and a small user-mode application. Beware diff --git a/tools/tools/kttcp/sys/Makefile b/tools/tools/kttcp/sys/Makefile --- a/tools/tools/kttcp/sys/Makefile +++ b/tools/tools/kttcp/sys/Makefile @@ -1,4 +1,3 @@ - KMOD = kttcp SRCS = kttcp.c SRCS += device_if.h diff --git a/tools/tools/locale/etc/charmaps/charmaps.txt b/tools/tools/locale/etc/charmaps/charmaps.txt --- a/tools/tools/locale/etc/charmaps/charmaps.txt +++ b/tools/tools/locale/etc/charmaps/charmaps.txt @@ -1,4 +1,3 @@ - Sources: unicode.org: http://unicode.org/Public/MAPPINGS diff --git a/tools/tools/makeroot/Makefile b/tools/tools/makeroot/Makefile --- a/tools/tools/makeroot/Makefile +++ b/tools/tools/makeroot/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= makeroot.sh MAN= makeroot.8 diff --git a/tools/tools/mcgrab/Makefile b/tools/tools/mcgrab/Makefile --- a/tools/tools/mcgrab/Makefile +++ b/tools/tools/mcgrab/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= mcgrab CFLAGS+= -I${.CURDIR}/../mctest diff --git a/tools/tools/mctest/Makefile b/tools/tools/mctest/Makefile --- a/tools/tools/mctest/Makefile +++ b/tools/tools/mctest/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= mctest LIBADD= pthread diff --git a/tools/tools/mfi/Makefile b/tools/tools/mfi/Makefile --- a/tools/tools/mfi/Makefile +++ b/tools/tools/mfi/Makefile @@ -1,4 +1,3 @@ - PROG= mfi_checkq MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/mwl/Makefile b/tools/tools/mwl/Makefile --- a/tools/tools/mwl/Makefile +++ b/tools/tools/mwl/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mwlstats mwldebug .include diff --git a/tools/tools/mwl/mwldebug/Makefile b/tools/tools/mwl/mwldebug/Makefile --- a/tools/tools/mwl/mwldebug/Makefile +++ b/tools/tools/mwl/mwldebug/Makefile @@ -1,4 +1,3 @@ - PROG= mwldebug BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/mwl/mwlstats/Makefile b/tools/tools/mwl/mwlstats/Makefile --- a/tools/tools/mwl/mwlstats/Makefile +++ b/tools/tools/mwl/mwlstats/Makefile @@ -1,4 +1,3 @@ - PROG= mwlstats BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/nanobsd/dhcpd/README b/tools/tools/nanobsd/dhcpd/README --- a/tools/tools/nanobsd/dhcpd/README +++ b/tools/tools/nanobsd/dhcpd/README @@ -1,4 +1,3 @@ - Example for creating many different builds (including different arch) from a common set of files, as well as building natively using qemu user space emulation. diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -1,4 +1,3 @@ - #- # Copyright (c) 2014 M. Warner Losh # Copyright (c) 2010 iXsystems, Inc. diff --git a/tools/tools/nanobsd/dhcpd/os-base b/tools/tools/nanobsd/dhcpd/os-base --- a/tools/tools/nanobsd/dhcpd/os-base +++ b/tools/tools/nanobsd/dhcpd/os-base @@ -1,4 +1,3 @@ - #- # Copyright (c) 2014 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/README b/tools/tools/nanobsd/embedded/README --- a/tools/tools/nanobsd/embedded/README +++ b/tools/tools/nanobsd/embedded/README @@ -1,4 +1,3 @@ - Example for creating many different builds (including different arch) from a common set of files, as well as building natively using qemu user space emulation. diff --git a/tools/tools/nanobsd/embedded/beaglebone.cfg b/tools/tools/nanobsd/embedded/beaglebone.cfg --- a/tools/tools/nanobsd/embedded/beaglebone.cfg +++ b/tools/tools/nanobsd/embedded/beaglebone.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/i386.cfg b/tools/tools/nanobsd/embedded/i386.cfg --- a/tools/tools/nanobsd/embedded/i386.cfg +++ b/tools/tools/nanobsd/embedded/i386.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/pandaboard.cfg b/tools/tools/nanobsd/embedded/pandaboard.cfg --- a/tools/tools/nanobsd/embedded/pandaboard.cfg +++ b/tools/tools/nanobsd/embedded/pandaboard.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2016 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg --- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg --- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg --- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-armv7.cfg b/tools/tools/nanobsd/embedded/qemu-armv7.cfg --- a/tools/tools/nanobsd/embedded/qemu-armv7.cfg +++ b/tools/tools/nanobsd/embedded/qemu-armv7.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2016 Andrew Turner. All Rights Reserved. # Copyright (c) 2015 M. Warner Losh diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg --- a/tools/tools/nanobsd/embedded/qemu-i386.cfg +++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg --- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg +++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg --- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/rpi.cfg b/tools/tools/nanobsd/embedded/rpi.cfg --- a/tools/tools/nanobsd/embedded/rpi.cfg +++ b/tools/tools/nanobsd/embedded/rpi.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/rpi2.cfg b/tools/tools/nanobsd/embedded/rpi2.cfg --- a/tools/tools/nanobsd/embedded/rpi2.cfg +++ b/tools/tools/nanobsd/embedded/rpi2.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/embedded/rpi3.cfg b/tools/tools/nanobsd/embedded/rpi3.cfg --- a/tools/tools/nanobsd/embedded/rpi3.cfg +++ b/tools/tools/nanobsd/embedded/rpi3.cfg @@ -1,4 +1,3 @@ - #- # Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. diff --git a/tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt b/tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt --- a/tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt +++ b/tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt @@ -1,4 +1,3 @@ - Some remarks for setting up a zfs boot environment ZFS Boot sctructure: diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile --- a/tools/tools/ncpus/Makefile +++ b/tools/tools/ncpus/Makefile @@ -1,4 +1,3 @@ - PROG= ncpus MAN= SRCS= ncpus.c acpi.c diff --git a/tools/tools/ncpus/ncpus.c b/tools/tools/ncpus/ncpus.c --- a/tools/tools/ncpus/ncpus.c +++ b/tools/tools/ncpus/ncpus.c @@ -1,4 +1,3 @@ - #include extern int acpi_detect(void); diff --git a/tools/tools/net80211/Makefile b/tools/tools/net80211/Makefile --- a/tools/tools/net80211/Makefile +++ b/tools/tools/net80211/Makefile @@ -1,4 +1,3 @@ - SUBDIR= stumbler w00t wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds .include diff --git a/tools/tools/net80211/README b/tools/tools/net80211/README --- a/tools/tools/net80211/README +++ b/tools/tools/net80211/README @@ -1,4 +1,3 @@ - This directory has various tools for use with the net80211 layer. Some may not work depending on the capabilities of the underyling wireless driver. Everything should work with ath. diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile --- a/tools/tools/net80211/stumbler/Makefile +++ b/tools/tools/net80211/stumbler/Makefile @@ -1,4 +1,3 @@ - PROG= stumbler BINDIR= /usr/local/bin LIBADD= pcap tinfow ncursesw diff --git a/tools/tools/net80211/w00t/Makefile b/tools/tools/net80211/w00t/Makefile --- a/tools/tools/net80211/w00t/Makefile +++ b/tools/tools/net80211/w00t/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libw00t ap assoc expand prga redir .include diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc --- a/tools/tools/net80211/w00t/Makefile.inc +++ b/tools/tools/net80211/w00t/Makefile.inc @@ -1,4 +1,3 @@ - W00T= ../libw00t # NB: we get crc32 from -lz DPADD= ${W00T}/libw00t.a diff --git a/tools/tools/net80211/w00t/README b/tools/tools/net80211/w00t/README --- a/tools/tools/net80211/w00t/README +++ b/tools/tools/net80211/w00t/README @@ -1,4 +1,3 @@ - This is a collection of tools that use raw 802.11 packet injection. None of the tools configure the interface, so be sure to run something like: diff --git a/tools/tools/net80211/w00t/ap/Makefile b/tools/tools/net80211/w00t/ap/Makefile --- a/tools/tools/net80211/w00t/ap/Makefile +++ b/tools/tools/net80211/w00t/ap/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= ap diff --git a/tools/tools/net80211/w00t/assoc/Makefile b/tools/tools/net80211/w00t/assoc/Makefile --- a/tools/tools/net80211/w00t/assoc/Makefile +++ b/tools/tools/net80211/w00t/assoc/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= assoc diff --git a/tools/tools/net80211/w00t/expand/Makefile b/tools/tools/net80211/w00t/expand/Makefile --- a/tools/tools/net80211/w00t/expand/Makefile +++ b/tools/tools/net80211/w00t/expand/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= expand diff --git a/tools/tools/net80211/w00t/libw00t/Makefile b/tools/tools/net80211/w00t/libw00t/Makefile --- a/tools/tools/net80211/w00t/libw00t/Makefile +++ b/tools/tools/net80211/w00t/libw00t/Makefile @@ -1,4 +1,3 @@ - LIB= w00t SRCS= w00t.c INTERNALLIB= true diff --git a/tools/tools/net80211/w00t/prga/Makefile b/tools/tools/net80211/w00t/prga/Makefile --- a/tools/tools/net80211/w00t/prga/Makefile +++ b/tools/tools/net80211/w00t/prga/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= prga diff --git a/tools/tools/net80211/w00t/redir/Makefile b/tools/tools/net80211/w00t/redir/Makefile --- a/tools/tools/net80211/w00t/redir/Makefile +++ b/tools/tools/net80211/w00t/redir/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= redir diff --git a/tools/tools/net80211/wesside/Makefile b/tools/tools/net80211/wesside/Makefile --- a/tools/tools/net80211/wesside/Makefile +++ b/tools/tools/net80211/wesside/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dics udps wesside .include diff --git a/tools/tools/net80211/wesside/README b/tools/tools/net80211/wesside/README --- a/tools/tools/net80211/wesside/README +++ b/tools/tools/net80211/wesside/README @@ -1,4 +1,3 @@ - This is an implementation of the frag attack described in: http://tapir.cs.ucl.ac.uk/bittau-wep.pdf It will only work with Atheros. It could be made to work with other cards, but diff --git a/tools/tools/net80211/wesside/dics/Makefile b/tools/tools/net80211/wesside/dics/Makefile --- a/tools/tools/net80211/wesside/dics/Makefile +++ b/tools/tools/net80211/wesside/dics/Makefile @@ -1,4 +1,3 @@ - PROG= dics BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wesside/udps/Makefile b/tools/tools/net80211/wesside/udps/Makefile --- a/tools/tools/net80211/wesside/udps/Makefile +++ b/tools/tools/net80211/wesside/udps/Makefile @@ -1,4 +1,3 @@ - PROG= udps BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wesside/wesside/Makefile b/tools/tools/net80211/wesside/wesside/Makefile --- a/tools/tools/net80211/wesside/wesside/Makefile +++ b/tools/tools/net80211/wesside/wesside/Makefile @@ -1,4 +1,3 @@ - PROG= wesside BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wlaninject/Makefile b/tools/tools/net80211/wlaninject/Makefile --- a/tools/tools/net80211/wlaninject/Makefile +++ b/tools/tools/net80211/wlaninject/Makefile @@ -1,4 +1,3 @@ - PROG= wlaninject BINDIR= /usr/local/bin CFLAGS=-g diff --git a/tools/tools/net80211/wlaninject/README b/tools/tools/net80211/wlaninject/README --- a/tools/tools/net80211/wlaninject/README +++ b/tools/tools/net80211/wlaninject/README @@ -1,4 +1,3 @@ - This tool generates raw 802.11 frames. The resulting frame will depend on the capabilities of the hardware. Some hardware mangles the 802.11 header [e.g. wi] other hardware does not [e.g. ath]. diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile --- a/tools/tools/net80211/wlanstats/Makefile +++ b/tools/tools/net80211/wlanstats/Makefile @@ -1,4 +1,3 @@ - .include PROG= wlanstats diff --git a/tools/tools/net80211/wlantxtime/Makefile b/tools/tools/net80211/wlantxtime/Makefile --- a/tools/tools/net80211/wlantxtime/Makefile +++ b/tools/tools/net80211/wlantxtime/Makefile @@ -1,4 +1,3 @@ - PROG= wlantxtime BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile --- a/tools/tools/net80211/wlanwatch/Makefile +++ b/tools/tools/net80211/wlanwatch/Makefile @@ -1,4 +1,3 @@ - PROG= wlanwatch BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/net80211/wlanwds/Makefile b/tools/tools/net80211/wlanwds/Makefile --- a/tools/tools/net80211/wlanwds/Makefile +++ b/tools/tools/net80211/wlanwds/Makefile @@ -1,4 +1,3 @@ - PROG= wlanwds BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/netmap/README b/tools/tools/netmap/README --- a/tools/tools/netmap/README +++ b/tools/tools/netmap/README @@ -1,4 +1,3 @@ - This directory contains applications that use the netmap API pkt-gen a multi-function packet generator and traffic sink diff --git a/tools/tools/netrate/Makefile.inc b/tools/tools/netrate/Makefile.inc --- a/tools/tools/netrate/Makefile.inc +++ b/tools/tools/netrate/Makefile.inc @@ -1,3 +1,2 @@ - WARNS?= 5 WFORMAT?= 2 diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile --- a/tools/tools/netrate/http/Makefile +++ b/tools/tools/netrate/http/Makefile @@ -1,4 +1,3 @@ - PROG= http MAN= LIBADD= pthread diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile --- a/tools/tools/netrate/httpd/Makefile +++ b/tools/tools/netrate/httpd/Makefile @@ -1,4 +1,3 @@ - PROG= httpd MAN= WARNS?= 3 diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile --- a/tools/tools/netrate/juggle/Makefile +++ b/tools/tools/netrate/juggle/Makefile @@ -1,4 +1,3 @@ - PROG= juggle MAN= WARNS?= 3 diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile --- a/tools/tools/netrate/tcpconnect/Makefile +++ b/tools/tools/netrate/tcpconnect/Makefile @@ -1,4 +1,3 @@ - PROG= tcpconnect MAN= WARNS?= 3 diff --git a/tools/tools/netrate/tcpp/Makefile b/tools/tools/netrate/tcpp/Makefile --- a/tools/tools/netrate/tcpp/Makefile +++ b/tools/tools/netrate/tcpp/Makefile @@ -1,4 +1,3 @@ - PROG= tcpp INCS= tcpp.h MAN= diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile --- a/tools/tools/netrate/tcpreceive/Makefile +++ b/tools/tools/netrate/tcpreceive/Makefile @@ -1,4 +1,3 @@ - PROG= tcpreceive MAN= WARNS?= 3 diff --git a/tools/tools/notescheck/Makefile b/tools/tools/notescheck/Makefile --- a/tools/tools/notescheck/Makefile +++ b/tools/tools/notescheck/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= notescheck.py .include diff --git a/tools/tools/npe/Makefile b/tools/tools/npe/Makefile --- a/tools/tools/npe/Makefile +++ b/tools/tools/npe/Makefile @@ -1,4 +1,3 @@ - SUBDIR= npestats .include diff --git a/tools/tools/npe/npestats/Makefile b/tools/tools/npe/npestats/Makefile --- a/tools/tools/npe/npestats/Makefile +++ b/tools/tools/npe/npestats/Makefile @@ -1,4 +1,3 @@ - PROG= npestats SRCS= main.c npestats.c BINDIR= /usr/local/bin diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile --- a/tools/tools/pirtool/Makefile +++ b/tools/tools/pirtool/Makefile @@ -1,4 +1,3 @@ - PROG= pirtool SRCS= pirtool.c MAN= diff --git a/tools/tools/shlib-compat/Makefile.sysfake b/tools/tools/shlib-compat/Makefile.sysfake --- a/tools/tools/shlib-compat/Makefile.sysfake +++ b/tools/tools/shlib-compat/Makefile.sysfake @@ -1,4 +1,3 @@ - SRCS+= sysfake.c CLEANFILES+= sysfake.c diff --git a/tools/tools/shlib-compat/test/Makefile b/tools/tools/shlib-compat/test/Makefile --- a/tools/tools/shlib-compat/test/Makefile +++ b/tools/tools/shlib-compat/test/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libtest1 \ libtest2 \ libtest3 \ diff --git a/tools/tools/shlib-compat/test/Makefile.inc b/tools/tools/shlib-compat/test/Makefile.inc --- a/tools/tools/shlib-compat/test/Makefile.inc +++ b/tools/tools/shlib-compat/test/Makefile.inc @@ -1,4 +1,3 @@ - LIB= test${TESTNUM} SHLIB_MAJOR= 0 diff --git a/tools/tools/shlib-compat/test/Versions.def b/tools/tools/shlib-compat/test/Versions.def --- a/tools/tools/shlib-compat/test/Versions.def +++ b/tools/tools/shlib-compat/test/Versions.def @@ -1,4 +1,3 @@ - TEST_1.0 { }; diff --git a/tools/tools/shlib-compat/test/libtest1/Makefile b/tools/tools/shlib-compat/test/libtest1/Makefile --- a/tools/tools/shlib-compat/test/libtest1/Makefile +++ b/tools/tools/shlib-compat/test/libtest1/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 1 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtest2/Makefile b/tools/tools/shlib-compat/test/libtest2/Makefile --- a/tools/tools/shlib-compat/test/libtest2/Makefile +++ b/tools/tools/shlib-compat/test/libtest2/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 2 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtest3/Makefile b/tools/tools/shlib-compat/test/libtest3/Makefile --- a/tools/tools/shlib-compat/test/libtest3/Makefile +++ b/tools/tools/shlib-compat/test/libtest3/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 3 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtestsys/Makefile b/tools/tools/shlib-compat/test/libtestsys/Makefile --- a/tools/tools/shlib-compat/test/libtestsys/Makefile +++ b/tools/tools/shlib-compat/test/libtestsys/Makefile @@ -1,4 +1,3 @@ - TESTNUM= sys CLEANFILES+= test.c diff --git a/tools/tools/shlib-compat/test/regress.m4 b/tools/tools/shlib-compat/test/regress.m4 --- a/tools/tools/shlib-compat/test/regress.m4 +++ b/tools/tools/shlib-compat/test/regress.m4 @@ -1,4 +1,3 @@ - dnl A library of routines for doing regression tests for userland utilities. dnl Start up. We initialise the exit status to 0 (no failure) and change diff --git a/tools/tools/sortbench/Makefile b/tools/tools/sortbench/Makefile --- a/tools/tools/sortbench/Makefile +++ b/tools/tools/sortbench/Makefile @@ -1,4 +1,3 @@ - PROG= sort_bench MAN= diff --git a/tools/tools/sortbench/README b/tools/tools/sortbench/README --- a/tools/tools/sortbench/README +++ b/tools/tools/sortbench/README @@ -1,4 +1,3 @@ - Running: 1. Compile mergesort_bench.c into mergesort_bench 2. Run bench.py with python bench.py [elts] diff --git a/tools/tools/switch_tls/Makefile b/tools/tools/switch_tls/Makefile --- a/tools/tools/switch_tls/Makefile +++ b/tools/tools/switch_tls/Makefile @@ -1,4 +1,3 @@ - PROG= switch_tls MAN= diff --git a/tools/tools/sysbuild/README b/tools/tools/sysbuild/README --- a/tools/tools/sysbuild/README +++ b/tools/tools/sysbuild/README @@ -1,4 +1,3 @@ - About sysbuild.sh ================= diff --git a/tools/tools/sysdoc/Makefile b/tools/tools/sysdoc/Makefile --- a/tools/tools/sysdoc/Makefile +++ b/tools/tools/sysdoc/Makefile @@ -1,4 +1,3 @@ - sysctl.5: sh ${.CURDIR}/sysdoc.sh -k /boot/kernel diff --git a/tools/tools/tionxcl/Makefile b/tools/tools/tionxcl/Makefile --- a/tools/tools/tionxcl/Makefile +++ b/tools/tools/tionxcl/Makefile @@ -1,4 +1,3 @@ - PROG= tionxcl MAN= diff --git a/tools/tools/track/Makefile b/tools/tools/track/Makefile --- a/tools/tools/track/Makefile +++ b/tools/tools/track/Makefile @@ -1,4 +1,3 @@ - PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin SCRIPTS= track.sh diff --git a/tools/tools/tscdrift/Makefile b/tools/tools/tscdrift/Makefile --- a/tools/tools/tscdrift/Makefile +++ b/tools/tools/tscdrift/Makefile @@ -1,4 +1,3 @@ - PROG= tscdrift MAN= diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile --- a/tools/tools/umastat/Makefile +++ b/tools/tools/umastat/Makefile @@ -1,4 +1,3 @@ - PROG= umastat MAN= WARNS?= 3 diff --git a/tools/tools/vimage/Makefile b/tools/tools/vimage/Makefile --- a/tools/tools/vimage/Makefile +++ b/tools/tools/vimage/Makefile @@ -1,4 +1,3 @@ - PROG= vimage LIBADD= jail diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile --- a/tools/tools/vt/mkkfont/Makefile +++ b/tools/tools/vt/mkkfont/Makefile @@ -1,4 +1,3 @@ - PROG= mkkfont MAN1= diff --git a/tools/tools/whereintheworld/Makefile b/tools/tools/whereintheworld/Makefile --- a/tools/tools/whereintheworld/Makefile +++ b/tools/tools/whereintheworld/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= whereintheworld.pl .include diff --git a/tools/tools/wtap/Makefile b/tools/tools/wtap/Makefile --- a/tools/tools/wtap/Makefile +++ b/tools/tools/wtap/Makefile @@ -1,4 +1,3 @@ - SUBDIR= wtap vis_map .include diff --git a/tools/tools/wtap/vis_map/Makefile b/tools/tools/wtap/vis_map/Makefile --- a/tools/tools/wtap/vis_map/Makefile +++ b/tools/tools/wtap/vis_map/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/local/bin/ PROG= vis_map SRC= vis_map.c diff --git a/tools/tools/wtap/wtap/Makefile b/tools/tools/wtap/wtap/Makefile --- a/tools/tools/wtap/wtap/Makefile +++ b/tools/tools/wtap/wtap/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/local/bin PROG= wtap SRC= wtap.c diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile --- a/tools/tools/zfsboottest/Makefile +++ b/tools/tools/zfsboottest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/stand/zfs ${SRCTOP}/sys/cddl/boot/zfs BINDIR?= /usr/bin diff --git a/usr.bin/Makefile b/usr.bin/Makefile --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= alias \ diff --git a/usr.bin/Makefile.amd64 b/usr.bin/Makefile.amd64 --- a/usr.bin/Makefile.amd64 +++ b/usr.bin/Makefile.amd64 @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/Makefile.arm b/usr.bin/Makefile.arm --- a/usr.bin/Makefile.arm +++ b/usr.bin/Makefile.arm @@ -1 +0,0 @@ - diff --git a/usr.bin/Makefile.i386 b/usr.bin/Makefile.i386 --- a/usr.bin/Makefile.i386 +++ b/usr.bin/Makefile.i386 @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc --- a/usr.bin/Makefile.inc +++ b/usr.bin/Makefile.inc @@ -1,2 +1 @@ - BINDIR?= /usr/bin diff --git a/usr.bin/Makefile.powerpc b/usr.bin/Makefile.powerpc --- a/usr.bin/Makefile.powerpc +++ b/usr.bin/Makefile.powerpc @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile --- a/usr.bin/alias/Makefile +++ b/usr.bin/alias/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=generic.sh SCRIPTSNAME=alias diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,4 +1,3 @@ - .include PROG= apply diff --git a/usr.bin/apply/tests/Makefile b/usr.bin/apply/tests/Makefile --- a/usr.bin/apply/tests/Makefile +++ b/usr.bin/apply/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/apply/tests/regress.sh b/usr.bin/apply/tests/regress.sh --- a/usr.bin/apply/tests/regress.sh +++ b/usr.bin/apply/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..2 REGRESSION_START($1) diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,4 +1,3 @@ - .include PROG= ar diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile --- a/usr.bin/at/Makefile +++ b/usr.bin/at/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/Makefile.inc" CONFS= atrun diff --git a/usr.bin/at/Makefile.inc b/usr.bin/at/Makefile.inc --- a/usr.bin/at/Makefile.inc +++ b/usr.bin/at/Makefile.inc @@ -1,4 +1,3 @@ - LOCKFILE = .lockfile ATSPOOL_DIR=/var/at/spool ATJOB_DIR=/var/at/jobs diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -1,4 +1,3 @@ - .include AWKSRC= ${SRCTOP}/contrib/one-true-awk diff --git a/usr.bin/awk/tests/Makefile b/usr.bin/awk/tests/Makefile --- a/usr.bin/awk/tests/Makefile +++ b/usr.bin/awk/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= bugs-fixed diff --git a/usr.bin/awk/tests/bugs-fixed/Makefile b/usr.bin/awk/tests/bugs-fixed/Makefile --- a/usr.bin/awk/tests/bugs-fixed/Makefile +++ b/usr.bin/awk/tests/bugs-fixed/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/awk/${.CURDIR:T} diff --git a/usr.bin/awk/tests/netbsd/Makefile b/usr.bin/awk/tests/netbsd/Makefile --- a/usr.bin/awk/tests/netbsd/Makefile +++ b/usr.bin/awk/tests/netbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/awk/${.CURDIR:T} diff --git a/usr.bin/backlight/Makefile b/usr.bin/backlight/Makefile --- a/usr.bin/backlight/Makefile +++ b/usr.bin/backlight/Makefile @@ -1,4 +1,3 @@ - PROG= backlight MAN= backlight.8 diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile --- a/usr.bin/banner/Makefile +++ b/usr.bin/banner/Makefile @@ -1,4 +1,3 @@ - PROG= banner MAN= banner.6 diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile --- a/usr.bin/basename/Makefile +++ b/usr.bin/basename/Makefile @@ -1,4 +1,3 @@ - .include PROG= basename diff --git a/usr.bin/basename/tests/Makefile b/usr.bin/basename/tests/Makefile --- a/usr.bin/basename/tests/Makefile +++ b/usr.bin/basename/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= basename_test .include diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile --- a/usr.bin/beep/Makefile +++ b/usr.bin/beep/Makefile @@ -1,4 +1,3 @@ - PROG= beep MAN= beep.1 diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile --- a/usr.bin/biff/Makefile +++ b/usr.bin/biff/Makefile @@ -1,4 +1,3 @@ - PROG= biff .include diff --git a/usr.bin/bintrans/Makefile b/usr.bin/bintrans/Makefile --- a/usr.bin/bintrans/Makefile +++ b/usr.bin/bintrans/Makefile @@ -1,4 +1,3 @@ - .include PROG= bintrans diff --git a/usr.bin/bintrans/tests/Makefile b/usr.bin/bintrans/tests/Makefile --- a/usr.bin/bintrans/tests/Makefile +++ b/usr.bin/bintrans/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= bintrans_test diff --git a/usr.bin/bintrans/tests/regress.sh b/usr.bin/bintrans/tests/regress.sh --- a/usr.bin/bintrans/tests/regress.sh +++ b/usr.bin/bintrans/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..5 REGRESSION_START($1) diff --git a/usr.bin/bluetooth/Makefile.inc b/usr.bin/bluetooth/Makefile.inc --- a/usr.bin/bluetooth/Makefile.inc +++ b/usr.bin/bluetooth/Makefile.inc @@ -1,3 +1,2 @@ - .include "${SRCTOP}/usr.bin/Makefile.inc" diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,4 +1,3 @@ - # we do not need this MK_host_egacy= no diff --git a/usr.bin/bmake/tests/Makefile b/usr.bin/bmake/tests/Makefile --- a/usr.bin/bmake/tests/Makefile +++ b/usr.bin/bmake/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ${PACKAGE}FILES+= common.sh diff --git a/usr.bin/bmake/tests/Makefile.inc b/usr.bin/bmake/tests/Makefile.inc --- a/usr.bin/bmake/tests/Makefile.inc +++ b/usr.bin/bmake/tests/Makefile.inc @@ -1,2 +1 @@ - SUBDIR_PARALLEL= t diff --git a/usr.bin/bmake/tests/README b/usr.bin/bmake/tests/README --- a/usr.bin/bmake/tests/README +++ b/usr.bin/bmake/tests/README @@ -1,4 +1,3 @@ - This directory contains regression tests for make(1). To invoke the tests, please refer to tests(7). diff --git a/usr.bin/bmake/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile --- a/usr.bin/bmake/tests/archives/Makefile +++ b/usr.bin/bmake/tests/archives/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives TESTS_SUBDIRS= fmt_44bsd fmt_44bsd_mod fmt_oldbsd diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile --- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile --- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile --- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd diff --git a/usr.bin/bmake/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile --- a/usr.bin/bmake/tests/basic/Makefile +++ b/usr.bin/bmake/tests/basic/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic TESTS_SUBDIRS= t0 t1 t2 t3 diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile --- a/usr.bin/bmake/tests/basic/t0/Makefile +++ b/usr.bin/bmake/tests/basic/t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t0 diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile --- a/usr.bin/bmake/tests/basic/t1/Makefile +++ b/usr.bin/bmake/tests/basic/t1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t1 diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile --- a/usr.bin/bmake/tests/basic/t2/Makefile +++ b/usr.bin/bmake/tests/basic/t2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t2 diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile --- a/usr.bin/bmake/tests/basic/t3/Makefile +++ b/usr.bin/bmake/tests/basic/t3/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t3 diff --git a/usr.bin/bmake/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile --- a/usr.bin/bmake/tests/execution/Makefile +++ b/usr.bin/bmake/tests/execution/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution TESTS_SUBDIRS= ellipsis empty joberr plus diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile --- a/usr.bin/bmake/tests/execution/ellipsis/Makefile +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test --- a/usr.bin/bmake/tests/execution/ellipsis/Makefile.test +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test @@ -1,4 +1,3 @@ - ELLIPSIS= ... check-ellipsis: diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile --- a/usr.bin/bmake/tests/execution/empty/Makefile +++ b/usr.bin/bmake/tests/execution/empty/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty diff --git a/usr.bin/bmake/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test --- a/usr.bin/bmake/tests/execution/empty/Makefile.test +++ b/usr.bin/bmake/tests/execution/empty/Makefile.test @@ -1,4 +1,3 @@ - EMPTY= check-empty: diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile --- a/usr.bin/bmake/tests/execution/joberr/Makefile +++ b/usr.bin/bmake/tests/execution/joberr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test --- a/usr.bin/bmake/tests/execution/joberr/Makefile.test +++ b/usr.bin/bmake/tests/execution/joberr/Makefile.test @@ -1,4 +1,3 @@ - check-joberr: .for _t in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 @-${MAKE} -f ${MAKEFILE} -j2 do-$@ diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile --- a/usr.bin/bmake/tests/execution/plus/Makefile +++ b/usr.bin/bmake/tests/execution/plus/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus diff --git a/usr.bin/bmake/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test --- a/usr.bin/bmake/tests/execution/plus/Makefile.test +++ b/usr.bin/bmake/tests/execution/plus/Makefile.test @@ -1,4 +1,3 @@ - check-+: @${MAKE} -f ${MAKEFILE} -j2 -n do-$@ diff --git a/usr.bin/bmake/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile --- a/usr.bin/bmake/tests/shell/Makefile +++ b/usr.bin/bmake/tests/shell/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell TESTS_SUBDIRS= builtin meta path path_select replace select diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile --- a/usr.bin/bmake/tests/shell/builtin/Makefile +++ b/usr.bin/bmake/tests/shell/builtin/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/builtin diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile --- a/usr.bin/bmake/tests/shell/meta/Makefile +++ b/usr.bin/bmake/tests/shell/meta/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/meta diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile --- a/usr.bin/bmake/tests/shell/path/Makefile +++ b/usr.bin/bmake/tests/shell/path/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile --- a/usr.bin/bmake/tests/shell/path_select/Makefile +++ b/usr.bin/bmake/tests/shell/path_select/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path_select diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile --- a/usr.bin/bmake/tests/shell/replace/Makefile +++ b/usr.bin/bmake/tests/shell/replace/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/replace diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile --- a/usr.bin/bmake/tests/shell/select/Makefile +++ b/usr.bin/bmake/tests/shell/select/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/select diff --git a/usr.bin/bmake/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile --- a/usr.bin/bmake/tests/suffixes/Makefile +++ b/usr.bin/bmake/tests/suffixes/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes TESTS_SUBDIRS= basic src_wild1 src_wild2 diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile --- a/usr.bin/bmake/tests/suffixes/basic/Makefile +++ b/usr.bin/bmake/tests/suffixes/basic/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/basic diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile --- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1 diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test --- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test +++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test @@ -1,4 +1,3 @@ - test1: TEST1.b cat TEST1.a TEST2.a | diff -u - TEST1.b diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile --- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2 diff --git a/usr.bin/bmake/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile --- a/usr.bin/bmake/tests/syntax/Makefile +++ b/usr.bin/bmake/tests/syntax/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax TESTS_SUBDIRS= directive-t0 enl funny-targets semi diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile --- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile +++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/directive-t0 diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile --- a/usr.bin/bmake/tests/syntax/enl/Makefile +++ b/usr.bin/bmake/tests/syntax/enl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/enl diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile --- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile +++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/funny-targets diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile --- a/usr.bin/bmake/tests/syntax/semi/Makefile +++ b/usr.bin/bmake/tests/syntax/semi/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/semi diff --git a/usr.bin/bmake/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile --- a/usr.bin/bmake/tests/sysmk/Makefile +++ b/usr.bin/bmake/tests/sysmk/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk TESTS_SUBDIRS= t0 t1 t2 diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile --- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile --- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile --- a/usr.bin/bmake/tests/sysmk/t0/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile --- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test --- a/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test +++ b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test @@ -1,2 +1 @@ - DASH_M_DOTDOTDOT=Found_DotDotDot_sys_mk diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile --- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup --- a/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup +++ b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup @@ -1,2 +1 @@ - rm -rf ${WORK_DIR}/../../../t0/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile --- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile --- a/usr.bin/bmake/tests/sysmk/t1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile --- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test --- a/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test +++ b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test @@ -1,2 +1 @@ - DASH_M_DOTDOTDOT=Found_WRONG_DotDotDot_sys_mk__with_C_before_m diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile --- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup --- a/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup +++ b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup @@ -1,2 +1 @@ - rm -rf ${WORK_DIR}/../../../t0/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile --- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile --- a/usr.bin/bmake/tests/sysmk/t2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile --- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test --- a/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test +++ b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test @@ -1,2 +1 @@ - DASH_M_DOTDOTDOT=Found_DotDotDot_sys_mk__with_m_before_C diff --git a/usr.bin/bmake/tests/test-new.mk b/usr.bin/bmake/tests/test-new.mk --- a/usr.bin/bmake/tests/test-new.mk +++ b/usr.bin/bmake/tests/test-new.mk @@ -1,4 +1,3 @@ - NEW_DIR!= make -C ${.CURDIR}/../../../../usr.bin/make -V .OBJDIR all: diff --git a/usr.bin/bmake/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile --- a/usr.bin/bmake/tests/variables/Makefile +++ b/usr.bin/bmake/tests/variables/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables TESTS_SUBDIRS= modifier_M modifier_t opt_V t0 diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile --- a/usr.bin/bmake/tests/variables/modifier_M/Makefile +++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile --- a/usr.bin/bmake/tests/variables/modifier_t/Makefile +++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile --- a/usr.bin/bmake/tests/variables/opt_V/Makefile +++ b/usr.bin/bmake/tests/variables/opt_V/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile --- a/usr.bin/bmake/tests/variables/t0/Makefile +++ b/usr.bin/bmake/tests/variables/t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0 diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile --- a/usr.bin/brandelf/Makefile +++ b/usr.bin/brandelf/Makefile @@ -1,4 +1,3 @@ - .include PROG= brandelf diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile --- a/usr.bin/bsdcat/Makefile +++ b/usr.bin/bsdcat/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile --- a/usr.bin/bsdcat/tests/Makefile +++ b/usr.bin/bsdcat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/bsdiff/Makefile b/usr.bin/bsdiff/Makefile --- a/usr.bin/bsdiff/Makefile +++ b/usr.bin/bsdiff/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bsdiff bspatch .include diff --git a/usr.bin/bsdiff/Makefile.inc b/usr.bin/bsdiff/Makefile.inc --- a/usr.bin/bsdiff/Makefile.inc +++ b/usr.bin/bsdiff/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile --- a/usr.bin/bsdiff/bsdiff/Makefile +++ b/usr.bin/bsdiff/bsdiff/Makefile @@ -1,4 +1,3 @@ - PROG= bsdiff # libdivsufsort configured with: diff --git a/usr.bin/bsdiff/bspatch/Makefile b/usr.bin/bsdiff/bspatch/Makefile --- a/usr.bin/bsdiff/bspatch/Makefile +++ b/usr.bin/bsdiff/bspatch/Makefile @@ -1,4 +1,3 @@ - PROG= bspatch LIBADD= bz2 diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile --- a/usr.bin/bzip2/Makefile +++ b/usr.bin/bzip2/Makefile @@ -1,4 +1,3 @@ - BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile --- a/usr.bin/bzip2recover/Makefile +++ b/usr.bin/bzip2recover/Makefile @@ -1,4 +1,3 @@ - BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile --- a/usr.bin/c89/Makefile +++ b/usr.bin/c89/Makefile @@ -1,4 +1,3 @@ - PROG= c89 .include diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile --- a/usr.bin/c99/Makefile +++ b/usr.bin/c99/Makefile @@ -1,4 +1,3 @@ - PROG= c99 .include diff --git a/usr.bin/caesar/Makefile b/usr.bin/caesar/Makefile --- a/usr.bin/caesar/Makefile +++ b/usr.bin/caesar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= caesar diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,4 +1,3 @@ - .include PROG= calendar diff --git a/usr.bin/calendar/tests/Makefile b/usr.bin/calendar/tests/Makefile --- a/usr.bin/calendar/tests/Makefile +++ b/usr.bin/calendar/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= comment_test cond_test legacy_test diff --git a/usr.bin/calendar/tests/comment.sh b/usr.bin/calendar/tests/comment.sh --- a/usr.bin/calendar/tests/comment.sh +++ b/usr.bin/calendar/tests/comment.sh @@ -1,4 +1,3 @@ - CALENDAR_FILE="-f ${SRCDIR}/calendar.comment" CALENDAR_BIN="calendar" diff --git a/usr.bin/calendar/tests/cond.sh b/usr.bin/calendar/tests/cond.sh --- a/usr.bin/calendar/tests/cond.sh +++ b/usr.bin/calendar/tests/cond.sh @@ -1,4 +1,3 @@ - CALENDAR_FILE="-f ${SRCDIR}/calendar.cond" CALENDAR_BIN="calendar" diff --git a/usr.bin/calendar/tests/regress.sh b/usr.bin/calendar/tests/regress.sh --- a/usr.bin/calendar/tests/regress.sh +++ b/usr.bin/calendar/tests/regress.sh @@ -1,4 +1,3 @@ - CALENDAR_FILE="-f ${SRCDIR}/calendar.calibrate" CALENDAR_BIN="calendar" diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile --- a/usr.bin/cap_mkdb/Makefile +++ b/usr.bin/cap_mkdb/Makefile @@ -1,4 +1,3 @@ - PROG= cap_mkdb .include diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile --- a/usr.bin/chat/Makefile +++ b/usr.bin/chat/Makefile @@ -1,4 +1,3 @@ - # I once used this extensively, but no longer have a modem. Feel free # to ask me questions about it, but I disclaim ownership now. -Peter diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/newkey diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/lib/libc/gen diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile --- a/usr.bin/cksum/Makefile +++ b/usr.bin/cksum/Makefile @@ -1,4 +1,3 @@ - PROG= cksum SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c LINKS= ${BINDIR}/cksum ${BINDIR}/sum diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_CLANG} != "no" diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,4 +1,3 @@ - WARNS?= 0 .include diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= bugpoint SRCDIR= llvm/tools/bugpoint diff --git a/usr.bin/clang/clang-format/Makefile b/usr.bin/clang/clang-format/Makefile --- a/usr.bin/clang/clang-format/Makefile +++ b/usr.bin/clang/clang-format/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= clang-format MAN= diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile --- a/usr.bin/clang/clang-tblgen/Makefile +++ b/usr.bin/clang/clang-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= clang-tblgen MAN= diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/clang.pre.mk" CFLAGS+= -I${OBJTOP}/lib/clang/libclang diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= clang diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llc SRCDIR= llvm/tools/llc diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -1,4 +1,3 @@ - .include LLVM_BASE= ${SRCTOP}/contrib/llvm-project diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/lldb.pre.mk" PACKAGE= lldb diff --git a/usr.bin/clang/lldb-tblgen/Makefile b/usr.bin/clang/lldb-tblgen/Makefile --- a/usr.bin/clang/lldb-tblgen/Makefile +++ b/usr.bin/clang/lldb-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= lldb-tblgen MAN= diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/lldb.pre.mk" PACKAGE= lldb diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= lli SRCDIR= llvm/tools/lli diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-ar diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile --- a/usr.bin/clang/llvm-as/Makefile +++ b/usr.bin/clang/llvm-as/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-as SRCDIR= llvm/tools/llvm-as diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile --- a/usr.bin/clang/llvm-bcanalyzer/Makefile +++ b/usr.bin/clang/llvm-bcanalyzer/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-bcanalyzer SRCDIR= llvm/tools/llvm-bcanalyzer diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-cov diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile --- a/usr.bin/clang/llvm-cxxdump/Makefile +++ b/usr.bin/clang/llvm-cxxdump/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-cxxdump MAN= diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-cxxfilt diff --git a/usr.bin/clang/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile --- a/usr.bin/clang/llvm-diff/Makefile +++ b/usr.bin/clang/llvm-diff/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-diff SRCDIR= llvm/tools/llvm-diff diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile --- a/usr.bin/clang/llvm-dis/Makefile +++ b/usr.bin/clang/llvm-dis/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dis SRCDIR= llvm/tools/llvm-dis diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwarfdump SRCDIR= llvm/tools/llvm-dwarfdump diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwarfutil SRCDIR= llvm/tools/llvm-dwarfutil diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile --- a/usr.bin/clang/llvm-dwp/Makefile +++ b/usr.bin/clang/llvm-dwp/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwp MAN= diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-extract SRCDIR= llvm/tools/llvm-extract diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile --- a/usr.bin/clang/llvm-link/Makefile +++ b/usr.bin/clang/llvm-link/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-link SRCDIR= llvm/tools/llvm-link diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-lto MAN= diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-lto2 MAN= diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-mc MAN= diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile --- a/usr.bin/clang/llvm-mca/Makefile +++ b/usr.bin/clang/llvm-mca/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-mca SRCDIR= llvm/tools/llvm-mca diff --git a/usr.bin/clang/llvm-min-tblgen/Makefile b/usr.bin/clang/llvm-min-tblgen/Makefile --- a/usr.bin/clang/llvm-min-tblgen/Makefile +++ b/usr.bin/clang/llvm-min-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-min-tblgen MAN= diff --git a/usr.bin/clang/llvm-modextract/Makefile b/usr.bin/clang/llvm-modextract/Makefile --- a/usr.bin/clang/llvm-modextract/Makefile +++ b/usr.bin/clang/llvm-modextract/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-modextract MAN= diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-nm diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-objcopy diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-objdump diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile --- a/usr.bin/clang/llvm-pdbutil/Makefile +++ b/usr.bin/clang/llvm-pdbutil/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-pdbutil SRCDIR= llvm/tools/llvm-pdbutil diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-profdata SRCDIR= llvm/tools/llvm-profdata diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-readobj diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-rtdyld MAN= diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-size diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-strings diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-symbolizer diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile --- a/usr.bin/clang/llvm-tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-tblgen MAN= diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-xray MAN= diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${OBJTOP}/lib/clang/libllvm diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= opt SRCDIR= llvm/tools/opt diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile --- a/usr.bin/cmp/Makefile +++ b/usr.bin/cmp/Makefile @@ -1,4 +1,3 @@ - .include PROG= cmp diff --git a/usr.bin/cmp/tests/Makefile b/usr.bin/cmp/tests/Makefile --- a/usr.bin/cmp/tests/Makefile +++ b/usr.bin/cmp/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile --- a/usr.bin/col/Makefile +++ b/usr.bin/col/Makefile @@ -1,4 +1,3 @@ - .include PROG= col diff --git a/usr.bin/col/README b/usr.bin/col/README --- a/usr.bin/col/README +++ b/usr.bin/col/README @@ -1,4 +1,3 @@ - col - filter out reverse line feeds. Options are: diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile --- a/usr.bin/col/tests/Makefile +++ b/usr.bin/col/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= col_test diff --git a/usr.bin/col/tests/col_test.sh b/usr.bin/col/tests/col_test.sh --- a/usr.bin/col/tests/col_test.sh +++ b/usr.bin/col/tests/col_test.sh @@ -1,4 +1,3 @@ - atf_test_case nl nl_head() diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile --- a/usr.bin/colrm/Makefile +++ b/usr.bin/colrm/Makefile @@ -1,4 +1,3 @@ - PROG= colrm .include diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile --- a/usr.bin/column/Makefile +++ b/usr.bin/column/Makefile @@ -1,4 +1,3 @@ - PROG= column .include diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,4 +1,3 @@ - .include PROG= comm diff --git a/usr.bin/comm/tests/Makefile b/usr.bin/comm/tests/Makefile --- a/usr.bin/comm/tests/Makefile +++ b/usr.bin/comm/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/comm/tests/regress.sh b/usr.bin/comm/tests/regress.sh --- a/usr.bin/comm/tests/regress.sh +++ b/usr.bin/comm/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..3 REGRESSION_START($1) diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile --- a/usr.bin/compile_et/Makefile +++ b/usr.bin/compile_et/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/com_err PACKAGE= kerberos diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile --- a/usr.bin/compress/Makefile +++ b/usr.bin/compress/Makefile @@ -1,4 +1,3 @@ - .include PROG= compress diff --git a/usr.bin/compress/doc/NOTES b/usr.bin/compress/doc/NOTES --- a/usr.bin/compress/doc/NOTES +++ b/usr.bin/compress/doc/NOTES @@ -1,4 +1,3 @@ - From: James A. Woods >From vn Fri Dec 2 18:05:27 1988 diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log --- a/usr.bin/compress/doc/revision.log +++ b/usr.bin/compress/doc/revision.log @@ -1,4 +1,3 @@ - /* * $Header: compress.c,v 4.0 85/07/30 12:50:00 joe Release $ * diff --git a/usr.bin/compress/tests/Makefile b/usr.bin/compress/tests/Makefile --- a/usr.bin/compress/tests/Makefile +++ b/usr.bin/compress/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= compress_test diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/csplit/Makefile b/usr.bin/csplit/Makefile --- a/usr.bin/csplit/Makefile +++ b/usr.bin/csplit/Makefile @@ -1,4 +1,3 @@ - .include PROG= csplit diff --git a/usr.bin/csplit/tests/Makefile b/usr.bin/csplit/tests/Makefile --- a/usr.bin/csplit/tests/Makefile +++ b/usr.bin/csplit/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= csplit_test diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile --- a/usr.bin/ctags/Makefile +++ b/usr.bin/ctags/Makefile @@ -1,4 +1,3 @@ - PROG= ctags SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile --- a/usr.bin/ctlstat/Makefile +++ b/usr.bin/ctlstat/Makefile @@ -1,4 +1,3 @@ - PROG= ctlstat MAN= ctlstat.8 SDIR= ${SRCTOP}/sys diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile --- a/usr.bin/cut/Makefile +++ b/usr.bin/cut/Makefile @@ -1,4 +1,3 @@ - .include PROG= cut diff --git a/usr.bin/cut/tests/Makefile b/usr.bin/cut/tests/Makefile --- a/usr.bin/cut/tests/Makefile +++ b/usr.bin/cut/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= cut2_test diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/dc/tests/Makefile b/usr.bin/dc/tests/Makefile --- a/usr.bin/dc/tests/Makefile +++ b/usr.bin/dc/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= inout diff --git a/usr.bin/diff/Makefile b/usr.bin/diff/Makefile --- a/usr.bin/diff/Makefile +++ b/usr.bin/diff/Makefile @@ -1,4 +1,3 @@ - .include PROG= diff diff --git a/usr.bin/diff/tests/Makefile b/usr.bin/diff/tests/Makefile --- a/usr.bin/diff/tests/Makefile +++ b/usr.bin/diff/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= diff_test diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header diff --git a/usr.bin/diff3/Makefile b/usr.bin/diff3/Makefile --- a/usr.bin/diff3/Makefile +++ b/usr.bin/diff3/Makefile @@ -1,4 +1,3 @@ - .include PROG= diff3 diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= diff3_test diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -1,4 +1,3 @@ - atf_test_case diff3 atf_test_case diff3_lesssimple atf_test_case diff3_ed diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -1,4 +1,3 @@ - .include PROG= dirname diff --git a/usr.bin/dirname/tests/Makefile b/usr.bin/dirname/tests/Makefile --- a/usr.bin/dirname/tests/Makefile +++ b/usr.bin/dirname/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= dirname_test .include diff --git a/usr.bin/dpv/Makefile b/usr.bin/dpv/Makefile --- a/usr.bin/dpv/Makefile +++ b/usr.bin/dpv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv PROG= dpv diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile --- a/usr.bin/drill/Makefile +++ b/usr.bin/drill/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/du/tests/Makefile b/usr.bin/du/tests/Makefile --- a/usr.bin/du/tests/Makefile +++ b/usr.bin/du/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= du_test .include diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ee CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ diff --git a/usr.bin/elfctl/Makefile b/usr.bin/elfctl/Makefile --- a/usr.bin/elfctl/Makefile +++ b/usr.bin/elfctl/Makefile @@ -1,4 +1,3 @@ - ELFTCDIR= ${SRCTOP}/contrib/elftoolchain PROG= elfctl diff --git a/usr.bin/elfdump/Makefile b/usr.bin/elfdump/Makefile --- a/usr.bin/elfdump/Makefile +++ b/usr.bin/elfdump/Makefile @@ -1,4 +1,3 @@ - PROG= elfdump .include diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile --- a/usr.bin/enigma/Makefile +++ b/usr.bin/enigma/Makefile @@ -1,4 +1,3 @@ - PROG= enigma LINKS= ${BINDIR}/enigma ${BINDIR}/crypt diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile --- a/usr.bin/env/Makefile +++ b/usr.bin/env/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= env SRCS= env.c envopts.c diff --git a/usr.bin/etdump/Makefile b/usr.bin/etdump/Makefile --- a/usr.bin/etdump/Makefile +++ b/usr.bin/etdump/Makefile @@ -1,4 +1,3 @@ - PROG= etdump MAKEFS_SRC= ${SRCTOP}/usr.sbin/makefs diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile --- a/usr.bin/expand/Makefile +++ b/usr.bin/expand/Makefile @@ -1,4 +1,3 @@ - PROG= expand MLINKS= expand.1 unexpand.1 diff --git a/usr.bin/factor/Makefile b/usr.bin/factor/Makefile --- a/usr.bin/factor/Makefile +++ b/usr.bin/factor/Makefile @@ -1,4 +1,3 @@ - .include PROG= factor diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile --- a/usr.bin/false/Makefile +++ b/usr.bin/false/Makefile @@ -1,4 +1,3 @@ - PROG= false .include diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= fetch PROG= fetch LIBADD= fetch diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,4 +1,3 @@ - .include PROG= file2c diff --git a/usr.bin/file2c/tests/Makefile b/usr.bin/file2c/tests/Makefile --- a/usr.bin/file2c/tests/Makefile +++ b/usr.bin/file2c/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/file2c/tests/regress.sh b/usr.bin/file2c/tests/regress.sh --- a/usr.bin/file2c/tests/regress.sh +++ b/usr.bin/file2c/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..9 REGRESSION_START($1) diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile --- a/usr.bin/find/Makefile +++ b/usr.bin/find/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/find/tests/Makefile b/usr.bin/find/tests/Makefile --- a/usr.bin/find/tests/Makefile +++ b/usr.bin/find/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= find_test .include diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile --- a/usr.bin/finger/Makefile +++ b/usr.bin/finger/Makefile @@ -1,4 +1,3 @@ - PROG= finger SRCS= finger.c lprint.c net.c sprint.c util.c MAN= finger.1 finger.conf.5 diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile --- a/usr.bin/fmt/Makefile +++ b/usr.bin/fmt/Makefile @@ -1,4 +1,3 @@ - PROG= fmt .include diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile --- a/usr.bin/fold/Makefile +++ b/usr.bin/fold/Makefile @@ -1,4 +1,3 @@ - .include PROG= fold diff --git a/usr.bin/fold/tests/Makefile b/usr.bin/fold/tests/Makefile --- a/usr.bin/fold/tests/Makefile +++ b/usr.bin/fold/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= fold_test .include diff --git a/usr.bin/fortune/Makefile b/usr.bin/fortune/Makefile --- a/usr.bin/fortune/Makefile +++ b/usr.bin/fortune/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fortune strfile datfiles unstr SUBDIR_DEPEND_datfiles= strfile diff --git a/usr.bin/fortune/Makefile.inc b/usr.bin/fortune/Makefile.inc --- a/usr.bin/fortune/Makefile.inc +++ b/usr.bin/fortune/Makefile.inc @@ -1,4 +1,3 @@ - FORTUNE_SRC= ${SRCTOP}/usr.bin/fortune FORTUNE_OBJ= ${OBJTOP}/usr.bin/fortune diff --git a/usr.bin/fortune/Notes b/usr.bin/fortune/Notes --- a/usr.bin/fortune/Notes +++ b/usr.bin/fortune/Notes @@ -1,4 +1,3 @@ - Warning: The fortunes contained in the fortune database have been collected haphazardly from a cacophony of sources, in number so huge it diff --git a/usr.bin/fortune/README b/usr.bin/fortune/README --- a/usr.bin/fortune/README +++ b/usr.bin/fortune/README @@ -1,4 +1,3 @@ - Some years ago, my neighbor Avery said to me: "There has not been an adequate jokebook published since "Joe_Miller", which came out in 1739 and which, incidentally, was the most miserable no-good ... jokebook in the diff --git a/usr.bin/fortune/datfiles/Makefile b/usr.bin/fortune/datfiles/Makefile --- a/usr.bin/fortune/datfiles/Makefile +++ b/usr.bin/fortune/datfiles/Makefile @@ -1,4 +1,3 @@ - DB= freebsd-tips BLDS= ${DB:S/$/.dat/} diff --git a/usr.bin/fortune/fortune/Makefile b/usr.bin/fortune/fortune/Makefile --- a/usr.bin/fortune/fortune/Makefile +++ b/usr.bin/fortune/fortune/Makefile @@ -1,4 +1,3 @@ - PROG= fortune MAN= fortune.6 CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile diff --git a/usr.bin/fortune/strfile/Makefile b/usr.bin/fortune/strfile/Makefile --- a/usr.bin/fortune/strfile/Makefile +++ b/usr.bin/fortune/strfile/Makefile @@ -1,4 +1,3 @@ - PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 diff --git a/usr.bin/fortune/unstr/Makefile b/usr.bin/fortune/unstr/Makefile --- a/usr.bin/fortune/unstr/Makefile +++ b/usr.bin/fortune/unstr/Makefile @@ -1,4 +1,3 @@ - PROG= unstr MAN= CFLAGS+= -I${FORTUNE_SRC}/strfile diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile --- a/usr.bin/from/Makefile +++ b/usr.bin/from/Makefile @@ -1,4 +1,3 @@ - PROG= from .include diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -1,4 +1,3 @@ - PROG= fstat SRCS= fstat.c fuser.c main.c LINKS= ${BINDIR}/fstat ${BINDIR}/fuser diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile --- a/usr.bin/fsync/Makefile +++ b/usr.bin/fsync/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= fsync diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile --- a/usr.bin/gcore/Makefile +++ b/usr.bin/gcore/Makefile @@ -1,4 +1,3 @@ - PROG= gcore SRCS= elfcore.c gcore.c LIBADD= sbuf util diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile --- a/usr.bin/gencat/Makefile +++ b/usr.bin/gencat/Makefile @@ -1,4 +1,3 @@ - PROG= gencat .include diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile --- a/usr.bin/getconf/Makefile +++ b/usr.bin/getconf/Makefile @@ -1,4 +1,3 @@ - .include PROG= getconf diff --git a/usr.bin/getconf/tests/Makefile b/usr.bin/getconf/tests/Makefile --- a/usr.bin/getconf/tests/Makefile +++ b/usr.bin/getconf/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= getconf_test PROGS+= arch_type diff --git a/usr.bin/getent/Makefile b/usr.bin/getent/Makefile --- a/usr.bin/getent/Makefile +++ b/usr.bin/getent/Makefile @@ -1,4 +1,3 @@ - PROG= getent .include diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -1,4 +1,3 @@ - .include PROG= gh-bc diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile --- a/usr.bin/gh-bc/tests/Makefile +++ b/usr.bin/gh-bc/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -1,4 +1,3 @@ - PROG= gprof SRCS= gprof.c arcs.c dfn.c elf.c lookup.c hertz.c \ printgprof.c printlist.c kernel.c diff --git a/usr.bin/grdc/Makefile b/usr.bin/grdc/Makefile --- a/usr.bin/grdc/Makefile +++ b/usr.bin/grdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= grdc diff --git a/usr.bin/grep/tests/Makefile b/usr.bin/grep/tests/Makefile --- a/usr.bin/grep/tests/Makefile +++ b/usr.bin/grep/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= grep_freebsd_test diff --git a/usr.bin/gzip/tests/Makefile b/usr.bin/gzip/tests/Makefile --- a/usr.bin/gzip/tests/Makefile +++ b/usr.bin/gzip/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/head/Makefile b/usr.bin/head/Makefile --- a/usr.bin/head/Makefile +++ b/usr.bin/head/Makefile @@ -1,4 +1,3 @@ - .include PROG= head diff --git a/usr.bin/head/tests/Makefile b/usr.bin/head/tests/Makefile --- a/usr.bin/head/tests/Makefile +++ b/usr.bin/head/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= head_test diff --git a/usr.bin/hesinfo/Makefile b/usr.bin/hesinfo/Makefile --- a/usr.bin/hesinfo/Makefile +++ b/usr.bin/hesinfo/Makefile @@ -1,4 +1,3 @@ - PROG= hesinfo .include diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile --- a/usr.bin/hexdump/Makefile +++ b/usr.bin/hexdump/Makefile @@ -1,4 +1,3 @@ - .include PROG= hexdump diff --git a/usr.bin/hexdump/tests/Makefile b/usr.bin/hexdump/tests/Makefile --- a/usr.bin/hexdump/tests/Makefile +++ b/usr.bin/hexdump/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= hexdump_test od_test diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile --- a/usr.bin/host/Makefile +++ b/usr.bin/host/Makefile @@ -1,4 +1,3 @@ - LDNSDIR= ${SRCTOP}/contrib/ldns LDNSHOSTDIR= ${SRCTOP}/contrib/ldns-host diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/ident/Makefile b/usr.bin/ident/Makefile --- a/usr.bin/ident/Makefile +++ b/usr.bin/ident/Makefile @@ -1,4 +1,3 @@ - .include PROG= ident diff --git a/usr.bin/ident/tests/Makefile b/usr.bin/ident/tests/Makefile --- a/usr.bin/ident/tests/Makefile +++ b/usr.bin/ident/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= ident_test diff --git a/usr.bin/ident/tests/ident_test.sh b/usr.bin/ident/tests/ident_test.sh --- a/usr.bin/ident/tests/ident_test.sh +++ b/usr.bin/ident/tests/ident_test.sh @@ -1,4 +1,3 @@ - atf_test_case ident ident_body() { atf_check -o file:$(atf_get_srcdir)/test.out \ diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile --- a/usr.bin/indent/Makefile +++ b/usr.bin/indent/Makefile @@ -1,4 +1,3 @@ - .include PROG= indent diff --git a/usr.bin/indent/README b/usr.bin/indent/README --- a/usr.bin/indent/README +++ b/usr.bin/indent/README @@ -1,4 +1,3 @@ - This is the C indenter, it originally came from the University of Illinois via some distribution tape for PDP-11 Unix. It has subsequently been hacked upon by James Gosling @ CMU. It isn't very pretty, and really needs diff --git a/usr.bin/indent/tests/Makefile b/usr.bin/indent/tests/Makefile --- a/usr.bin/indent/tests/Makefile +++ b/usr.bin/indent/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ${PACKAGE}FILES+= binary.0 diff --git a/usr.bin/indent/tests/f_decls.0 b/usr.bin/indent/tests/f_decls.0 --- a/usr.bin/indent/tests/f_decls.0 +++ b/usr.bin/indent/tests/f_decls.0 @@ -1,4 +1,3 @@ - char * x(void) { type identifier; diff --git a/usr.bin/indent/tests/f_decls.0.stdout b/usr.bin/indent/tests/f_decls.0.stdout --- a/usr.bin/indent/tests/f_decls.0.stdout +++ b/usr.bin/indent/tests/f_decls.0.stdout @@ -1,4 +1,3 @@ - char * x(void) { diff --git a/usr.bin/indent/tests/struct.0 b/usr.bin/indent/tests/struct.0 --- a/usr.bin/indent/tests/struct.0 +++ b/usr.bin/indent/tests/struct.0 @@ -1,4 +1,3 @@ - int f(struct x *a); /* See r303485 */ diff --git a/usr.bin/indent/tests/struct.0.stdout b/usr.bin/indent/tests/struct.0.stdout --- a/usr.bin/indent/tests/struct.0.stdout +++ b/usr.bin/indent/tests/struct.0.stdout @@ -1,4 +1,3 @@ - int f(struct x *a); /* See r303485 */ diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile --- a/usr.bin/ipcrm/Makefile +++ b/usr.bin/ipcrm/Makefile @@ -1,4 +1,3 @@ - PROG= ipcrm SRCS= ipcrm.c ipc.c LIBADD= kvm diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile --- a/usr.bin/ipcs/Makefile +++ b/usr.bin/ipcs/Makefile @@ -1,4 +1,3 @@ - PROG= ipcs SRCS= ipcs.c ipc.c LIBADD= kvm diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile --- a/usr.bin/iscsictl/Makefile +++ b/usr.bin/iscsictl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= iscsi PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile --- a/usr.bin/join/Makefile +++ b/usr.bin/join/Makefile @@ -1,4 +1,3 @@ - .include PROG= join diff --git a/usr.bin/join/tests/Makefile b/usr.bin/join/tests/Makefile --- a/usr.bin/join/tests/Makefile +++ b/usr.bin/join/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/join/tests/regress.sh b/usr.bin/join/tests/regress.sh --- a/usr.bin/join/tests/regress.sh +++ b/usr.bin/join/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..1 REGRESSION_START($1) diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile --- a/usr.bin/jot/Makefile +++ b/usr.bin/jot/Makefile @@ -1,4 +1,3 @@ - .include PROG= jot diff --git a/usr.bin/jot/tests/Makefile b/usr.bin/jot/tests/Makefile --- a/usr.bin/jot/tests/Makefile +++ b/usr.bin/jot/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/jot/tests/regress.sh b/usr.bin/jot/tests/regress.sh --- a/usr.bin/jot/tests/regress.sh +++ b/usr.bin/jot/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..60 REGRESSION_START($1) diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/ktrace diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile --- a/usr.bin/keylogin/Makefile +++ b/usr.bin/keylogin/Makefile @@ -1,4 +1,3 @@ - PROG= keylogin LIBADD= rpcsvc diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile --- a/usr.bin/keylogout/Makefile +++ b/usr.bin/keylogout/Makefile @@ -1,4 +1,3 @@ - PROG= keylogout .include diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile --- a/usr.bin/killall/Makefile +++ b/usr.bin/killall/Makefile @@ -1,4 +1,3 @@ - PROG= killall LIBADD= jail diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile --- a/usr.bin/ktrace/Makefile +++ b/usr.bin/ktrace/Makefile @@ -1,4 +1,3 @@ - PROG= ktrace SRCS= ktrace.c subr.c MLINKS= ktrace.1 trace.1 diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile --- a/usr.bin/ktrdump/Makefile +++ b/usr.bin/ktrdump/Makefile @@ -1,4 +1,3 @@ - PROG= ktrdump LIBADD= kvm MAN= ktrdump.8 diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -1,4 +1,3 @@ - .include KYUA_CONFDIR= /etc/kyua diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile --- a/usr.bin/lam/Makefile +++ b/usr.bin/lam/Makefile @@ -1,4 +1,3 @@ - PROG= lam .include diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile --- a/usr.bin/last/Makefile +++ b/usr.bin/last/Makefile @@ -1,4 +1,3 @@ - PROG= last PACKAGE= acct LIBADD= xo diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=acct diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile --- a/usr.bin/lastcomm/tests/Makefile +++ b/usr.bin/lastcomm/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/lastcomm/tests/README b/usr.bin/lastcomm/tests/README --- a/usr.bin/lastcomm/tests/README +++ b/usr.bin/lastcomm/tests/README @@ -1,4 +1,3 @@ - To create the files for regression testing do the following. 1. Run values.sh for a given architecture and accounting version. diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile --- a/usr.bin/ldd/Makefile +++ b/usr.bin/ldd/Makefile @@ -1,4 +1,3 @@ - PROG?= ldd SRCS= ldd.c diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile --- a/usr.bin/ldd32/Makefile +++ b/usr.bin/ldd32/Makefile @@ -1,4 +1,3 @@ - NEED_COMPAT= 32 .include diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile --- a/usr.bin/leave/Makefile +++ b/usr.bin/leave/Makefile @@ -1,4 +1,3 @@ - PROG= leave NO_WFORMAT= diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= less SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common --- a/usr.bin/less/Makefile.common +++ b/usr.bin/less/Makefile.common @@ -1,4 +1,3 @@ - LSDIR= ${SRCTOP}/contrib/less .PATH: ${LSDIR} diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile --- a/usr.bin/lessecho/Makefile +++ b/usr.bin/lessecho/Makefile @@ -1,4 +1,3 @@ - PROG= lessecho SRCS= lessecho.c version.c CLEANFILES= lessecho.1 diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile --- a/usr.bin/lesskey/Makefile +++ b/usr.bin/lesskey/Makefile @@ -1,4 +1,3 @@ - PROG= lesskey SRCS= lesskey.c lesskey_parse.c version.c xbuf.c CLEANFILES= lesskey.1 diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -1,4 +1,3 @@ - #line 2 "" #define YY_INT_ALIGNED short int diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/flex/src diff --git a/usr.bin/lex/version.awk b/usr.bin/lex/version.awk --- a/usr.bin/lex/version.awk +++ b/usr.bin/lex/version.awk @@ -1,4 +1,3 @@ - BEGIN { FS = "[ \t\.\"]+" } diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile --- a/usr.bin/limits/Makefile +++ b/usr.bin/limits/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/limits/tests/Makefile b/usr.bin/limits/tests/Makefile --- a/usr.bin/limits/tests/Makefile +++ b/usr.bin/limits/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= limits_test .include diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile --- a/usr.bin/locale/Makefile +++ b/usr.bin/locale/Makefile @@ -1,4 +1,3 @@ - .include PROG= locale diff --git a/usr.bin/locale/tests/Makefile b/usr.bin/locale/tests/Makefile --- a/usr.bin/locale/tests/Makefile +++ b/usr.bin/locale/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= locale_test diff --git a/usr.bin/localedef/Makefile b/usr.bin/localedef/Makefile --- a/usr.bin/localedef/Makefile +++ b/usr.bin/localedef/Makefile @@ -1,4 +1,3 @@ - PROG= localedef SRCS= charmap.c \ collate.c \ diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile --- a/usr.bin/locate/Makefile +++ b/usr.bin/locate/Makefile @@ -1,5 +1,3 @@ - - SUBDIR= bigram code locate .include diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc --- a/usr.bin/locate/Makefile.inc +++ b/usr.bin/locate/Makefile.inc @@ -1,4 +1,3 @@ - LIBEXECDIR?= /usr/libexec WARNS?= 0 diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile --- a/usr.bin/locate/bigram/Makefile +++ b/usr.bin/locate/bigram/Makefile @@ -1,4 +1,3 @@ - PROG= locate.bigram MAN= BINDIR= ${LIBEXECDIR} diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile --- a/usr.bin/locate/code/Makefile +++ b/usr.bin/locate/code/Makefile @@ -1,4 +1,3 @@ - PROG= locate.code CFLAGS+=-I${.CURDIR}/../locate MAN= diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile --- a/usr.bin/locate/locate/Makefile +++ b/usr.bin/locate/locate/Makefile @@ -1,4 +1,3 @@ - CONFS= locate.rc PROG= locate SRCS= util.c locate.c diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -1,4 +1,3 @@ - PROG= lock BINOWN= root BINMODE=4555 diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile --- a/usr.bin/lockf/Makefile +++ b/usr.bin/lockf/Makefile @@ -1,4 +1,3 @@ - .include PROG= lockf diff --git a/usr.bin/lockf/tests/Makefile b/usr.bin/lockf/tests/Makefile --- a/usr.bin/lockf/tests/Makefile +++ b/usr.bin/lockf/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= lockf_test diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile --- a/usr.bin/logger/Makefile +++ b/usr.bin/logger/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/usr.bin/login/motd.template b/usr.bin/login/motd.template --- a/usr.bin/login/motd.template +++ b/usr.bin/login/motd.template @@ -1,4 +1,3 @@ - Welcome to FreeBSD! Release Notes, Errata: https://www.FreeBSD.org/releases/ diff --git a/usr.bin/logins/Makefile b/usr.bin/logins/Makefile --- a/usr.bin/logins/Makefile +++ b/usr.bin/logins/Makefile @@ -1,4 +1,3 @@ - PROG= logins .include diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile --- a/usr.bin/logname/Makefile +++ b/usr.bin/logname/Makefile @@ -1,4 +1,3 @@ - PROG= logname .include diff --git a/usr.bin/look/Makefile b/usr.bin/look/Makefile --- a/usr.bin/look/Makefile +++ b/usr.bin/look/Makefile @@ -1,4 +1,3 @@ - PROG= look .include diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile --- a/usr.bin/lorder/Makefile +++ b/usr.bin/lorder/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=lorder.sh MAN= lorder.1 diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile --- a/usr.bin/lsvfs/Makefile +++ b/usr.bin/lsvfs/Makefile @@ -1,4 +1,3 @@ - PROG= lsvfs .include diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile --- a/usr.bin/lzmainfo/Makefile +++ b/usr.bin/lzmainfo/Makefile @@ -1,4 +1,3 @@ - PROG= lzmainfo XZDIR= ${SRCTOP}/contrib/xz/src diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile --- a/usr.bin/m4/tests/Makefile +++ b/usr.bin/m4/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/m4/tests/regress.sh b/usr.bin/m4/tests/regress.sh --- a/usr.bin/m4/tests/regress.sh +++ b/usr.bin/m4/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..21 test_m4() { diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile --- a/usr.bin/mail/Makefile +++ b/usr.bin/mail/Makefile @@ -1,4 +1,3 @@ - CONFS= misc/mail.rc PROG= mail SRCS= version.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \ diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile --- a/usr.bin/man/Makefile +++ b/usr.bin/man/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= man.sh LINKS= ${BINDIR}/man ${BINDIR}/manpath diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -1,4 +1,3 @@ - .include MANDOCDIR= ${SRCTOP}/contrib/mandoc diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile --- a/usr.bin/mesg/Makefile +++ b/usr.bin/mesg/Makefile @@ -1,4 +1,3 @@ - PROG= mesg .include diff --git a/usr.bin/ministat/README b/usr.bin/ministat/README --- a/usr.bin/ministat/README +++ b/usr.bin/ministat/README @@ -1,4 +1,3 @@ - A small tool to do the statistics legwork on benchmarks etc. Prepare your data into two files, one number per line diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile --- a/usr.bin/mkcsmapper/Makefile +++ b/usr.bin/mkcsmapper/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkcsmapper diff --git a/usr.bin/mkcsmapper/Makefile.inc b/usr.bin/mkcsmapper/Makefile.inc --- a/usr.bin/mkcsmapper/Makefile.inc +++ b/usr.bin/mkcsmapper/Makefile.inc @@ -1,4 +1,3 @@ - .include SRCS+= lex.l yacc.y diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile --- a/usr.bin/mkcsmapper_static/Makefile +++ b/usr.bin/mkcsmapper_static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper PROG= mkcsmapper_static diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile --- a/usr.bin/mkdep/Makefile +++ b/usr.bin/mkdep/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= mkdep.gcc.sh MAN= mkdep.1 SCRIPTSNAME= mkdep diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb diff --git a/usr.bin/mkesdb/Makefile.inc b/usr.bin/mkesdb/Makefile.inc --- a/usr.bin/mkesdb/Makefile.inc +++ b/usr.bin/mkesdb/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= lex.l yacc.y CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkesdb \ -I${.CURDIR}/../../lib/libc/iconv diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile --- a/usr.bin/mkesdb_static/Makefile +++ b/usr.bin/mkesdb_static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb PROG= mkesdb_static diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile --- a/usr.bin/mkfifo/Makefile +++ b/usr.bin/mkfifo/Makefile @@ -1,4 +1,3 @@ - PROG= mkfifo .include diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile --- a/usr.bin/mkimg/Makefile +++ b/usr.bin/mkimg/Makefile @@ -1,4 +1,3 @@ - .include PROG= mkimg diff --git a/usr.bin/mkimg/tests/Makefile b/usr.bin/mkimg/tests/Makefile --- a/usr.bin/mkimg/tests/Makefile +++ b/usr.bin/mkimg/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR} PACKAGE= tests diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -1,4 +1,3 @@ - mkimg_blksz_list="512 4096" mkimg_format_list="qcow qcow2 raw vhd vhdf vhdx vmdk" mkimg_geom_list="1x1 63x255" diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,4 +1,3 @@ - PROG= mkstr WARNS?= 2 diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile --- a/usr.bin/mktemp/Makefile +++ b/usr.bin/mktemp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/mktemp/tests/Makefile b/usr.bin/mktemp/tests/Makefile --- a/usr.bin/mktemp/tests/Makefile +++ b/usr.bin/mktemp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= mktemp_test diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile --- a/usr.bin/mkuzip/Makefile +++ b/usr.bin/mkuzip/Makefile @@ -1,4 +1,3 @@ - PROG= mkuzip MAN= mkuzip.8 SRCS= mkuzip.c mkuz_blockcache.c mkuz_lzma.c mkuz_zlib.c mkuz_conveyor.c \ diff --git a/usr.bin/morse/Makefile b/usr.bin/morse/Makefile --- a/usr.bin/morse/Makefile +++ b/usr.bin/morse/Makefile @@ -1,4 +1,3 @@ - PROG= morse MAN= morse.6 diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -1,4 +1,3 @@ - PROG= msgs LIBADD= tinfow diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile --- a/usr.bin/mt/Makefile +++ b/usr.bin/mt/Makefile @@ -1,4 +1,3 @@ - PROG= mt LIBADD= mt diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile --- a/usr.bin/nc/Makefile +++ b/usr.bin/nc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/netcat diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -1,4 +1,3 @@ - .include PROG= ncal diff --git a/usr.bin/ncal/tests/Makefile b/usr.bin/ncal/tests/Makefile --- a/usr.bin/ncal/tests/Makefile +++ b/usr.bin/ncal/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/ncal/tests/regress.sh b/usr.bin/ncal/tests/regress.sh --- a/usr.bin/ncal/tests/regress.sh +++ b/usr.bin/ncal/tests/regress.sh @@ -1,4 +1,3 @@ - CAL_BIN="ncal" CAL="${CAL_BIN} -C" NCAL="${CAL_BIN} -N" diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= netstat diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile --- a/usr.bin/newgrp/Makefile +++ b/usr.bin/newgrp/Makefile @@ -1,4 +1,3 @@ - PROG= newgrp LIBADD= crypt util diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -1,4 +1,3 @@ - .include PROG= newkey diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile --- a/usr.bin/nfsstat/Makefile +++ b/usr.bin/nfsstat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsstat diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile --- a/usr.bin/nice/Makefile +++ b/usr.bin/nice/Makefile @@ -1,4 +1,3 @@ - PROG= nice .include diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile --- a/usr.bin/nl/Makefile +++ b/usr.bin/nl/Makefile @@ -1,4 +1,3 @@ - PROG= nl .include diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile --- a/usr.bin/nohup/Makefile +++ b/usr.bin/nohup/Makefile @@ -1,4 +1,3 @@ - PROG= nohup .include diff --git a/usr.bin/number/Makefile b/usr.bin/number/Makefile --- a/usr.bin/number/Makefile +++ b/usr.bin/number/Makefile @@ -1,4 +1,3 @@ - PROG= number MAN= number.6 diff --git a/usr.bin/objcopy/Makefile b/usr.bin/objcopy/Makefile --- a/usr.bin/objcopy/Makefile +++ b/usr.bin/objcopy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/ofed/Makefile b/usr.bin/ofed/Makefile --- a/usr.bin/ofed/Makefile +++ b/usr.bin/ofed/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.bin/ofed/infiniband-diags/Makefile b/usr.bin/ofed/infiniband-diags/Makefile --- a/usr.bin/ofed/infiniband-diags/Makefile +++ b/usr.bin/ofed/infiniband-diags/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.bin/ofed/infiniband-diags/Makefile.inc b/usr.bin/ofed/infiniband-diags/Makefile.inc --- a/usr.bin/ofed/infiniband-diags/Makefile.inc +++ b/usr.bin/ofed/infiniband-diags/Makefile.inc @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/infiniband-diags .PATH: ${_spath}/src ${_spath}/man diff --git a/usr.bin/ofed/infiniband-diags/dump_fts/Makefile b/usr.bin/ofed/infiniband-diags/dump_fts/Makefile --- a/usr.bin/ofed/infiniband-diags/dump_fts/Makefile +++ b/usr.bin/ofed/infiniband-diags/dump_fts/Makefile @@ -1,4 +1,3 @@ - PROG= dump_fts SRCS= dump_fts.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibaddr/Makefile b/usr.bin/ofed/infiniband-diags/ibaddr/Makefile --- a/usr.bin/ofed/infiniband-diags/ibaddr/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibaddr/Makefile @@ -1,4 +1,3 @@ - PROG= ibaddr SRCS= ibaddr.c MAN= ibaddr.8 diff --git a/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile b/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile --- a/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile @@ -1,4 +1,3 @@ - PROG= ibcacheedit SRCS= ibcacheedit.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile b/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile --- a/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile @@ -1,4 +1,3 @@ - PROG= ibccconfig SRCS= ibccconfig.c MAN= ibccconfig.8 diff --git a/usr.bin/ofed/infiniband-diags/ibccquery/Makefile b/usr.bin/ofed/infiniband-diags/ibccquery/Makefile --- a/usr.bin/ofed/infiniband-diags/ibccquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibccquery/Makefile @@ -1,4 +1,3 @@ - PROG= ibccquery SRCS= ibccquery.c MAN= ibccquery.8 diff --git a/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile b/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile --- a/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile +++ b/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile @@ -1,4 +1,3 @@ - PROG= iblinkinfo SRCS= iblinkinfo.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibmirror/Makefile b/usr.bin/ofed/infiniband-diags/ibmirror/Makefile --- a/usr.bin/ofed/infiniband-diags/ibmirror/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibmirror/Makefile @@ -1,4 +1,3 @@ - PROG= ibmirror SRCS= ibmirror.c MAN= diff --git a/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile b/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile --- a/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile @@ -1,4 +1,3 @@ - PROG= ibnetdiscover SRCS= ibnetdiscover.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibping/Makefile b/usr.bin/ofed/infiniband-diags/ibping/Makefile --- a/usr.bin/ofed/infiniband-diags/ibping/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibping/Makefile @@ -1,4 +1,3 @@ - PROG= ibping SRCS= ibping.c MAN= ibping.8 diff --git a/usr.bin/ofed/infiniband-diags/ibportstate/Makefile b/usr.bin/ofed/infiniband-diags/ibportstate/Makefile --- a/usr.bin/ofed/infiniband-diags/ibportstate/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibportstate/Makefile @@ -1,4 +1,3 @@ - PROG= ibportstate SRCS= ibportstate.c MAN= ibportstate.8 diff --git a/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile b/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile --- a/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile @@ -1,4 +1,3 @@ - PROG= ibqueryerrors SRCS= ibqueryerrors.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibroute/Makefile b/usr.bin/ofed/infiniband-diags/ibroute/Makefile --- a/usr.bin/ofed/infiniband-diags/ibroute/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibroute/Makefile @@ -1,4 +1,3 @@ - PROG= ibroute SRCS= ibroute.c MAN= ibroute.8 diff --git a/usr.bin/ofed/infiniband-diags/ibstat/Makefile b/usr.bin/ofed/infiniband-diags/ibstat/Makefile --- a/usr.bin/ofed/infiniband-diags/ibstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibstat/Makefile @@ -1,4 +1,3 @@ - PROG= ibstat SRCS= ibstat.c MAN= ibstat.8 diff --git a/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile b/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile --- a/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile @@ -1,4 +1,3 @@ - PROG= ibsysstat SRCS= ibsysstat.c MAN= ibsysstat.8 diff --git a/usr.bin/ofed/infiniband-diags/ibtracert/Makefile b/usr.bin/ofed/infiniband-diags/ibtracert/Makefile --- a/usr.bin/ofed/infiniband-diags/ibtracert/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibtracert/Makefile @@ -1,4 +1,3 @@ - PROG= ibtracert SRCS= ibtracert.c MAN= ibtracert.8 diff --git a/usr.bin/ofed/infiniband-diags/perfquery/Makefile b/usr.bin/ofed/infiniband-diags/perfquery/Makefile --- a/usr.bin/ofed/infiniband-diags/perfquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/perfquery/Makefile @@ -1,4 +1,3 @@ - PROG= perfquery SRCS= perfquery.c MAN= perfquery.8 diff --git a/usr.bin/ofed/infiniband-diags/saquery/Makefile b/usr.bin/ofed/infiniband-diags/saquery/Makefile --- a/usr.bin/ofed/infiniband-diags/saquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/saquery/Makefile @@ -1,4 +1,3 @@ - PROG= saquery SRCS= saquery.c MAN= saquery.8 diff --git a/usr.bin/ofed/infiniband-diags/sminfo/Makefile b/usr.bin/ofed/infiniband-diags/sminfo/Makefile --- a/usr.bin/ofed/infiniband-diags/sminfo/Makefile +++ b/usr.bin/ofed/infiniband-diags/sminfo/Makefile @@ -1,4 +1,3 @@ - PROG= sminfo SRCS= sminfo.c MAN= sminfo.8 diff --git a/usr.bin/ofed/infiniband-diags/smpdump/Makefile b/usr.bin/ofed/infiniband-diags/smpdump/Makefile --- a/usr.bin/ofed/infiniband-diags/smpdump/Makefile +++ b/usr.bin/ofed/infiniband-diags/smpdump/Makefile @@ -1,4 +1,3 @@ - PROG= smpdump SRCS= smpdump.c MAN= smpdump.8 diff --git a/usr.bin/ofed/infiniband-diags/smpquery/Makefile b/usr.bin/ofed/infiniband-diags/smpquery/Makefile --- a/usr.bin/ofed/infiniband-diags/smpquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/smpquery/Makefile @@ -1,4 +1,3 @@ - PROG= smpquery SRCS= smpquery.c MAN= smpquery.8 diff --git a/usr.bin/ofed/infiniband-diags/vendstat/Makefile b/usr.bin/ofed/infiniband-diags/vendstat/Makefile --- a/usr.bin/ofed/infiniband-diags/vendstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/vendstat/Makefile @@ -1,4 +1,3 @@ - PROG= vendstat SRCS= vendstat.c MAN= vendstat.8 diff --git a/usr.bin/ofed/libibverbs/Makefile b/usr.bin/ofed/libibverbs/Makefile --- a/usr.bin/ofed/libibverbs/Makefile +++ b/usr.bin/ofed/libibverbs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= FreeBSD-rdma SUBDIR= \ diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/Makefile.inc --- a/usr.bin/ofed/libibverbs/Makefile.inc +++ b/usr.bin/ofed/libibverbs/Makefile.inc @@ -1,4 +1,3 @@ - _spath=${SRCTOP}/contrib/ofed/libibverbs .PATH: ${_spath}/examples ${_spath}/man diff --git a/usr.bin/ofed/libibverbs/asyncwatch/Makefile b/usr.bin/ofed/libibverbs/asyncwatch/Makefile --- a/usr.bin/ofed/libibverbs/asyncwatch/Makefile +++ b/usr.bin/ofed/libibverbs/asyncwatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_asyncwatch MAN= ibv_asyncwatch.1 diff --git a/usr.bin/ofed/libibverbs/devices/Makefile b/usr.bin/ofed/libibverbs/devices/Makefile --- a/usr.bin/ofed/libibverbs/devices/Makefile +++ b/usr.bin/ofed/libibverbs/devices/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_devices MAN= ibv_devices.1 diff --git a/usr.bin/ofed/libibverbs/devinfo/Makefile b/usr.bin/ofed/libibverbs/devinfo/Makefile --- a/usr.bin/ofed/libibverbs/devinfo/Makefile +++ b/usr.bin/ofed/libibverbs/devinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_devinfo MAN= ibv_devinfo.1 diff --git a/usr.bin/ofed/libibverbs/rc_pingpong/Makefile b/usr.bin/ofed/libibverbs/rc_pingpong/Makefile --- a/usr.bin/ofed/libibverbs/rc_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/rc_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_rc_pingpong MAN= ibv_rc_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/srq_pingpong/Makefile b/usr.bin/ofed/libibverbs/srq_pingpong/Makefile --- a/usr.bin/ofed/libibverbs/srq_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/srq_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_srq_pingpong MAN= ibv_srq_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/uc_pingpong/Makefile b/usr.bin/ofed/libibverbs/uc_pingpong/Makefile --- a/usr.bin/ofed/libibverbs/uc_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/uc_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_uc_pingpong MAN= ibv_uc_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/ud_pingpong/Makefile b/usr.bin/ofed/libibverbs/ud_pingpong/Makefile --- a/usr.bin/ofed/libibverbs/ud_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/ud_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_ud_pingpong MAN= ibv_ud_pingpong.1 diff --git a/usr.bin/ofed/librdmacm/Makefile b/usr.bin/ofed/librdmacm/Makefile --- a/usr.bin/ofed/librdmacm/Makefile +++ b/usr.bin/ofed/librdmacm/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ucmatose mckey rping udaddy SUBDIR_PARALLEL= diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Makefile.inc --- a/usr.bin/ofed/librdmacm/Makefile.inc +++ b/usr.bin/ofed/librdmacm/Makefile.inc @@ -1,4 +1,3 @@ - _spath=${SRCTOP}/contrib/ofed/librdmacm .PATH: ${_spath}/examples ${_spath}/man diff --git a/usr.bin/ofed/librdmacm/mckey/Makefile b/usr.bin/ofed/librdmacm/mckey/Makefile --- a/usr.bin/ofed/librdmacm/mckey/Makefile +++ b/usr.bin/ofed/librdmacm/mckey/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= mckey MAN= mckey.1 diff --git a/usr.bin/ofed/librdmacm/rping/Makefile b/usr.bin/ofed/librdmacm/rping/Makefile --- a/usr.bin/ofed/librdmacm/rping/Makefile +++ b/usr.bin/ofed/librdmacm/rping/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= rping MAN= rping.1 diff --git a/usr.bin/ofed/librdmacm/ucmatose/Makefile b/usr.bin/ofed/librdmacm/ucmatose/Makefile --- a/usr.bin/ofed/librdmacm/ucmatose/Makefile +++ b/usr.bin/ofed/librdmacm/ucmatose/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ucmatose MAN= ucmatose.1 diff --git a/usr.bin/ofed/librdmacm/udaddy/Makefile b/usr.bin/ofed/librdmacm/udaddy/Makefile --- a/usr.bin/ofed/librdmacm/udaddy/Makefile +++ b/usr.bin/ofed/librdmacm/udaddy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= udaddy MAN= udaddy.1 diff --git a/usr.bin/ofed/opensm/Makefile b/usr.bin/ofed/opensm/Makefile --- a/usr.bin/ofed/opensm/Makefile +++ b/usr.bin/ofed/opensm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/opensm .PATH: ${_spath} ${_spath:H}/man diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile --- a/usr.bin/pagesize/Makefile +++ b/usr.bin/pagesize/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=pagesize.sh MAN= pagesize.1 diff --git a/usr.bin/pamtest/Makefile b/usr.bin/pamtest/Makefile --- a/usr.bin/pamtest/Makefile +++ b/usr.bin/pamtest/Makefile @@ -1,4 +1,3 @@ - OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE = runtime diff --git a/usr.bin/paste/Makefile b/usr.bin/paste/Makefile --- a/usr.bin/paste/Makefile +++ b/usr.bin/paste/Makefile @@ -1,4 +1,3 @@ - PROG= paste .include diff --git a/usr.bin/patch/tests/Makefile b/usr.bin/patch/tests/Makefile --- a/usr.bin/patch/tests/Makefile +++ b/usr.bin/patch/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= unified_patch_test diff --git a/usr.bin/pathchk/Makefile b/usr.bin/pathchk/Makefile --- a/usr.bin/pathchk/Makefile +++ b/usr.bin/pathchk/Makefile @@ -1,4 +1,3 @@ - PROG= pathchk .include diff --git a/usr.bin/perror/Makefile b/usr.bin/perror/Makefile --- a/usr.bin/perror/Makefile +++ b/usr.bin/perror/Makefile @@ -1,4 +1,3 @@ - PROG= perror .include diff --git a/usr.bin/pom/Makefile b/usr.bin/pom/Makefile --- a/usr.bin/pom/Makefile +++ b/usr.bin/pom/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= pom diff --git a/usr.bin/posixshmcontrol/Makefile b/usr.bin/posixshmcontrol/Makefile --- a/usr.bin/posixshmcontrol/Makefile +++ b/usr.bin/posixshmcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= posixshmcontrol LIBADD= jail util diff --git a/usr.bin/pr/Makefile b/usr.bin/pr/Makefile --- a/usr.bin/pr/Makefile +++ b/usr.bin/pr/Makefile @@ -1,4 +1,3 @@ - .include PROG= pr diff --git a/usr.bin/pr/tests/Makefile b/usr.bin/pr/tests/Makefile --- a/usr.bin/pr/tests/Makefile +++ b/usr.bin/pr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= basic2_test diff --git a/usr.bin/primes/Makefile b/usr.bin/primes/Makefile --- a/usr.bin/primes/Makefile +++ b/usr.bin/primes/Makefile @@ -1,4 +1,3 @@ - PROG= primes SRCS= pattern.c pr_tbl.c primes.c spsp.c MAN= diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile --- a/usr.bin/printenv/Makefile +++ b/usr.bin/printenv/Makefile @@ -1,4 +1,3 @@ - .include PROG= printenv diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile --- a/usr.bin/printf/Makefile +++ b/usr.bin/printf/Makefile @@ -1,4 +1,3 @@ - .include PROG= printf diff --git a/usr.bin/printf/tests/Makefile b/usr.bin/printf/tests/Makefile --- a/usr.bin/printf/tests/Makefile +++ b/usr.bin/printf/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/printf/tests/regress.sh b/usr.bin/printf/tests/regress.sh --- a/usr.bin/printf/tests/regress.sh +++ b/usr.bin/printf/tests/regress.sh @@ -1,4 +1,3 @@ - REGRESSION_START($1) echo '1..24' diff --git a/usr.bin/proccontrol/Makefile b/usr.bin/proccontrol/Makefile --- a/usr.bin/proccontrol/Makefile +++ b/usr.bin/proccontrol/Makefile @@ -1,4 +1,3 @@ - PROG= proccontrol .include diff --git a/usr.bin/procstat/Makefile b/usr.bin/procstat/Makefile --- a/usr.bin/procstat/Makefile +++ b/usr.bin/procstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= procstat diff --git a/usr.bin/procstat/tests/Makefile b/usr.bin/procstat/tests/Makefile --- a/usr.bin/procstat/tests/Makefile +++ b/usr.bin/procstat/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= procstat_test PROGS+= while1 diff --git a/usr.bin/protect/Makefile b/usr.bin/protect/Makefile --- a/usr.bin/protect/Makefile +++ b/usr.bin/protect/Makefile @@ -1,4 +1,3 @@ - PROG= protect .include diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile --- a/usr.bin/quota/Makefile +++ b/usr.bin/quota/Makefile @@ -1,4 +1,3 @@ - PROG= quota BINOWN= root BINMODE=4555 diff --git a/usr.bin/random/Makefile b/usr.bin/random/Makefile --- a/usr.bin/random/Makefile +++ b/usr.bin/random/Makefile @@ -1,4 +1,3 @@ - PROG= random MAN= random.6 SRCS= random.c randomize_fd.c diff --git a/usr.bin/rctl/Makefile b/usr.bin/rctl/Makefile --- a/usr.bin/rctl/Makefile +++ b/usr.bin/rctl/Makefile @@ -1,4 +1,3 @@ - PROG= rctl MAN= rctl.8 diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile --- a/usr.bin/renice/Makefile +++ b/usr.bin/renice/Makefile @@ -1,4 +1,3 @@ - .include PROG= renice diff --git a/usr.bin/resizewin/Makefile b/usr.bin/resizewin/Makefile --- a/usr.bin/resizewin/Makefile +++ b/usr.bin/resizewin/Makefile @@ -1,4 +1,3 @@ - PROG= resizewin .include diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile --- a/usr.bin/rev/Makefile +++ b/usr.bin/rev/Makefile @@ -1,4 +1,3 @@ - PROG= rev .include diff --git a/usr.bin/revoke/Makefile b/usr.bin/revoke/Makefile --- a/usr.bin/revoke/Makefile +++ b/usr.bin/revoke/Makefile @@ -1,4 +1,3 @@ - PROG= revoke .include diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile --- a/usr.bin/rpcgen/Makefile +++ b/usr.bin/rpcgen/Makefile @@ -1,4 +1,3 @@ - PROG= rpcgen SRCS= rpc_main.c rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \ rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile --- a/usr.bin/rpcinfo/Makefile +++ b/usr.bin/rpcinfo/Makefile @@ -1,4 +1,3 @@ - PROG= rpcinfo SRCS= rpcinfo.c MAN= rpcinfo.8 diff --git a/usr.bin/rs/Makefile b/usr.bin/rs/Makefile --- a/usr.bin/rs/Makefile +++ b/usr.bin/rs/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= rs diff --git a/usr.bin/rs/tests/Makefile b/usr.bin/rs/tests/Makefile --- a/usr.bin/rs/tests/Makefile +++ b/usr.bin/rs/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rs_test .include diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -1,4 +1,3 @@ - PROG= rup LIBADD= rpcsvc diff --git a/usr.bin/ruptime/Makefile b/usr.bin/ruptime/Makefile --- a/usr.bin/ruptime/Makefile +++ b/usr.bin/ruptime/Makefile @@ -1,4 +1,3 @@ - PROG= ruptime PACKAGE=rcmds diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -1,4 +1,3 @@ - PROG = rusers LIBADD= rpcsvc diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile --- a/usr.bin/rwall/Makefile +++ b/usr.bin/rwall/Makefile @@ -1,4 +1,3 @@ - PROG = rwall .include diff --git a/usr.bin/rwho/Makefile b/usr.bin/rwho/Makefile --- a/usr.bin/rwho/Makefile +++ b/usr.bin/rwho/Makefile @@ -1,4 +1,3 @@ - PROG= rwho PACKAGE=rcmds diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile --- a/usr.bin/script/Makefile +++ b/usr.bin/script/Makefile @@ -1,4 +1,3 @@ - PROG= script LIBADD= util diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile --- a/usr.bin/sdiff/Makefile +++ b/usr.bin/sdiff/Makefile @@ -1,4 +1,3 @@ - .include PROG= sdiff diff --git a/usr.bin/sdiff/tests/Makefile b/usr.bin/sdiff/tests/Makefile --- a/usr.bin/sdiff/tests/Makefile +++ b/usr.bin/sdiff/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= sdiff_test diff --git a/usr.bin/sdiotool/Makefile b/usr.bin/sdiotool/Makefile --- a/usr.bin/sdiotool/Makefile +++ b/usr.bin/sdiotool/Makefile @@ -1,4 +1,3 @@ - PROG= sdiotool SRCS= sdiotool.c cam_sdio.c linux_sdio_compat.c diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile --- a/usr.bin/sed/Makefile +++ b/usr.bin/sed/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/sed/POSIX b/usr.bin/sed/POSIX --- a/usr.bin/sed/POSIX +++ b/usr.bin/sed/POSIX @@ -1,4 +1,3 @@ - Comments on the IEEE P1003.2 Draft 12 Part 2: Shell and Utilities Section 4.55: sed - Stream editor diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile --- a/usr.bin/sed/tests/Makefile +++ b/usr.bin/sed/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= sed2_test diff --git a/usr.bin/sed/tests/regress.multitest.out/7.8 b/usr.bin/sed/tests/regress.multitest.out/7.8 --- a/usr.bin/sed/tests/regress.multitest.out/7.8 +++ b/usr.bin/sed/tests/regress.multitest.out/7.8 @@ -1 +0,0 @@ - diff --git a/usr.bin/sed/tests/regress.multitest.out/Makefile b/usr.bin/sed/tests/regress.multitest.out/Makefile --- a/usr.bin/sed/tests/regress.multitest.out/Makefile +++ b/usr.bin/sed/tests/regress.multitest.out/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/sed/regress.multitest.out diff --git a/usr.bin/sed/tests/regress.sh b/usr.bin/sed/tests/regress.sh --- a/usr.bin/sed/tests/regress.sh +++ b/usr.bin/sed/tests/regress.sh @@ -1,4 +1,3 @@ - REGRESSION_START($1) echo '1..26' diff --git a/usr.bin/seq/tests/Makefile b/usr.bin/seq/tests/Makefile --- a/usr.bin/seq/tests/Makefile +++ b/usr.bin/seq/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= seq_test diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile --- a/usr.bin/shar/Makefile +++ b/usr.bin/shar/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=shar.sh MAN= shar.1 diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile --- a/usr.bin/showmount/Makefile +++ b/usr.bin/showmount/Makefile @@ -1,4 +1,3 @@ - PROG= showmount MAN= showmount.8 diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile --- a/usr.bin/smbutil/Makefile +++ b/usr.bin/smbutil/Makefile @@ -1,4 +1,3 @@ - PROG= smbutil PACKAGE= smbutils SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile --- a/usr.bin/sockstat/Makefile +++ b/usr.bin/sockstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= sockstat diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile --- a/usr.bin/soelim/Makefile +++ b/usr.bin/soelim/Makefile @@ -1,4 +1,3 @@ - .include PROG= soelim diff --git a/usr.bin/soelim/tests/Makefile b/usr.bin/soelim/tests/Makefile --- a/usr.bin/soelim/tests/Makefile +++ b/usr.bin/soelim/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= soelim_test diff --git a/usr.bin/soelim/tests/soelim_test.sh b/usr.bin/soelim/tests/soelim_test.sh --- a/usr.bin/soelim/tests/soelim_test.sh +++ b/usr.bin/soelim/tests/soelim_test.sh @@ -1,4 +1,3 @@ - atf_test_case stdin stdin_head() { diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h --- a/usr.bin/sort/bwstring.h +++ b/usr.bin/sort/bwstring.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h --- a/usr.bin/sort/coll.h +++ b/usr.bin/sort/coll.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h --- a/usr.bin/sort/file.h +++ b/usr.bin/sort/file.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h --- a/usr.bin/sort/mem.h +++ b/usr.bin/sort/mem.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h --- a/usr.bin/sort/radixsort.h +++ b/usr.bin/sort/radixsort.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/sort/tests/Makefile b/usr.bin/sort/tests/Makefile --- a/usr.bin/sort/tests/Makefile +++ b/usr.bin/sort/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= sort_test diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h --- a/usr.bin/sort/vsort.h +++ b/usr.bin/sort/vsort.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile --- a/usr.bin/split/Makefile +++ b/usr.bin/split/Makefile @@ -1,4 +1,3 @@ - .include PROG= split diff --git a/usr.bin/split/tests/Makefile b/usr.bin/split/tests/Makefile --- a/usr.bin/split/tests/Makefile +++ b/usr.bin/split/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= split_test diff --git a/usr.bin/ssh-copy-id/Makefile b/usr.bin/ssh-copy-id/Makefile --- a/usr.bin/ssh-copy-id/Makefile +++ b/usr.bin/ssh-copy-id/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= ssh-copy-id.sh MAN= ssh-copy-id.1 PACKAGE= ssh diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile --- a/usr.bin/stat/Makefile +++ b/usr.bin/stat/Makefile @@ -1,4 +1,3 @@ - .include PROG= stat diff --git a/usr.bin/stat/tests/Makefile b/usr.bin/stat/tests/Makefile --- a/usr.bin/stat/tests/Makefile +++ b/usr.bin/stat/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= readlink_test ATF_TESTS_SH+= stat_test diff --git a/usr.bin/stdbuf/Makefile b/usr.bin/stdbuf/Makefile --- a/usr.bin/stdbuf/Makefile +++ b/usr.bin/stdbuf/Makefile @@ -1,4 +1,3 @@ - PROG= stdbuf SRCS= stdbuf.c diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -1,4 +1,3 @@ - .include ELFTCDIR= ${SRCTOP}/contrib/elftoolchain diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,4 +1,3 @@ - .include PROG= su diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,3 @@ - .include PROG= systat diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile --- a/usr.bin/tabs/Makefile +++ b/usr.bin/tabs/Makefile @@ -1,4 +1,3 @@ - PROG= tabs LIBADD= tinfow diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile --- a/usr.bin/tail/Makefile +++ b/usr.bin/tail/Makefile @@ -1,4 +1,3 @@ - .include PROG= tail diff --git a/usr.bin/tail/tests/Makefile b/usr.bin/tail/tests/Makefile --- a/usr.bin/tail/tests/Makefile +++ b/usr.bin/tail/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= tail_test diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -1,4 +1,3 @@ - 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 diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 3 diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile --- a/usr.bin/tcopy/Makefile +++ b/usr.bin/tcopy/Makefile @@ -1,4 +1,3 @@ - PROG= tcopy .include diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile --- a/usr.bin/tee/Makefile +++ b/usr.bin/tee/Makefile @@ -1,4 +1,3 @@ - PROG= tee .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= telnet diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile --- a/usr.bin/tests/Makefile +++ b/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .PATH: ${SRCTOP}/tests diff --git a/usr.bin/tests/regress.m4 b/usr.bin/tests/regress.m4 --- a/usr.bin/tests/regress.m4 +++ b/usr.bin/tests/regress.m4 @@ -1,4 +1,3 @@ - dnl A library of routines for doing regression tests for userland utilities. dnl Start up. We initialise the exit status to 0 (no failure) and change diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/libexec/tftpd diff --git a/usr.bin/tftp/tests/Makefile b/usr.bin/tftp/tests/Makefile --- a/usr.bin/tftp/tests/Makefile +++ b/usr.bin/tftp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= tftp_test diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile --- a/usr.bin/time/Makefile +++ b/usr.bin/time/Makefile @@ -1,4 +1,3 @@ - PROG= time .include diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile --- a/usr.bin/tip/Makefile +++ b/usr.bin/tip/Makefile @@ -1,4 +1,3 @@ - SUBDIR=tip .include diff --git a/usr.bin/tip/Makefile.inc b/usr.bin/tip/Makefile.inc --- a/usr.bin/tip/Makefile.inc +++ b/usr.bin/tip/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.bin/tip/README b/usr.bin/tip/README --- a/usr.bin/tip/README +++ b/usr.bin/tip/README @@ -1,4 +1,3 @@ - Tip can be configured in a number of ways: ACU's: diff --git a/usr.bin/tip/TODO b/usr.bin/tip/TODO --- a/usr.bin/tip/TODO +++ b/usr.bin/tip/TODO @@ -1,4 +1,3 @@ - 1. Rethink protection glitches on REMOTE & PHONES files (setuid/setgid??). diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,3 @@ - .include PROG= top diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile --- a/usr.bin/touch/Makefile +++ b/usr.bin/touch/Makefile @@ -1,4 +1,3 @@ - PROG= touch .include diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/tr/tests/Makefile b/usr.bin/tr/tests/Makefile --- a/usr.bin/tr/tests/Makefile +++ b/usr.bin/tr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/tr/tests/regress.0d.out b/usr.bin/tr/tests/regress.0d.out --- a/usr.bin/tr/tests/regress.0d.out +++ b/usr.bin/tr/tests/regress.0d.out @@ -1 +0,0 @@ - diff --git a/usr.bin/tr/tests/regress.sh b/usr.bin/tr/tests/regress.sh --- a/usr.bin/tr/tests/regress.sh +++ b/usr.bin/tr/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..14 REGRESSION_START($1) diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile --- a/usr.bin/true/Makefile +++ b/usr.bin/true/Makefile @@ -1,4 +1,3 @@ - PROG= true .include diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile --- a/usr.bin/truncate/Makefile +++ b/usr.bin/truncate/Makefile @@ -1,4 +1,3 @@ - .include PROG= truncate diff --git a/usr.bin/truncate/tests/Makefile b/usr.bin/truncate/tests/Makefile --- a/usr.bin/truncate/tests/Makefile +++ b/usr.bin/truncate/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= truncate_test .include diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -1,4 +1,3 @@ - PROG= truss SRCS= main.c setup.c syscalls.c diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile --- a/usr.bin/tsort/Makefile +++ b/usr.bin/tsort/Makefile @@ -1,4 +1,3 @@ - .include PROG= tsort diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile --- a/usr.bin/tty/Makefile +++ b/usr.bin/tty/Makefile @@ -1,4 +1,3 @@ - PROG= tty .include diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -1,4 +1,3 @@ - PROG= ul LIBADD= tinfow diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile --- a/usr.bin/uname/Makefile +++ b/usr.bin/uname/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= uname diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile --- a/usr.bin/unexpand/Makefile +++ b/usr.bin/unexpand/Makefile @@ -1,4 +1,3 @@ - PROG= unexpand MAN= diff --git a/usr.bin/unifdef/tests/Makefile b/usr.bin/unifdef/tests/Makefile --- a/usr.bin/unifdef/tests/Makefile +++ b/usr.bin/unifdef/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= unifdef_test diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile --- a/usr.bin/uniq/Makefile +++ b/usr.bin/uniq/Makefile @@ -1,4 +1,3 @@ - .include PROG= uniq diff --git a/usr.bin/uniq/tests/Makefile b/usr.bin/uniq/tests/Makefile --- a/usr.bin/uniq/tests/Makefile +++ b/usr.bin/uniq/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= uniq_test diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -1,4 +1,3 @@ - .include PROG= units diff --git a/usr.bin/units/README b/usr.bin/units/README --- a/usr.bin/units/README +++ b/usr.bin/units/README @@ -1,4 +1,3 @@ - This is a program which I wrote as a clone of the UNIX 'units' command. I threw it together in a couple days, but it seems to work, with some restrictions. I have tested it under DOS with Borland C and diff --git a/usr.bin/units/definitions.units b/usr.bin/units/definitions.units --- a/usr.bin/units/definitions.units +++ b/usr.bin/units/definitions.units @@ -1,4 +1,3 @@ - # primitive units m !a! diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile --- a/usr.bin/units/tests/Makefile +++ b/usr.bin/units/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= basics_test diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile --- a/usr.bin/unvis/Makefile +++ b/usr.bin/unvis/Makefile @@ -1,4 +1,3 @@ - PROG= unvis .PATH: ${SRCTOP}/contrib/unvis diff --git a/usr.bin/unzip/Makefile b/usr.bin/unzip/Makefile --- a/usr.bin/unzip/Makefile +++ b/usr.bin/unzip/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/unzip/tests/Makefile b/usr.bin/unzip/tests/Makefile --- a/usr.bin/unzip/tests/Makefile +++ b/usr.bin/unzip/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile --- a/usr.bin/users/Makefile +++ b/usr.bin/users/Makefile @@ -1,4 +1,3 @@ - WARNS?= 3 PROG_CXX= users PACKAGE= acct diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile --- a/usr.bin/vgrind/Makefile +++ b/usr.bin/vgrind/Makefile @@ -1,4 +1,3 @@ - PROG= vfontedpr SRCS= regexp.c vfontedpr.c SCRIPTS=vgrind.sh diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h --- a/usr.bin/vi/config.h +++ b/usr.bin/vi/config.h @@ -1,4 +1,3 @@ - /* Define when using wide characters */ #define USE_WIDECHAR diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h --- a/usr.bin/vi/pathnames.h +++ b/usr.bin/vi/pathnames.h @@ -1,4 +1,3 @@ - /* Read standard system paths first. */ #include diff --git a/usr.bin/vis/Makefile b/usr.bin/vis/Makefile --- a/usr.bin/vis/Makefile +++ b/usr.bin/vis/Makefile @@ -1,4 +1,3 @@ - PROG= vis SRCS= vis.c foldit.c diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= vmstat diff --git a/usr.bin/vmstat/tests/Makefile b/usr.bin/vmstat/tests/Makefile --- a/usr.bin/vmstat/tests/Makefile +++ b/usr.bin/vmstat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= vmstat_test diff --git a/usr.bin/vtfontcvt/Makefile b/usr.bin/vtfontcvt/Makefile --- a/usr.bin/vtfontcvt/Makefile +++ b/usr.bin/vtfontcvt/Makefile @@ -1,4 +1,3 @@ - PROG= vtfontcvt SRCS= vtfontcvt.c lz4.c MAN8= vtfontcvt.8 diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile --- a/usr.bin/w/Makefile +++ b/usr.bin/w/Makefile @@ -1,4 +1,3 @@ - PROG= w SRCS= fmt.c pr_time.c proc_compare.c w.c MAN= w.1 uptime.1 diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile --- a/usr.bin/wall/Makefile +++ b/usr.bin/wall/Makefile @@ -1,4 +1,3 @@ - PROG= wall SRCS= ttymsg.c wall.c BINGRP= tty diff --git a/usr.bin/wall/ttymsg.h b/usr.bin/wall/ttymsg.h --- a/usr.bin/wall/ttymsg.h +++ b/usr.bin/wall/ttymsg.h @@ -1,4 +1,3 @@ - #define TTYMSG_IOV_MAX 32 const char *ttymsg(struct iovec *, int, const char *, int); diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile --- a/usr.bin/wc/Makefile +++ b/usr.bin/wc/Makefile @@ -1,4 +1,3 @@ - .include PROG= wc diff --git a/usr.bin/wc/tests/Makefile b/usr.bin/wc/tests/Makefile --- a/usr.bin/wc/tests/Makefile +++ b/usr.bin/wc/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= wc_test diff --git a/usr.bin/wg/Makefile b/usr.bin/wg/Makefile --- a/usr.bin/wg/Makefile +++ b/usr.bin/wg/Makefile @@ -1,4 +1,3 @@ - PROG= wg MAN= wg.8 diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile --- a/usr.bin/what/Makefile +++ b/usr.bin/what/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= what diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile --- a/usr.bin/whereis/Makefile +++ b/usr.bin/whereis/Makefile @@ -1,4 +1,3 @@ - PROG= whereis .include diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile --- a/usr.bin/which/Makefile +++ b/usr.bin/which/Makefile @@ -1,4 +1,3 @@ - PROG= which .include diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile --- a/usr.bin/who/Makefile +++ b/usr.bin/who/Makefile @@ -1,4 +1,3 @@ - PROG= who PACKAGE= acct diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile --- a/usr.bin/whois/Makefile +++ b/usr.bin/whois/Makefile @@ -1,4 +1,3 @@ - PROG= whois .if defined(SOCKS) diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile --- a/usr.bin/write/Makefile +++ b/usr.bin/write/Makefile @@ -1,4 +1,3 @@ - PROG= write BINMODE=2555 BINGRP= tty diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,4 +1,3 @@ - echo 1..21 REGRESSION_START($1) diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/xinstall/tests/Makefile b/usr.bin/xinstall/tests/Makefile --- a/usr.bin/xinstall/tests/Makefile +++ b/usr.bin/xinstall/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= install_test .include diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile --- a/usr.bin/xo/Makefile +++ b/usr.bin/xo/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xo/tests/Makefile b/usr.bin/xo/tests/Makefile --- a/usr.bin/xo/tests/Makefile +++ b/usr.bin/xo/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/usr.bin/xohtml/Makefile b/usr.bin/xohtml/Makefile --- a/usr.bin/xohtml/Makefile +++ b/usr.bin/xohtml/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xolint/Makefile b/usr.bin/xolint/Makefile --- a/usr.bin/xolint/Makefile +++ b/usr.bin/xolint/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xopo/Makefile b/usr.bin/xopo/Makefile --- a/usr.bin/xopo/Makefile +++ b/usr.bin/xopo/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile --- a/usr.bin/xstr/Makefile +++ b/usr.bin/xstr/Makefile @@ -1,4 +1,3 @@ - PROG= xstr .include diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -1,4 +1,3 @@ - PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -1,4 +1,3 @@ - .include BYACC_SRC= ${SRCTOP}/contrib/byacc diff --git a/usr.bin/yacc/tests/Makefile b/usr.bin/yacc/tests/Makefile --- a/usr.bin/yacc/tests/Makefile +++ b/usr.bin/yacc/tests/Makefile @@ -1,4 +1,3 @@ - .include TEST_DIR= ${SRCTOP}/contrib/byacc/test diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile --- a/usr.bin/yes/Makefile +++ b/usr.bin/yes/Makefile @@ -1,4 +1,3 @@ - PROG= yes .include diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile --- a/usr.bin/ypcat/Makefile +++ b/usr.bin/ypcat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypcat diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile --- a/usr.bin/ypmatch/Makefile +++ b/usr.bin/ypmatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypmatch diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile --- a/usr.bin/ypwhich/Makefile +++ b/usr.bin/ypwhich/Makefile @@ -1,4 +1,3 @@ - YPSERV=${SRCTOP}/usr.sbin/ypserv/common .PATH: ${YPSERV} diff --git a/usr.bin/zstd/Makefile b/usr.bin/zstd/Makefile --- a/usr.bin/zstd/Makefile +++ b/usr.bin/zstd/Makefile @@ -1,4 +1,3 @@ - PROG= zstd SRCS= \ benchfn.c \ diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= adduser \ diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64 --- a/usr.sbin/Makefile.aarch64 +++ b/usr.sbin/Makefile.aarch64 @@ -1,4 +1,3 @@ - .if ${MK_ACPI} != "no" SUBDIR+= acpi .endif diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -1,4 +1,3 @@ - # mptable: broken (not 64 bit clean) # pnpinfo: crashes (not really useful anyway) .if ${MK_ACPI} != "no" diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -1,4 +1,3 @@ - .if ${MK_ACPI} != "no" SUBDIR+= acpi .endif diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc --- a/usr.sbin/Makefile.inc +++ b/usr.sbin/Makefile.inc @@ -1,2 +1 @@ - BINDIR?= /usr/sbin diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc --- a/usr.sbin/Makefile.powerpc +++ b/usr.sbin/Makefile.powerpc @@ -1,4 +1,3 @@ - .if ${MACHINE_ARCH} != "powerpcspe" SUBDIR+= nvram .endif diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile --- a/usr.sbin/ac/Makefile +++ b/usr.sbin/ac/Makefile @@ -1,4 +1,3 @@ - PROG= ac PACKAGE= acct MAN= ac.8 diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile --- a/usr.sbin/accton/Makefile +++ b/usr.sbin/accton/Makefile @@ -1,4 +1,3 @@ - PROG= accton MAN= accton.8 diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -1,4 +1,3 @@ - PROG= acpidb SRCS= acpidb.c diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile --- a/usr.sbin/acpi/acpidump/Makefile +++ b/usr.sbin/acpi/acpidump/Makefile @@ -1,4 +1,3 @@ - PROG= acpidump MAN= acpidump.8 SRCS= acpi.c acpi_user.c acpidump.c diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -1,4 +1,3 @@ - PROG= iasl # common diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile --- a/usr.sbin/adduser/Makefile +++ b/usr.sbin/adduser/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=adduser.sh rmuser.sh MAN= adduser.conf.5 adduser.8 rmuser.8 diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,4 +1,3 @@ - PROG= apm MAN= apm.8 MLINKS= apm.8 apmconf.8 diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,4 +1,3 @@ - CONFS= apmd.conf PROG= apmd MAN= apmd.8 diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c --- a/usr.sbin/apmd/contrib/pccardq.c +++ b/usr.sbin/apmd/contrib/pccardq.c @@ -1,4 +1,3 @@ - #include #include #include diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile --- a/usr.sbin/arp/Makefile +++ b/usr.sbin/arp/Makefile @@ -1,4 +1,3 @@ - .include PROG= arp diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile --- a/usr.sbin/authpf/Makefile +++ b/usr.sbin/authpf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/authpf PROG= authpf diff --git a/usr.sbin/autofs/Makefile b/usr.sbin/autofs/Makefile --- a/usr.sbin/autofs/Makefile +++ b/usr.sbin/autofs/Makefile @@ -1,4 +1,3 @@ - CONFS= auto_master PACKAGE=autofs PROG= automountd diff --git a/usr.sbin/autofs/autofs/Makefile b/usr.sbin/autofs/autofs/Makefile --- a/usr.sbin/autofs/autofs/Makefile +++ b/usr.sbin/autofs/autofs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= autofs CONFS= include_ldap \ diff --git a/usr.sbin/bhyve/kbdlayout/Makefile b/usr.sbin/bhyve/kbdlayout/Makefile --- a/usr.sbin/bhyve/kbdlayout/Makefile +++ b/usr.sbin/bhyve/kbdlayout/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bhyve FILESDIR= ${SHAREDIR}/bhyve/kbdlayout FILES= default \ diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile --- a/usr.sbin/bhyveload/Makefile +++ b/usr.sbin/bhyveload/Makefile @@ -1,4 +1,3 @@ - PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile --- a/usr.sbin/blacklistctl/Makefile +++ b/usr.sbin/blacklistctl/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc --- a/usr.sbin/bluetooth/Makefile.inc +++ b/usr.sbin/bluetooth/Makefile.inc @@ -1,2 +1 @@ - .include "${.CURDIR:H:H}/Makefile.inc" diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile b/usr.sbin/bluetooth/ath3kfw/Makefile --- a/usr.sbin/bluetooth/ath3kfw/Makefile +++ b/usr.sbin/bluetooth/ath3kfw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth PROG= ath3kfw MAN= ath3kfw.8 diff --git a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt --- a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt +++ b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt @@ -1,4 +1,3 @@ - BCM firmware version 2.15 Copyright (c) 2000-2002 Broadcom Corporation diff --git a/usr.sbin/bluetooth/bcmfw/README b/usr.sbin/bluetooth/bcmfw/README --- a/usr.sbin/bluetooth/bcmfw/README +++ b/usr.sbin/bluetooth/bcmfw/README @@ -1,4 +1,3 @@ - This directory will eventually also contain copies of the broadcom firmware. It WILL look like: diff --git a/usr.sbin/bluetooth/bluetooth-config/Makefile b/usr.sbin/bluetooth/bluetooth-config/Makefile --- a/usr.sbin/bluetooth/bluetooth-config/Makefile +++ b/usr.sbin/bluetooth/bluetooth-config/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth SCRIPTS=bluetooth-config.sh MAN= bluetooth-config.8 diff --git a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample --- a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample +++ b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample @@ -1,4 +1,3 @@ - device { bdaddr 00:50:f2:e5:68:84; name "Bluetooth Mouse"; diff --git a/usr.sbin/bluetooth/iwmbtfw/Makefile b/usr.sbin/bluetooth/iwmbtfw/Makefile --- a/usr.sbin/bluetooth/iwmbtfw/Makefile +++ b/usr.sbin/bluetooth/iwmbtfw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth CONFS= iwmbtfw.conf CONFSDIR= /etc/devd diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile --- a/usr.sbin/boot0cfg/Makefile +++ b/usr.sbin/boot0cfg/Makefile @@ -1,4 +1,3 @@ - PROG= boot0cfg MAN= boot0cfg.8 diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile --- a/usr.sbin/bootparamd/Makefile +++ b/usr.sbin/bootparamd/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bootparamd callbootd .include diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc --- a/usr.sbin/bootparamd/Makefile.inc +++ b/usr.sbin/bootparamd/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin NO_WCAST_ALIGN= diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -1,4 +1,3 @@ - .include PROG= bootparamd diff --git a/usr.sbin/bootparamd/bootparamd/README b/usr.sbin/bootparamd/bootparamd/README --- a/usr.sbin/bootparamd/bootparamd/README +++ b/usr.sbin/bootparamd/bootparamd/README @@ -1,4 +1,3 @@ - This directory contains a version of the rpc.bootparamd, which have been written using the Sun's RPC protocol for bootparamd. To use it you must have a copy of the bootparam_prot.x file which on Sun systems you find in diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -1,4 +1,3 @@ - PROG= callbootd MAN= SRCS= callbootd.c ${GENSRCS} diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile --- a/usr.sbin/bsdconfig/Makefile +++ b/usr.sbin/bsdconfig/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= console \ diff --git a/usr.sbin/bsdconfig/console/Makefile b/usr.sbin/bsdconfig/console/Makefile --- a/usr.sbin/bsdconfig/console/Makefile +++ b/usr.sbin/bsdconfig/console/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console diff --git a/usr.sbin/bsdconfig/console/include/Makefile b/usr.sbin/bsdconfig/console/include/Makefile --- a/usr.sbin/bsdconfig/console/include/Makefile +++ b/usr.sbin/bsdconfig/console/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/diskmgmt/Makefile b/usr.sbin/bsdconfig/diskmgmt/Makefile --- a/usr.sbin/bsdconfig/diskmgmt/Makefile +++ b/usr.sbin/bsdconfig/diskmgmt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt diff --git a/usr.sbin/bsdconfig/diskmgmt/include/Makefile b/usr.sbin/bsdconfig/diskmgmt/include/Makefile --- a/usr.sbin/bsdconfig/diskmgmt/include/Makefile +++ b/usr.sbin/bsdconfig/diskmgmt/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/docsinstall/Makefile b/usr.sbin/bsdconfig/docsinstall/Makefile --- a/usr.sbin/bsdconfig/docsinstall/Makefile +++ b/usr.sbin/bsdconfig/docsinstall/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall diff --git a/usr.sbin/bsdconfig/docsinstall/include/Makefile b/usr.sbin/bsdconfig/docsinstall/include/Makefile --- a/usr.sbin/bsdconfig/docsinstall/include/Makefile +++ b/usr.sbin/bsdconfig/docsinstall/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/dot/Makefile b/usr.sbin/bsdconfig/dot/Makefile --- a/usr.sbin/bsdconfig/dot/Makefile +++ b/usr.sbin/bsdconfig/dot/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/dot diff --git a/usr.sbin/bsdconfig/dot/include/Makefile b/usr.sbin/bsdconfig/dot/include/Makefile --- a/usr.sbin/bsdconfig/dot/include/Makefile +++ b/usr.sbin/bsdconfig/dot/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/dot/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/examples/Makefile b/usr.sbin/bsdconfig/examples/Makefile --- a/usr.sbin/bsdconfig/examples/Makefile +++ b/usr.sbin/bsdconfig/examples/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/examples/bsdconfig FILES= add_some_packages.sh browse_packages_http.sh bsdconfigrc diff --git a/usr.sbin/bsdconfig/include/Makefile b/usr.sbin/bsdconfig/include/Makefile --- a/usr.sbin/bsdconfig/include/Makefile +++ b/usr.sbin/bsdconfig/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/include FILES= bsdconfig.hlp media.hlp messages.subr network_device.hlp \ options.hlp tcp.hlp usage.hlp diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile --- a/usr.sbin/bsdconfig/includes/Makefile +++ b/usr.sbin/bsdconfig/includes/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/includes diff --git a/usr.sbin/bsdconfig/includes/include/Makefile b/usr.sbin/bsdconfig/includes/include/Makefile --- a/usr.sbin/bsdconfig/includes/include/Makefile +++ b/usr.sbin/bsdconfig/includes/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/includes/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/mouse/Makefile b/usr.sbin/bsdconfig/mouse/Makefile --- a/usr.sbin/bsdconfig/mouse/Makefile +++ b/usr.sbin/bsdconfig/mouse/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse diff --git a/usr.sbin/bsdconfig/mouse/include/Makefile b/usr.sbin/bsdconfig/mouse/include/Makefile --- a/usr.sbin/bsdconfig/mouse/include/Makefile +++ b/usr.sbin/bsdconfig/mouse/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/networking/Makefile b/usr.sbin/bsdconfig/networking/Makefile --- a/usr.sbin/bsdconfig/networking/Makefile +++ b/usr.sbin/bsdconfig/networking/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking diff --git a/usr.sbin/bsdconfig/networking/include/Makefile b/usr.sbin/bsdconfig/networking/include/Makefile --- a/usr.sbin/bsdconfig/networking/include/Makefile +++ b/usr.sbin/bsdconfig/networking/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/networking/share/Makefile b/usr.sbin/bsdconfig/networking/share/Makefile --- a/usr.sbin/bsdconfig/networking/share/Makefile +++ b/usr.sbin/bsdconfig/networking/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/networking FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \ netmask.subr resolv.subr routing.subr services.subr diff --git a/usr.sbin/bsdconfig/packages/Makefile b/usr.sbin/bsdconfig/packages/Makefile --- a/usr.sbin/bsdconfig/packages/Makefile +++ b/usr.sbin/bsdconfig/packages/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages diff --git a/usr.sbin/bsdconfig/packages/include/Makefile b/usr.sbin/bsdconfig/packages/include/Makefile --- a/usr.sbin/bsdconfig/packages/include/Makefile +++ b/usr.sbin/bsdconfig/packages/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/password/Makefile b/usr.sbin/bsdconfig/password/Makefile --- a/usr.sbin/bsdconfig/password/Makefile +++ b/usr.sbin/bsdconfig/password/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password diff --git a/usr.sbin/bsdconfig/password/include/Makefile b/usr.sbin/bsdconfig/password/include/Makefile --- a/usr.sbin/bsdconfig/password/include/Makefile +++ b/usr.sbin/bsdconfig/password/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/password/share/Makefile b/usr.sbin/bsdconfig/password/share/Makefile --- a/usr.sbin/bsdconfig/password/share/Makefile +++ b/usr.sbin/bsdconfig/password/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/password FILES= password.subr diff --git a/usr.sbin/bsdconfig/security/Makefile b/usr.sbin/bsdconfig/security/Makefile --- a/usr.sbin/bsdconfig/security/Makefile +++ b/usr.sbin/bsdconfig/security/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security diff --git a/usr.sbin/bsdconfig/security/include/Makefile b/usr.sbin/bsdconfig/security/include/Makefile --- a/usr.sbin/bsdconfig/security/include/Makefile +++ b/usr.sbin/bsdconfig/security/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security/include FILES= messages.subr securelevel.hlp diff --git a/usr.sbin/bsdconfig/share/Makefile b/usr.sbin/bsdconfig/share/Makefile --- a/usr.sbin/bsdconfig/share/Makefile +++ b/usr.sbin/bsdconfig/share/Makefile @@ -1,4 +1,3 @@ - SUBDIR= media packages FILESDIR= ${SHAREDIR}/bsdconfig diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile --- a/usr.sbin/bsdconfig/share/media/Makefile +++ b/usr.sbin/bsdconfig/share/media/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/media FILES= any.subr cdrom.subr common.subr directory.subr dos.subr \ http.subr httpproxy.subr network.subr \ diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile --- a/usr.sbin/bsdconfig/share/packages/Makefile +++ b/usr.sbin/bsdconfig/share/packages/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/packages FILES= categories.subr index.awk index.subr musthavepkg.subr packages.subr diff --git a/usr.sbin/bsdconfig/startup/Makefile b/usr.sbin/bsdconfig/startup/Makefile --- a/usr.sbin/bsdconfig/startup/Makefile +++ b/usr.sbin/bsdconfig/startup/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup diff --git a/usr.sbin/bsdconfig/startup/include/Makefile b/usr.sbin/bsdconfig/startup/include/Makefile --- a/usr.sbin/bsdconfig/startup/include/Makefile +++ b/usr.sbin/bsdconfig/startup/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/startup/share/Makefile b/usr.sbin/bsdconfig/startup/share/Makefile --- a/usr.sbin/bsdconfig/startup/share/Makefile +++ b/usr.sbin/bsdconfig/startup/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/startup FILES= rcconf.subr rcedit.subr rcvar.subr diff --git a/usr.sbin/bsdconfig/timezone/Makefile b/usr.sbin/bsdconfig/timezone/Makefile --- a/usr.sbin/bsdconfig/timezone/Makefile +++ b/usr.sbin/bsdconfig/timezone/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone diff --git a/usr.sbin/bsdconfig/timezone/include/Makefile b/usr.sbin/bsdconfig/timezone/include/Makefile --- a/usr.sbin/bsdconfig/timezone/include/Makefile +++ b/usr.sbin/bsdconfig/timezone/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/timezone/share/Makefile b/usr.sbin/bsdconfig/timezone/share/Makefile --- a/usr.sbin/bsdconfig/timezone/share/Makefile +++ b/usr.sbin/bsdconfig/timezone/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/timezone FILES= continents.subr countries.subr iso3166.subr menus.subr \ zones.subr diff --git a/usr.sbin/bsdconfig/ttys/Makefile b/usr.sbin/bsdconfig/ttys/Makefile --- a/usr.sbin/bsdconfig/ttys/Makefile +++ b/usr.sbin/bsdconfig/ttys/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys diff --git a/usr.sbin/bsdconfig/ttys/include/Makefile b/usr.sbin/bsdconfig/ttys/include/Makefile --- a/usr.sbin/bsdconfig/ttys/include/Makefile +++ b/usr.sbin/bsdconfig/ttys/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile b/usr.sbin/bsdconfig/usermgmt/Makefile --- a/usr.sbin/bsdconfig/usermgmt/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt diff --git a/usr.sbin/bsdconfig/usermgmt/include/Makefile b/usr.sbin/bsdconfig/usermgmt/include/Makefile --- a/usr.sbin/bsdconfig/usermgmt/include/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include FILES= messages.subr usermgmt.hlp diff --git a/usr.sbin/bsdconfig/usermgmt/share/Makefile b/usr.sbin/bsdconfig/usermgmt/share/Makefile --- a/usr.sbin/bsdconfig/usermgmt/share/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/usermgmt FILES= group.subr group_input.subr user.subr user_input.subr diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -1,4 +1,3 @@ - SUBDIR= distextract distfetch include partedit runconsoles scripts SUBDIR_PARALLEL= SUBDIR_DEPEND_distextract = include diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive bsddialog m diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch bsddialog diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile --- a/usr.sbin/bsdinstall/scripts/Makefile +++ b/usr.sbin/bsdinstall/scripts/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=auto \ adduser \ bootconfig \ diff --git a/usr.sbin/bsnmpd/Makefile b/usr.sbin/bsnmpd/Makefile --- a/usr.sbin/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/Makefile @@ -1,4 +1,3 @@ - SUBDIR= gensnmptree \ bsnmpd \ modules \ diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc --- a/usr.sbin/bsnmpd/Makefile.inc +++ b/usr.sbin/bsnmpd/Makefile.inc @@ -1,3 +1,2 @@ - PACKAGE= bsnmp .include "../Makefile.inc" diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/bsnmp/snmpd diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc --- a/usr.sbin/bsnmpd/modules/Makefile.inc +++ b/usr.sbin/bsnmpd/modules/Makefile.inc @@ -1,4 +1,3 @@ - SHLIB_MAJOR= 6 PACKAGE= bsnmp diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile --- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/sbin/hastd diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile --- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile @@ -1,4 +1,3 @@ - .include MOD= lm75 diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -1,4 +1,3 @@ - PROG= btxld MAN= btxld.8 SRCS= btxld.c elfh.c diff --git a/usr.sbin/camdd/Makefile b/usr.sbin/camdd/Makefile --- a/usr.sbin/camdd/Makefile +++ b/usr.sbin/camdd/Makefile @@ -1,4 +1,3 @@ - PROG= camdd SRCS= camdd.c SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= cdcontrol LIBADD= edit diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= certctl SCRIPTS=certctl.sh MAN= certctl.8 diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile --- a/usr.sbin/chkgrp/Makefile +++ b/usr.sbin/chkgrp/Makefile @@ -1,4 +1,3 @@ - PROG= chkgrp MAN= chkgrp.8 diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,4 +1,3 @@ - .include PROG= chown diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile --- a/usr.sbin/chown/tests/Makefile +++ b/usr.sbin/chown/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chown_test .include diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile --- a/usr.sbin/chroot/Makefile +++ b/usr.sbin/chroot/Makefile @@ -1,4 +1,3 @@ - PROG= chroot MAN= chroot.8 diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile --- a/usr.sbin/ckdist/Makefile +++ b/usr.sbin/ckdist/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.bin/cksum PROG= ckdist diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile --- a/usr.sbin/clear_locks/Makefile +++ b/usr.sbin/clear_locks/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= clear_locks diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,4 +1,3 @@ - SRCDIR:=${.PARSEDIR:tA} PROG_CXX= config diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile --- a/usr.sbin/cpucontrol/Makefile +++ b/usr.sbin/cpucontrol/Makefile @@ -1,4 +1,3 @@ - PROG= cpucontrol MAN= cpucontrol.8 SRCS= cpucontrol.c intel.c amd.c amd10h.c via.c diff --git a/usr.sbin/crashinfo/Makefile b/usr.sbin/crashinfo/Makefile --- a/usr.sbin/crashinfo/Makefile +++ b/usr.sbin/crashinfo/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= crashinfo.sh MAN= crashinfo.8 diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile --- a/usr.sbin/cron/Makefile +++ b/usr.sbin/cron/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib cron crontab .include diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc --- a/usr.sbin/cron/Makefile.inc +++ b/usr.sbin/cron/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,4 +1,3 @@ - CONFS= crontab PROG= cron MAN= cron.8 diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin PROG= crontab diff --git a/usr.sbin/cron/doc/CONVERSION b/usr.sbin/cron/doc/CONVERSION --- a/usr.sbin/cron/doc/CONVERSION +++ b/usr.sbin/cron/doc/CONVERSION @@ -1,4 +1,3 @@ - Conversion of BSD 4.[23] crontab files: Edit your current crontab (/usr/lib/crontab) into little pieces, with each diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES --- a/usr.sbin/cron/doc/FEATURES +++ b/usr.sbin/cron/doc/FEATURES @@ -1,4 +1,3 @@ - Features of Vixie's cron relative to BSD 4.[23] and SysV crons: -- Environment variables can be set in each crontab. SHELL, USER, diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile --- a/usr.sbin/cron/lib/Makefile +++ b/usr.sbin/cron/lib/Makefile @@ -1,4 +1,3 @@ - LIB= cron INTERNALLIB= SRCS= entry.c env.c misc.c diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile --- a/usr.sbin/crunch/Makefile +++ b/usr.sbin/crunch/Makefile @@ -1,4 +1,3 @@ - SUBDIR= crunchgen crunchide .include diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc --- a/usr.sbin/crunch/Makefile.inc +++ b/usr.sbin/crunch/Makefile.inc @@ -1,3 +1,2 @@ - # modify to taste BINDIR?= /usr/bin diff --git a/usr.sbin/crunch/README b/usr.sbin/crunch/README --- a/usr.sbin/crunch/README +++ b/usr.sbin/crunch/README @@ -1,4 +1,3 @@ - CRUNCH 0.2 README 6/14/94 Crunch is available via anonymous ftp to ftp.cs.umd.edu in diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile --- a/usr.sbin/crunch/crunchgen/Makefile +++ b/usr.sbin/crunch/crunchgen/Makefile @@ -1,4 +1,3 @@ - PROG= crunchgen SRCS= crunchgen.c crunched_skel.c CLEANFILES+= crunched_skel.c diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -1,4 +1,3 @@ - PROG= crunchide SRCS= crunchide.c exec_elf32.c exec_elf64.c diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -1,4 +1,3 @@ - CRUNCHED= fixit # below is boiler-plate to make $(CRUNCHED) from $(CRUNCHED).conf diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf --- a/usr.sbin/crunch/examples/filesystem.conf +++ b/usr.sbin/crunch/examples/filesystem.conf @@ -1,4 +1,3 @@ - srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin srcdirs /usr/src/sbin/i386 diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf --- a/usr.sbin/crunch/examples/kcopy.conf +++ b/usr.sbin/crunch/examples/kcopy.conf @@ -1,4 +1,3 @@ - srcdirs /usr/src/bin /usr/src/sbin # Programs from bin/ diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= iscsi diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -1,4 +1,3 @@ - .include CFLAGS+=-I${SRCTOP}/contrib/libucl/include diff --git a/usr.sbin/cxgbetool/Makefile b/usr.sbin/cxgbetool/Makefile --- a/usr.sbin/cxgbetool/Makefile +++ b/usr.sbin/cxgbetool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= cxgbe-tools PROG= cxgbetool MAN= cxgbetool.8 diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile --- a/usr.sbin/daemon/Makefile +++ b/usr.sbin/daemon/Makefile @@ -1,4 +1,3 @@ - PROG= daemon MAN= daemon.8 diff --git a/usr.sbin/daemon/tests/Makefile b/usr.sbin/daemon/tests/Makefile --- a/usr.sbin/daemon/tests/Makefile +++ b/usr.sbin/daemon/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= daemon_test diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile --- a/usr.sbin/dconschat/Makefile +++ b/usr.sbin/dconschat/Makefile @@ -1,4 +1,3 @@ - PROG= dconschat MAN= dconschat.8 diff --git a/usr.sbin/devctl/Makefile b/usr.sbin/devctl/Makefile --- a/usr.sbin/devctl/Makefile +++ b/usr.sbin/devctl/Makefile @@ -1,4 +1,3 @@ - PROG= devctl MAN= devctl.8 diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile --- a/usr.sbin/devinfo/Makefile +++ b/usr.sbin/devinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch PROG= devinfo MAN= devinfo.8 diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile --- a/usr.sbin/diskinfo/Makefile +++ b/usr.sbin/diskinfo/Makefile @@ -1,4 +1,3 @@ - PROG= diskinfo MAN= diskinfo.8 diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile --- a/usr.sbin/editmap/Makefile +++ b/usr.sbin/editmap/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile --- a/usr.sbin/edquota/Makefile +++ b/usr.sbin/edquota/Makefile @@ -1,4 +1,3 @@ - PROG= edquota MAN= edquota.8 diff --git a/usr.sbin/efidp/Makefile b/usr.sbin/efidp/Makefile --- a/usr.sbin/efidp/Makefile +++ b/usr.sbin/efidp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efidp diff --git a/usr.sbin/efitable/Makefile b/usr.sbin/efitable/Makefile --- a/usr.sbin/efitable/Makefile +++ b/usr.sbin/efitable/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efitable diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile --- a/usr.sbin/efivar/Makefile +++ b/usr.sbin/efivar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efivar diff --git a/usr.sbin/efiwake/Makefile b/usr.sbin/efiwake/Makefile --- a/usr.sbin/efiwake/Makefile +++ b/usr.sbin/efiwake/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efiwake diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile --- a/usr.sbin/etcupdate/Makefile +++ b/usr.sbin/etcupdate/Makefile @@ -1,4 +1,3 @@ - .include SCRIPTS=etcupdate.sh diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile --- a/usr.sbin/etcupdate/tests/Makefile +++ b/usr.sbin/etcupdate/tests/Makefile @@ -1,4 +1,3 @@ - PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile --- a/usr.sbin/extattr/Makefile +++ b/usr.sbin/extattr/Makefile @@ -1,4 +1,3 @@ - PROG= rmextattr MAN= rmextattr.8 diff --git a/usr.sbin/extattr/tests/Makefile b/usr.sbin/extattr/tests/Makefile --- a/usr.sbin/extattr/tests/Makefile +++ b/usr.sbin/extattr/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= extattr_test .include diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile --- a/usr.sbin/extattrctl/Makefile +++ b/usr.sbin/extattrctl/Makefile @@ -1,4 +1,3 @@ - PROG= extattrctl MAN= extattrctl.8 diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile --- a/usr.sbin/fdcontrol/Makefile +++ b/usr.sbin/fdcontrol/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/fdread PROG= fdcontrol diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile --- a/usr.sbin/fdformat/Makefile +++ b/usr.sbin/fdformat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/fdread PROG= fdformat diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile --- a/usr.sbin/fdread/Makefile +++ b/usr.sbin/fdread/Makefile @@ -1,4 +1,3 @@ - PROG= fdread SRCS= fdread.c fdutil.c diff --git a/usr.sbin/fifolog/Makefile b/usr.sbin/fifolog/Makefile --- a/usr.sbin/fifolog/Makefile +++ b/usr.sbin/fifolog/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib .WAIT \ fifolog_create fifolog_writer fifolog_reader SUBDIR_PARALLEL= diff --git a/usr.sbin/fifolog/Makefile.inc b/usr.sbin/fifolog/Makefile.inc --- a/usr.sbin/fifolog/Makefile.inc +++ b/usr.sbin/fifolog/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.sbin/fifolog/fifolog_create/Makefile b/usr.sbin/fifolog/fifolog_create/Makefile --- a/usr.sbin/fifolog/fifolog_create/Makefile +++ b/usr.sbin/fifolog/fifolog_create/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_create CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile --- a/usr.sbin/fifolog/fifolog_reader/Makefile +++ b/usr.sbin/fifolog/fifolog_reader/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_reader CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile --- a/usr.sbin/fifolog/fifolog_writer/Makefile +++ b/usr.sbin/fifolog/fifolog_writer/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_writer CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/lib/Makefile b/usr.sbin/fifolog/lib/Makefile --- a/usr.sbin/fifolog/lib/Makefile +++ b/usr.sbin/fifolog/lib/Makefile @@ -1,4 +1,3 @@ - LIB= fifolog INTERNALLIB= # API not published or supported. diff --git a/usr.sbin/freebsd-update/Makefile b/usr.sbin/freebsd-update/Makefile --- a/usr.sbin/freebsd-update/Makefile +++ b/usr.sbin/freebsd-update/Makefile @@ -1,4 +1,3 @@ - CONFS= freebsd-update.conf SCRIPTS=freebsd-update.sh MAN= freebsd-update.8 diff --git a/usr.sbin/freebsd-update/freebsd-update.conf b/usr.sbin/freebsd-update/freebsd-update.conf --- a/usr.sbin/freebsd-update/freebsd-update.conf +++ b/usr.sbin/freebsd-update/freebsd-update.conf @@ -1,4 +1,3 @@ - # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from telling you to # change it and explaining why. diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -1,4 +1,3 @@ - .include PROG= fstyp diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile --- a/usr.sbin/fstyp/tests/Makefile +++ b/usr.sbin/fstyp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= fstyp_test diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile --- a/usr.sbin/ftp-proxy/Makefile +++ b/usr.sbin/ftp-proxy/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/ftp-proxy PACKAGE= pf diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile --- a/usr.sbin/fwcontrol/Makefile +++ b/usr.sbin/fwcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= fwcontrol SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c MAN= fwcontrol.8 diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile --- a/usr.sbin/getfmac/Makefile +++ b/usr.sbin/getfmac/Makefile @@ -1,4 +1,3 @@ - PROG= getfmac MAN= getfmac.8 diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile --- a/usr.sbin/getpmac/Makefile +++ b/usr.sbin/getpmac/Makefile @@ -1,4 +1,3 @@ - PROG= getpmac MAN= getpmac.8 diff --git a/usr.sbin/gpioctl/Makefile b/usr.sbin/gpioctl/Makefile --- a/usr.sbin/gpioctl/Makefile +++ b/usr.sbin/gpioctl/Makefile @@ -1,4 +1,3 @@ - PROG= gpioctl MAN= gpioctl.8 diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile --- a/usr.sbin/gssd/Makefile +++ b/usr.sbin/gssd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= kerberos diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile --- a/usr.sbin/gstat/Makefile +++ b/usr.sbin/gstat/Makefile @@ -1,4 +1,3 @@ - PROG= gstat MAN= gstat.8 LIBADD= devstat geom edit tinfow ncursesw diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile --- a/usr.sbin/hyperv/Makefile +++ b/usr.sbin/hyperv/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc --- a/usr.sbin/hyperv/Makefile.inc +++ b/usr.sbin/hyperv/Makefile.inc @@ -1,3 +1,2 @@ - CFLAGS.gcc+= -Wno-uninitialized .include "../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/Makefile.inc b/usr.sbin/hyperv/tools/Makefile.inc --- a/usr.sbin/hyperv/tools/Makefile.inc +++ b/usr.sbin/hyperv/tools/Makefile.inc @@ -1,3 +1,2 @@ - CFLAGS.gcc+= -Wno-uninitialized .include "../../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/kvp/Makefile b/usr.sbin/hyperv/tools/kvp/Makefile --- a/usr.sbin/hyperv/tools/kvp/Makefile +++ b/usr.sbin/hyperv/tools/kvp/Makefile @@ -1,4 +1,3 @@ - .include HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools diff --git a/usr.sbin/i2c/Makefile b/usr.sbin/i2c/Makefile --- a/usr.sbin/i2c/Makefile +++ b/usr.sbin/i2c/Makefile @@ -1,4 +1,3 @@ - PROG= i2c MAN= i2c.8 diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= ifmcstat diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -1,4 +1,3 @@ - .include CONFS= inetd.conf diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile --- a/usr.sbin/iostat/Makefile +++ b/usr.sbin/iostat/Makefile @@ -1,4 +1,3 @@ - PROG= iostat MAN= iostat.8 diff --git a/usr.sbin/iovctl/Makefile b/usr.sbin/iovctl/Makefile --- a/usr.sbin/iovctl/Makefile +++ b/usr.sbin/iovctl/Makefile @@ -1,4 +1,3 @@ - PROG= iovctl SRCS= iovctl.c parse.c validate.c LIBADD= nv ucl m diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile --- a/usr.sbin/ip6addrctl/Makefile +++ b/usr.sbin/ip6addrctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 diff --git a/usr.sbin/iscsid/Makefile b/usr.sbin/iscsid/Makefile --- a/usr.sbin/iscsid/Makefile +++ b/usr.sbin/iscsid/Makefile @@ -1,4 +1,3 @@ - PACKAGE= iscsi PROG= iscsid SRCS= discovery.c iscsid.c login.c diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -1,4 +1,3 @@ - .include PROG= jail diff --git a/usr.sbin/jail/tests/Makefile b/usr.sbin/jail/tests/Makefile --- a/usr.sbin/jail/tests/Makefile +++ b/usr.sbin/jail/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= jail_basic_test diff --git a/usr.sbin/jail/tests/commands.jail.conf b/usr.sbin/jail/tests/commands.jail.conf --- a/usr.sbin/jail/tests/commands.jail.conf +++ b/usr.sbin/jail/tests/commands.jail.conf @@ -1,4 +1,3 @@ - exec.prestop = "echo STOP"; exec.prestart = "echo START"; persist; diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile --- a/usr.sbin/jexec/Makefile +++ b/usr.sbin/jexec/Makefile @@ -1,4 +1,3 @@ - PROG= jexec MAN= jexec.8 LIBADD= jail util diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile --- a/usr.sbin/jls/Makefile +++ b/usr.sbin/jls/Makefile @@ -1,4 +1,3 @@ - .include PROG= jls diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= kbdcontrol MAN= kbdcontrol.1 kbdmap.5 diff --git a/usr.sbin/kbdcontrol/path.h b/usr.sbin/kbdcontrol/path.h --- a/usr.sbin/kbdcontrol/path.h +++ b/usr.sbin/kbdcontrol/path.h @@ -1,4 +1,3 @@ - #define KEYMAP_PATH "/usr/share/syscons/keymaps/" #define FONT_PATH "/usr/share/syscons/fonts/" #define SCRNMAP_PATH "/usr/share/syscons/scrnmaps/" diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= kbdmap CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib diff --git a/usr.sbin/kbdmap/TODO b/usr.sbin/kbdmap/TODO --- a/usr.sbin/kbdmap/TODO +++ b/usr.sbin/kbdmap/TODO @@ -1,4 +1,3 @@ - o remember some hackers to translate Languages.phrases into Norwegian, Russian, Danish, Swedish diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -1,4 +1,3 @@ - PROG= keyserv MAN= keyserv.8 SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= kldxref MAN= kldxref.8 diff --git a/usr.sbin/kldxref/fileformat b/usr.sbin/kldxref/fileformat --- a/usr.sbin/kldxref/fileformat +++ b/usr.sbin/kldxref/fileformat @@ -1,4 +1,3 @@ - linker.hints file consists from the one or more records, and is processed by sys/kern/kern_linker.c::linker_hints_lookup() diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -1,4 +1,3 @@ - PROG= lastlogin PACKAGE= acct MAN= lastlogin.8 diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile --- a/usr.sbin/lpr/Makefile +++ b/usr.sbin/lpr/Makefile @@ -1,4 +1,3 @@ - SUBDIR= common_source .WAIT \ chkprintcap lp lpc lpd lpq lpr lprm lptest pac \ filters filters.ru diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc --- a/usr.sbin/lpr/Makefile.inc +++ b/usr.sbin/lpr/Makefile.inc @@ -1,4 +1,3 @@ - .include .if ${MK_INET6_SUPPORT} != "no" diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PROG= chkprintcap diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile --- a/usr.sbin/lpr/common_source/Makefile +++ b/usr.sbin/lpr/common_source/Makefile @@ -1,4 +1,3 @@ - # # Library of internal routines for the print spooler suite. # Originally these were compiled separately into each program, diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile --- a/usr.sbin/lpr/filters.ru/Makefile +++ b/usr.sbin/lpr/filters.ru/Makefile @@ -1,4 +1,3 @@ - SUBDIR= koi2alt koi2855 FILES= bjc-240.sh.sample diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc --- a/usr.sbin/lpr/filters.ru/Makefile.inc +++ b/usr.sbin/lpr/filters.ru/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/libexec/lpr/ru WARNS?= 3 diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,4 +1,3 @@ - PROG= koi2855 MAN= diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,4 +1,3 @@ - PROG= koi2alt MAN= diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/lpr PROG= lpf diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile --- a/usr.sbin/lpr/lp/Makefile +++ b/usr.sbin/lpr/lp/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin SCRIPTS=lp.sh diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PROG= lpc diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -1,4 +1,3 @@ - CONFS= hosts.lpd printcap PROG= lpd MAN= lpd.8 diff --git a/usr.sbin/lpr/lpd/printcap b/usr.sbin/lpr/lpd/printcap --- a/usr.sbin/lpr/lpd/printcap +++ b/usr.sbin/lpr/lpd/printcap @@ -1,4 +1,3 @@ - # # This enables a simple local "raw" printer, hooked up to the first # parallel port. No kind of filtering is done, so everything you pass diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin PROG= lpq diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile --- a/usr.sbin/lpr/lptest/Makefile +++ b/usr.sbin/lpr/lptest/Makefile @@ -1,4 +1,3 @@ - PROG= lptest CFLAGS+= -I${.CURDIR:H}/common_source diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PROG= pac diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile --- a/usr.sbin/lptcontrol/Makefile +++ b/usr.sbin/lptcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= lptcontrol MAN= lptcontrol.8 diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_MAILWRAPPER} != "no" diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h --- a/usr.sbin/mailwrapper/pathnames.h +++ b/usr.sbin/mailwrapper/pathnames.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-4-Clause * diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -1,4 +1,3 @@ - SRCDIR:=${.PARSEDIR:tA} .include diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_SH+= makefs_cd9660_tests diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile --- a/usr.sbin/manctl/Makefile +++ b/usr.sbin/manctl/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=manctl.sh MAN= manctl.8 diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile --- a/usr.sbin/memcontrol/Makefile +++ b/usr.sbin/memcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= memcontrol MAN= memcontrol.8 diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=mergemaster.sh MAN= mergemaster.8 diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,4 +1,3 @@ - .include PROG= mixer diff --git a/usr.sbin/mlx5tool/Makefile b/usr.sbin/mlx5tool/Makefile --- a/usr.sbin/mlx5tool/Makefile +++ b/usr.sbin/mlx5tool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= mlx-tools PROG= mlx5tool diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile --- a/usr.sbin/mlxcontrol/Makefile +++ b/usr.sbin/mlxcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= mlxcontrol MAN= mlxcontrol.8 SRCS= command.c config.c interface.c util.c diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile --- a/usr.sbin/mount_smbfs/Makefile +++ b/usr.sbin/mount_smbfs/Makefile @@ -1,4 +1,3 @@ - PROG= mount_smbfs PACKAGE= smbutils SRCS= mount_smbfs.c getmntopts.c diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile --- a/usr.sbin/mountd/Makefile +++ b/usr.sbin/mountd/Makefile @@ -1,4 +1,3 @@ - PROG= mountd SRCS= mountd.c getmntopts.c MAN= exports.5 netgroup.5 mountd.8 diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile --- a/usr.sbin/moused/Makefile +++ b/usr.sbin/moused/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= moused MAN= moused.8 diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile --- a/usr.sbin/mpsutil/Makefile +++ b/usr.sbin/mpsutil/Makefile @@ -1,4 +1,3 @@ - PROG= mpsutil SRCS= mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c MAN= mpsutil.8 diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile --- a/usr.sbin/mptable/Makefile +++ b/usr.sbin/mptable/Makefile @@ -1,4 +1,3 @@ - PROG= mptable .include diff --git a/usr.sbin/mptutil/Makefile b/usr.sbin/mptutil/Makefile --- a/usr.sbin/mptutil/Makefile +++ b/usr.sbin/mptutil/Makefile @@ -1,4 +1,3 @@ - PROG= mptutil SRCS= mptutil.c mpt_cam.c mpt_cmd.c mpt_config.c mpt_drive.c mpt_evt.c \ mpt_show.c mpt_volume.c diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile --- a/usr.sbin/mtest/Makefile +++ b/usr.sbin/mtest/Makefile @@ -1,4 +1,3 @@ - .include PROG= mtest diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= newsyslog diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile --- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile +++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= newsyslog diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf b/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf --- a/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf +++ b/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf @@ -1,2 +1 @@ - /var/log/opensm.log 600 7 1000 * J /var/run/opensm.pid 30 diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile --- a/usr.sbin/newsyslog/tests/Makefile +++ b/usr.sbin/newsyslog/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= legacy_test .include diff --git a/usr.sbin/nfscbd/Makefile b/usr.sbin/nfscbd/Makefile --- a/usr.sbin/nfscbd/Makefile +++ b/usr.sbin/nfscbd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfscbd diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile --- a/usr.sbin/nfsd/Makefile +++ b/usr.sbin/nfsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsd diff --git a/usr.sbin/nfsdumpstate/Makefile b/usr.sbin/nfsdumpstate/Makefile --- a/usr.sbin/nfsdumpstate/Makefile +++ b/usr.sbin/nfsdumpstate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= nfs diff --git a/usr.sbin/nfsrevoke/Makefile b/usr.sbin/nfsrevoke/Makefile --- a/usr.sbin/nfsrevoke/Makefile +++ b/usr.sbin/nfsrevoke/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsrevoke diff --git a/usr.sbin/nfsuserd/Makefile b/usr.sbin/nfsuserd/Makefile --- a/usr.sbin/nfsuserd/Makefile +++ b/usr.sbin/nfsuserd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= nfs diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c --- a/usr.sbin/ngctl/connect.c +++ b/usr.sbin/ngctl/connect.c @@ -1,4 +1,3 @@ - /* * connect.c * diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c --- a/usr.sbin/ngctl/debug.c +++ b/usr.sbin/ngctl/debug.c @@ -1,4 +1,3 @@ - /* * debug.c * diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c --- a/usr.sbin/ngctl/dot.c +++ b/usr.sbin/ngctl/dot.c @@ -1,4 +1,3 @@ - /* * dot.c * diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c --- a/usr.sbin/ngctl/list.c +++ b/usr.sbin/ngctl/list.c @@ -1,4 +1,3 @@ - /* * list.c * diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -1,4 +1,3 @@ - /* * main.c * diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c --- a/usr.sbin/ngctl/mkpeer.c +++ b/usr.sbin/ngctl/mkpeer.c @@ -1,4 +1,3 @@ - /* * mkpeer.c * diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c --- a/usr.sbin/ngctl/msg.c +++ b/usr.sbin/ngctl/msg.c @@ -1,4 +1,3 @@ - /* * msg.c * diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c --- a/usr.sbin/ngctl/name.c +++ b/usr.sbin/ngctl/name.c @@ -1,4 +1,3 @@ - /* * name.c * diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h --- a/usr.sbin/ngctl/ngctl.h +++ b/usr.sbin/ngctl/ngctl.h @@ -1,4 +1,3 @@ - /* * ngctl.h * diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c --- a/usr.sbin/ngctl/rmhook.c +++ b/usr.sbin/ngctl/rmhook.c @@ -1,4 +1,3 @@ - /* * rmhook.c * diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c --- a/usr.sbin/ngctl/show.c +++ b/usr.sbin/ngctl/show.c @@ -1,4 +1,3 @@ - /* * show.c * diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c --- a/usr.sbin/ngctl/shutdown.c +++ b/usr.sbin/ngctl/shutdown.c @@ -1,4 +1,3 @@ - /* * shutdown.c * diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c --- a/usr.sbin/ngctl/status.c +++ b/usr.sbin/ngctl/status.c @@ -1,4 +1,3 @@ - /* * status.c * diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c --- a/usr.sbin/ngctl/types.c +++ b/usr.sbin/ngctl/types.c @@ -1,4 +1,3 @@ - /* * types.c * diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -1,4 +1,3 @@ - /* * write.c * diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/mtree diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile --- a/usr.sbin/nmtree/tests/Makefile +++ b/usr.sbin/nmtree/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile --- a/usr.sbin/nologin/Makefile +++ b/usr.sbin/nologin/Makefile @@ -1,4 +1,3 @@ - PROG= nologin MAN= nologin.5 nologin.8 diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile --- a/usr.sbin/nscd/Makefile +++ b/usr.sbin/nscd/Makefile @@ -1,4 +1,3 @@ - CONFS= nscd.conf PROG= nscd MAN= nscd.conf.5 nscd.8 diff --git a/usr.sbin/nscd/agents/Makefile.inc b/usr.sbin/nscd/agents/Makefile.inc --- a/usr.sbin/nscd/agents/Makefile.inc +++ b/usr.sbin/nscd/agents/Makefile.inc @@ -1,2 +1 @@ - SRCS += passwd.c group.c services.c diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,4 +1,3 @@ - .include DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= drivers hints icons pic scripts diff --git a/usr.sbin/ntp/doc/drivers/Makefile b/usr.sbin/ntp/doc/drivers/Makefile --- a/usr.sbin/ntp/doc/drivers/Makefile +++ b/usr.sbin/ntp/doc/drivers/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= icons scripts diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile b/usr.sbin/ntp/doc/drivers/icons/Makefile --- a/usr.sbin/ntp/doc/drivers/icons/Makefile +++ b/usr.sbin/ntp/doc/drivers/icons/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/drivers/icons diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile b/usr.sbin/ntp/doc/drivers/scripts/Makefile --- a/usr.sbin/ntp/doc/drivers/scripts/Makefile +++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/drivers/scripts diff --git a/usr.sbin/ntp/doc/hints/Makefile b/usr.sbin/ntp/doc/hints/Makefile --- a/usr.sbin/ntp/doc/hints/Makefile +++ b/usr.sbin/ntp/doc/hints/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/hints diff --git a/usr.sbin/ntp/doc/icons/Makefile b/usr.sbin/ntp/doc/icons/Makefile --- a/usr.sbin/ntp/doc/icons/Makefile +++ b/usr.sbin/ntp/doc/icons/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/icons diff --git a/usr.sbin/ntp/doc/pic/Makefile b/usr.sbin/ntp/doc/pic/Makefile --- a/usr.sbin/ntp/doc/pic/Makefile +++ b/usr.sbin/ntp/doc/pic/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/pic diff --git a/usr.sbin/ntp/doc/scripts/Makefile b/usr.sbin/ntp/doc/scripts/Makefile --- a/usr.sbin/ntp/doc/scripts/Makefile +++ b/usr.sbin/ntp/doc/scripts/Makefile @@ -1,4 +1,3 @@ - .include FILESDIR= ${SHAREDIR}/doc/ntp/scripts diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/libntp \ ${SRCTOP}/contrib/ntp/libntp/lib/isc \ ${SRCTOP}/contrib/ntp/libntp/lib/isc/nls \ diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile --- a/usr.sbin/ntp/libntpevent/Makefile +++ b/usr.sbin/ntp/libntpevent/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/libevent diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile --- a/usr.sbin/ntp/libopts/Makefile +++ b/usr.sbin/ntp/libopts/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/sntp/libopts LIB= opts diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/libparse LIB= parse diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/ntp/ntpdate diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/util PROG= ntptime diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile --- a/usr.sbin/ntp/sntp/Makefile +++ b/usr.sbin/ntp/sntp/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/ntp/sntp diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile --- a/usr.sbin/nvram/Makefile +++ b/usr.sbin/nvram/Makefile @@ -1,4 +1,3 @@ - PROG= nvram MAN= nvram.8 MANSUBDIR= /powerpc diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile --- a/usr.sbin/ofwdump/Makefile +++ b/usr.sbin/ofwdump/Makefile @@ -1,4 +1,3 @@ - PROG= ofwdump MAN= ofwdump.8 SRCS= ofwdump.c ofw_util.c diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile --- a/usr.sbin/periodic/Makefile +++ b/usr.sbin/periodic/Makefile @@ -1,4 +1,3 @@ - PACKAGE= periodic CONFS= periodic.conf diff --git a/usr.sbin/periodic/etc/Makefile b/usr.sbin/periodic/etc/Makefile --- a/usr.sbin/periodic/etc/Makefile +++ b/usr.sbin/periodic/etc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= daily security weekly monthly SUBDIR_PARALLEL= diff --git a/usr.sbin/periodic/etc/Makefile.inc b/usr.sbin/periodic/etc/Makefile.inc --- a/usr.sbin/periodic/etc/Makefile.inc +++ b/usr.sbin/periodic/etc/Makefile.inc @@ -1,4 +1,3 @@ - CONFMODE= 755 CONFDIR= ETC_PERIODIC_${.CURDIR:T:U} ETC_PERIODIC_${.CURDIR:T:U}= /etc/periodic/${.CURDIR:T} diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile --- a/usr.sbin/periodic/etc/monthly/Makefile +++ b/usr.sbin/periodic/etc/monthly/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile --- a/usr.sbin/periodic/etc/security/Makefile +++ b/usr.sbin/periodic/etc/security/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile --- a/usr.sbin/periodic/etc/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,4 +1,3 @@ - PACKAGE= pkg-bootstrap _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH diff --git a/usr.sbin/pmcstudy/Makefile b/usr.sbin/pmcstudy/Makefile --- a/usr.sbin/pmcstudy/Makefile +++ b/usr.sbin/pmcstudy/Makefile @@ -1,4 +1,3 @@ - PROG= pmcstudy MAN= pmcstudy.8 SRCS= pmcstudy.c eval_expr.c diff --git a/usr.sbin/pnfsdscopymr/Makefile b/usr.sbin/pnfsdscopymr/Makefile --- a/usr.sbin/pnfsdscopymr/Makefile +++ b/usr.sbin/pnfsdscopymr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdscopymr diff --git a/usr.sbin/pnfsdsfile/Makefile b/usr.sbin/pnfsdsfile/Makefile --- a/usr.sbin/pnfsdsfile/Makefile +++ b/usr.sbin/pnfsdsfile/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdsfile diff --git a/usr.sbin/pnfsdskill/Makefile b/usr.sbin/pnfsdskill/Makefile --- a/usr.sbin/pnfsdskill/Makefile +++ b/usr.sbin/pnfsdskill/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdskill diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile --- a/usr.sbin/pnpinfo/Makefile +++ b/usr.sbin/pnpinfo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pnpinfo PROG= pnpinfo diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile --- a/usr.sbin/powerd/Makefile +++ b/usr.sbin/powerd/Makefile @@ -1,4 +1,3 @@ - PROG= powerd MAN= powerd.8 diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ppp diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ppp PROG= pppctl MAN= pppctl.8 diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases diff --git a/usr.sbin/praudit/tests/Makefile b/usr.sbin/praudit/tests/Makefile --- a/usr.sbin/praudit/tests/Makefile +++ b/usr.sbin/praudit/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.sbin/praudit diff --git a/usr.sbin/prometheus_sysctl_exporter/Makefile b/usr.sbin/prometheus_sysctl_exporter/Makefile --- a/usr.sbin/prometheus_sysctl_exporter/Makefile +++ b/usr.sbin/prometheus_sysctl_exporter/Makefile @@ -1,4 +1,3 @@ - PROG= prometheus_sysctl_exporter MAN= prometheus_sysctl_exporter.8 diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,4 +1,3 @@ - PROG= pstat LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MAN= pstat.8 diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile --- a/usr.sbin/pw/Makefile +++ b/usr.sbin/pw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= pw MAN= pw.conf.5 pw.8 diff --git a/usr.sbin/pw/README b/usr.sbin/pw/README --- a/usr.sbin/pw/README +++ b/usr.sbin/pw/README @@ -1,4 +1,3 @@ - pw is a command-line driven passwd/group editor utility that provides an easy and safe means of modifying of any/all fields in the system password files, and has an add, modify and delete mode for user and diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests BINDIR= ${TESTSDIR} diff --git a/usr.sbin/pw/tests/helper_functions.shin b/usr.sbin/pw/tests/helper_functions.shin --- a/usr.sbin/pw/tests/helper_functions.shin +++ b/usr.sbin/pw/tests/helper_functions.shin @@ -1,4 +1,3 @@ - # The pw command PW="pw -V ${HOME}" RPW="pw -R ${HOME}" diff --git a/usr.sbin/pw/tests/pw_config_test.sh b/usr.sbin/pw/tests/pw_config_test.sh --- a/usr.sbin/pw/tests/pw_config_test.sh +++ b/usr.sbin/pw/tests/pw_config_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_etcdir_test.sh b/usr.sbin/pw/tests/pw_etcdir_test.sh --- a/usr.sbin/pw/tests/pw_etcdir_test.sh +++ b/usr.sbin/pw/tests/pw_etcdir_test.sh @@ -1,4 +1,3 @@ - # When the '-V directory' option is provided, the directory must exist atf_test_case etcdir_must_exist etcdir_must_exist_head() { diff --git a/usr.sbin/pw/tests/pw_groupadd_test.sh b/usr.sbin/pw/tests/pw_groupadd_test.sh --- a/usr.sbin/pw/tests/pw_groupadd_test.sh +++ b/usr.sbin/pw/tests/pw_groupadd_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_groupdel_test.sh b/usr.sbin/pw/tests/pw_groupdel_test.sh --- a/usr.sbin/pw/tests/pw_groupdel_test.sh +++ b/usr.sbin/pw/tests/pw_groupdel_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_groupmod_test.sh b/usr.sbin/pw/tests/pw_groupmod_test.sh --- a/usr.sbin/pw/tests/pw_groupmod_test.sh +++ b/usr.sbin/pw/tests/pw_groupmod_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_groupshow_test.sh b/usr.sbin/pw/tests/pw_groupshow_test.sh --- a/usr.sbin/pw/tests/pw_groupshow_test.sh +++ b/usr.sbin/pw/tests/pw_groupshow_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_lock_test.sh b/usr.sbin/pw/tests/pw_lock_test.sh --- a/usr.sbin/pw/tests/pw_lock_test.sh +++ b/usr.sbin/pw/tests/pw_lock_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_userdel_test.sh b/usr.sbin/pw/tests/pw_userdel_test.sh --- a/usr.sbin/pw/tests/pw_userdel_test.sh +++ b/usr.sbin/pw/tests/pw_userdel_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_usermod_test.sh b/usr.sbin/pw/tests/pw_usermod_test.sh --- a/usr.sbin/pw/tests/pw_usermod_test.sh +++ b/usr.sbin/pw/tests/pw_usermod_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_usernext_test.sh b/usr.sbin/pw/tests/pw_usernext_test.sh --- a/usr.sbin/pw/tests/pw_usernext_test.sh +++ b/usr.sbin/pw/tests/pw_usernext_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pw/tests/pw_usershow_test.sh b/usr.sbin/pw/tests/pw_usershow_test.sh --- a/usr.sbin/pw/tests/pw_usershow_test.sh +++ b/usr.sbin/pw/tests/pw_usershow_test.sh @@ -1,4 +1,3 @@ - # Import helper functions . $(atf_get_srcdir)/helper_functions.shin diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c PACKAGE= runtime diff --git a/usr.sbin/pwm/Makefile b/usr.sbin/pwm/Makefile --- a/usr.sbin/pwm/Makefile +++ b/usr.sbin/pwm/Makefile @@ -1,4 +1,3 @@ - PROG= pwm MAN= pwm.8 diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,4 +1,3 @@ - PROG= quot MAN= quot.8 LIBADD= ufs diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile --- a/usr.sbin/quotaon/Makefile +++ b/usr.sbin/quotaon/Makefile @@ -1,4 +1,3 @@ - PROG= quotaon LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff MAN= quotaon.8 diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile --- a/usr.sbin/rarpd/Makefile +++ b/usr.sbin/rarpd/Makefile @@ -1,4 +1,3 @@ - PROG= rarpd MAN= rarpd.8 diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile --- a/usr.sbin/repquota/Makefile +++ b/usr.sbin/repquota/Makefile @@ -1,4 +1,3 @@ - PROG= repquota MAN= repquota.8 LIBADD= util diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile --- a/usr.sbin/rip6query/Makefile +++ b/usr.sbin/rip6query/Makefile @@ -1,4 +1,3 @@ - PROG= rip6query MAN= rip6query.8 diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile --- a/usr.sbin/rmt/Makefile +++ b/usr.sbin/rmt/Makefile @@ -1,4 +1,3 @@ - PROG= rmt MAN= rmt.8 diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile --- a/usr.sbin/route6d/Makefile +++ b/usr.sbin/route6d/Makefile @@ -1,4 +1,3 @@ - PROG= route6d MAN= route6d.8 diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -1,4 +1,3 @@ - PROG= rpc.statd MAN= rpc.statd.8 SRCS= file.c sm_inter_svc.c sm_inter.h statd.c procs.c diff --git a/usr.sbin/rpc.tlsclntd/Makefile b/usr.sbin/rpc.tlsclntd/Makefile --- a/usr.sbin/rpc.tlsclntd/Makefile +++ b/usr.sbin/rpc.tlsclntd/Makefile @@ -1,4 +1,3 @@ - .include PROG= rpc.tlsclntd diff --git a/usr.sbin/rpc.tlsservd/Makefile b/usr.sbin/rpc.tlsservd/Makefile --- a/usr.sbin/rpc.tlsservd/Makefile +++ b/usr.sbin/rpc.tlsservd/Makefile @@ -1,4 +1,3 @@ - .include PROG= rpc.tlsservd diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile --- a/usr.sbin/rpc.umntall/Makefile +++ b/usr.sbin/rpc.umntall/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= rpc.umntall diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -1,4 +1,3 @@ - RPCDIR= ${DESTDIR}/usr/include/rpcsvc .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \ diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PACKAGE=yp diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.sbin/ypserv PACKAGE=yp diff --git a/usr.sbin/rpcbind/tests/Makefile b/usr.sbin/rpcbind/tests/Makefile --- a/usr.sbin/rpcbind/tests/Makefile +++ b/usr.sbin/rpcbind/tests/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/.. diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile --- a/usr.sbin/rtprio/Makefile +++ b/usr.sbin/rtprio/Makefile @@ -1,4 +1,3 @@ - PROG= rtprio LINKS= ${BINDIR}/rtprio ${BINDIR}/idprio MLINKS= rtprio.1 idprio.1 diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile --- a/usr.sbin/rwhod/Makefile +++ b/usr.sbin/rwhod/Makefile @@ -1,4 +1,3 @@ - PROG= rwhod MAN= rwhod.8 diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/lastcomm diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile --- a/usr.sbin/sa/tests/Makefile +++ b/usr.sbin/sa/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/usr.sbin/service/Makefile b/usr.sbin/service/Makefile --- a/usr.sbin/service/Makefile +++ b/usr.sbin/service/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime SCRIPTS=service.sh MAN= service.8 diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile --- a/usr.sbin/services_mkdb/Makefile +++ b/usr.sbin/services_mkdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= services diff --git a/usr.sbin/sesutil/Makefile b/usr.sbin/sesutil/Makefile --- a/usr.sbin/sesutil/Makefile +++ b/usr.sbin/sesutil/Makefile @@ -1,4 +1,3 @@ - PROG= sesutil SRCS= sesutil.c eltsub.c MAN= sesutil.8 diff --git a/usr.sbin/setfib/Makefile b/usr.sbin/setfib/Makefile --- a/usr.sbin/setfib/Makefile +++ b/usr.sbin/setfib/Makefile @@ -1,4 +1,3 @@ - PROG= setfib .include diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile --- a/usr.sbin/setfmac/Makefile +++ b/usr.sbin/setfmac/Makefile @@ -1,4 +1,3 @@ - PROG= setfmac LINKS= ${BINDIR}/setfmac ${BINDIR}/setfsmac MAN= setfmac.8 setfsmac.8 diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile --- a/usr.sbin/setpmac/Makefile +++ b/usr.sbin/setpmac/Makefile @@ -1,4 +1,3 @@ - PROG= setpmac MAN= setpmac.8 diff --git a/usr.sbin/spi/Makefile b/usr.sbin/spi/Makefile --- a/usr.sbin/spi/Makefile +++ b/usr.sbin/spi/Makefile @@ -1,4 +1,3 @@ - #.include PROG= spi diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile --- a/usr.sbin/spkrtest/Makefile +++ b/usr.sbin/spkrtest/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=spkrtest.sh MAN= spkrtest.8 diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -1,4 +1,3 @@ - PROG= spray MAN= spray.8 diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/wall diff --git a/usr.sbin/sysrc/Makefile b/usr.sbin/sysrc/Makefile --- a/usr.sbin/sysrc/Makefile +++ b/usr.sbin/sysrc/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= sysrc MAN= sysrc.8 diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tcpdump .include diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc --- a/usr.sbin/tcpdump/Makefile.inc +++ b/usr.sbin/tcpdump/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin WARNS?= 3 diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,4 +1,3 @@ - .include TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile --- a/usr.sbin/tests/Makefile +++ b/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,4 +1,3 @@ - .include TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute diff --git a/usr.sbin/trim/Makefile b/usr.sbin/trim/Makefile --- a/usr.sbin/trim/Makefile +++ b/usr.sbin/trim/Makefile @@ -1,4 +1,3 @@ - PROG= trim MAN= trim.8 LIBADD= util diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -1,4 +1,3 @@ - .include PROG= tzsetup diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile --- a/usr.sbin/uathload/Makefile +++ b/usr.sbin/uathload/Makefile @@ -1,4 +1,3 @@ - PROG= uathload MAN= uathload.8 diff --git a/usr.sbin/uefisign/Makefile b/usr.sbin/uefisign/Makefile --- a/usr.sbin/uefisign/Makefile +++ b/usr.sbin/uefisign/Makefile @@ -1,4 +1,3 @@ - PROG= uefisign SRCS= uefisign.c child.c pe.c MAN= uefisign.8 diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile --- a/usr.sbin/ugidfw/Makefile +++ b/usr.sbin/ugidfw/Makefile @@ -1,4 +1,3 @@ - PROG= ugidfw MAN= ugidfw.8 diff --git a/usr.sbin/uhsoctl/Makefile b/usr.sbin/uhsoctl/Makefile --- a/usr.sbin/uhsoctl/Makefile +++ b/usr.sbin/uhsoctl/Makefile @@ -1,4 +1,3 @@ - PROG= uhsoctl MAN= uhsoctl.1 WARNS?= 1 diff --git a/usr.sbin/unbound/Makefile b/usr.sbin/unbound/Makefile --- a/usr.sbin/unbound/Makefile +++ b/usr.sbin/unbound/Makefile @@ -1,4 +1,3 @@ - SUBDIR= daemon anchor checkconf control SUBDIR+= setup SUBDIR_PARALLEL= diff --git a/usr.sbin/unbound/Makefile.inc b/usr.sbin/unbound/Makefile.inc --- a/usr.sbin/unbound/Makefile.inc +++ b/usr.sbin/unbound/Makefile.inc @@ -1,4 +1,3 @@ - MK_WERROR= no NO_WTHREAD_SAFETY= true PACKAGE= unbound diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/setup/Makefile b/usr.sbin/unbound/setup/Makefile --- a/usr.sbin/unbound/setup/Makefile +++ b/usr.sbin/unbound/setup/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= local-unbound-setup.sh MAN= # diff --git a/usr.sbin/usbdump/Makefile b/usr.sbin/usbdump/Makefile --- a/usr.sbin/usbdump/Makefile +++ b/usr.sbin/usbdump/Makefile @@ -1,4 +1,3 @@ - PROG= usbdump SRCS= usbdump.c MAN= usbdump.8 diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile --- a/usr.sbin/utx/Makefile +++ b/usr.sbin/utx/Makefile @@ -1,4 +1,3 @@ - PACKAGE= acct PROG= utx diff --git a/usr.sbin/valectl/Makefile b/usr.sbin/valectl/Makefile --- a/usr.sbin/valectl/Makefile +++ b/usr.sbin/valectl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= netmap PROG= valectl MAN= valectl.8 diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile --- a/usr.sbin/vidcontrol/Makefile +++ b/usr.sbin/vidcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= vidcontrol SRCS= vidcontrol.c decode.c diff --git a/usr.sbin/vidcontrol/decode.h b/usr.sbin/vidcontrol/decode.h --- a/usr.sbin/vidcontrol/decode.h +++ b/usr.sbin/vidcontrol/decode.h @@ -1,2 +1 @@ - int decode(FILE *fd, char *buffer, int len); diff --git a/usr.sbin/vidcontrol/path.h b/usr.sbin/vidcontrol/path.h --- a/usr.sbin/vidcontrol/path.h +++ b/usr.sbin/vidcontrol/path.h @@ -1,4 +1,3 @@ - #define KEYMAP_PATH "/usr/share/syscons/keymaps/" #define FONT_PATH "/usr/share/syscons/fonts/" #define SCRNMAP_PATH "/usr/share/syscons/scrnmaps/" diff --git a/usr.sbin/vigr/Makefile b/usr.sbin/vigr/Makefile --- a/usr.sbin/vigr/Makefile +++ b/usr.sbin/vigr/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= vigr MAN= vigr.8 CLEANFILES= vigr diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile --- a/usr.sbin/vipw/Makefile +++ b/usr.sbin/vipw/Makefile @@ -1,4 +1,3 @@ - PROG= vipw MAN= vipw.8 diff --git a/usr.sbin/wake/Makefile b/usr.sbin/wake/Makefile --- a/usr.sbin/wake/Makefile +++ b/usr.sbin/wake/Makefile @@ -1,4 +1,3 @@ - PROG= wake MAN= wake.8 diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -1,4 +1,3 @@ - PROG= watch MAN= watch.8 diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile --- a/usr.sbin/watchdogd/Makefile +++ b/usr.sbin/watchdogd/Makefile @@ -1,4 +1,3 @@ - PROG= watchdogd LINKS= ${BINDIR}/watchdogd ${BINDIR}/watchdog MAN= watchdogd.8 watchdog.8 diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile --- a/usr.sbin/wlandebug/Makefile +++ b/usr.sbin/wlandebug/Makefile @@ -1,4 +1,3 @@ - PROG= wlandebug MAN= wlandebug.8 diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile --- a/usr.sbin/wpa/Makefile +++ b/usr.sbin/wpa/Makefile @@ -1,4 +1,3 @@ - SUBDIR= src .WAIT \ wpa_supplicant \ wpa_cli \ diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -1,4 +1,3 @@ - .if ${MK_OPENSSL} != "no" LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /usr/sbin diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile --- a/usr.sbin/wpa/hostapd_cli/Makefile +++ b/usr.sbin/wpa/hostapd_cli/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile --- a/usr.sbin/wpa/wpa_passphrase/Makefile +++ b/usr.sbin/wpa/wpa_passphrase/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile --- a/usr.sbin/wpa/wpa_priv/Makefile +++ b/usr.sbin/wpa/wpa_priv/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv PACKAGE= yp diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile --- a/usr.sbin/ypbind/Makefile +++ b/usr.sbin/ypbind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypbind MAN= ypbind.8 diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile --- a/usr.sbin/yppoll/Makefile +++ b/usr.sbin/yppoll/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= yppoll MAN= yppoll.8 diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -1,4 +1,3 @@ - RPCDIR= ${SRCTOP}/include/rpcsvc .PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,4 +1,3 @@ - .include RPCDIR= ${SRCTOP}/include/rpcsvc diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile --- a/usr.sbin/ypset/Makefile +++ b/usr.sbin/ypset/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypset MAN= ypset.8 diff --git a/usr.sbin/zdump/Makefile b/usr.sbin/zdump/Makefile --- a/usr.sbin/zdump/Makefile +++ b/usr.sbin/zdump/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/tzcode PROG= zdump diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile --- a/usr.sbin/zic/Makefile +++ b/usr.sbin/zic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/tzcode PROG= zic diff --git a/usr.sbin/zonectl/Makefile b/usr.sbin/zonectl/Makefile --- a/usr.sbin/zonectl/Makefile +++ b/usr.sbin/zonectl/Makefile @@ -1,4 +1,3 @@ - PROG= zonectl SRCS= zonectl.c SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/zzz/Makefile b/usr.sbin/zzz/Makefile --- a/usr.sbin/zzz/Makefile +++ b/usr.sbin/zzz/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=zzz.sh MAN= zzz.8