8 files changed, 2 insertions, 271 deletions

diff --git a/contrib/atf/FREEBSD-Xlist b/contrib/atf/FREEBSD-Xlist
index bcc8a4bacf23..5af9ed5e9aac 100644
--- a/contrib/atf/FREEBSD-Xlist
+++ b/contrib/atf/FREEBSD-Xlist
@@ -2,6 +2,8 @@
 */*/Makefile*
 */Atffile
 */Makefile*
+*/*.m4
+*/*.pc.in
 Atffile
 INSTALL
 Makefile*
diff --git a/contrib/atf/atf-c++/atf-c++.m4 b/contrib/atf/atf-c++/atf-c++.m4
deleted file mode 100644
index 0763d04865bc..000000000000
--- a/contrib/atf/atf-c++/atf-c++.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-dnl
-dnl Automated Testing Framework (atf)
-dnl
-dnl Copyright 2011 Google Inc.
-dnl All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions are
-dnl met:
-dnl
-dnl * Redistributions of source code must retain the above copyright
-dnl   notice, this list of conditions and the following disclaimer.
-dnl * Redistributions in binary form must reproduce the above copyright
-dnl   notice, this list of conditions and the following disclaimer in the
-dnl   documentation and/or other materials provided with the distribution.
-dnl * Neither the name of Google Inc. nor the names of its contributors
-dnl   may be used to endorse or promote products derived from this software
-dnl   without specific prior written permission.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-
-dnl ATF_CHECK_CXX([version-spec])
-dnl
-dnl Checks if atf-c++ is present.  If version-spec is provided, ensures that
-dnl the installed version of atf-sh matches the required version.  This
-dnl argument must be something like '>= 0.14' and accepts any version
-dnl specification supported by pkg-config.
-dnl
-dnl Defines and substitutes ATF_CXX_CFLAGS and ATF_CXX_LIBS with the compiler
-dnl and linker flags need to build against atf-c++.
-AC_DEFUN([ATF_CHECK_CXX], [
-    spec="atf-c++[]m4_default_nblank([ $1], [])"
-    _ATF_CHECK_ARG_WITH(
-        [PKG_CHECK_MODULES([ATF_CXX], [${spec}],
-                           [found=yes found_atf_cxx=yes], [found=no])],
-        [required ${spec} not found])
-])
diff --git a/contrib/atf/atf-c++/atf-c++.pc.in b/contrib/atf/atf-c++/atf-c++.pc.in
deleted file mode 100644
index f366bb016d04..000000000000
--- a/contrib/atf/atf-c++/atf-c++.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# ATF pkg-config file
-
-cxx=__CXX__
-includedir=__INCLUDEDIR__
-libdir=__LIBDIR__
-
-Name: atf-c++
-Description: Automated Testing Framework (C++ binding)
-Version: __ATF_VERSION__
-Cflags: -I${includedir}
-Libs: -L${libdir} -latf-c++ -latf-c
diff --git a/contrib/atf/atf-c/atf-c.m4 b/contrib/atf/atf-c/atf-c.m4
deleted file mode 100644
index d0237b848206..000000000000
--- a/contrib/atf/atf-c/atf-c.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-dnl
-dnl Automated Testing Framework (atf)
-dnl
-dnl Copyright 2011 Google Inc.
-dnl All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions are
-dnl met:
-dnl
-dnl * Redistributions of source code must retain the above copyright
-dnl   notice, this list of conditions and the following disclaimer.
-dnl * Redistributions in binary form must reproduce the above copyright
-dnl   notice, this list of conditions and the following disclaimer in the
-dnl   documentation and/or other materials provided with the distribution.
-dnl * Neither the name of Google Inc. nor the names of its contributors
-dnl   may be used to endorse or promote products derived from this software
-dnl   without specific prior written permission.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-
-dnl ATF_CHECK_C([version-spec])
-dnl
-dnl Checks if atf-c is present.  If version-spec is provided, ensures that
-dnl the installed version of atf-sh matches the required version.  This
-dnl argument must be something like '>= 0.14' and accepts any version
-dnl specification supported by pkg-config.
-dnl
-dnl Defines and substitutes ATF_C_CFLAGS and ATF_C_LIBS with the compiler
-dnl and linker flags need to build against atf-c.
-AC_DEFUN([ATF_CHECK_C], [
-    spec="atf-c[]m4_default_nblank([ $1], [])"
-    _ATF_CHECK_ARG_WITH(
-        [PKG_CHECK_MODULES([ATF_C], [${spec}],
-                           [found=yes found_atf_c=yes], [found=no])],
-        [required ${spec} not found])
-])
diff --git a/contrib/atf/atf-c/atf-c.pc.in b/contrib/atf/atf-c/atf-c.pc.in
deleted file mode 100644
index 6fd52740b791..000000000000
--- a/contrib/atf/atf-c/atf-c.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# ATF pkg-config file
-
-cc=__CC__
-includedir=__INCLUDEDIR__
-libdir=__LIBDIR__
-
-Name: atf-c
-Description: Automated Testing Framework (C binding)
-Version: __ATF_VERSION__
-Cflags: -I${includedir}
-Libs: -L${libdir} -latf-c
diff --git a/contrib/atf/atf-c/atf-common.m4 b/contrib/atf/atf-c/atf-common.m4
deleted file mode 100644
index 464a5a7fa007..000000000000
--- a/contrib/atf/atf-c/atf-common.m4
+++ /dev/null
@@ -1,92 +0,0 @@
-dnl
-dnl Automated Testing Framework (atf)
-dnl
-dnl Copyright 2011 Google Inc.
-dnl All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions are
-dnl met:
-dnl
-dnl * Redistributions of source code must retain the above copyright
-dnl   notice, this list of conditions and the following disclaimer.
-dnl * Redistributions in binary form must reproduce the above copyright
-dnl   notice, this list of conditions and the following disclaimer in the
-dnl   documentation and/or other materials provided with the distribution.
-dnl * Neither the name of Google Inc. nor the names of its contributors
-dnl   may be used to endorse or promote products derived from this software
-dnl   without specific prior written permission.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-
-dnl ATF_ARG_WITH
-dnl
-dnl Adds a --with-atf flag to the configure script that allows the user to
-dnl enable or disable atf support.
-dnl
-dnl The ATF_CHECK_{C,CXX,SH} macros honor the flag defined herein if
-dnl instantiated.  If not instantiated, they will request the presence of
-dnl the libraries unconditionally.
-dnl
-dnl Defines the WITH_ATF Automake conditional if ATF has been found by any
-dnl of the ATF_CHECK_{C,CXX,SH} macros.
-AC_DEFUN([ATF_ARG_WITH], [
-    m4_define([atf_arg_with_called], [yes])
-
-    m4_divert_text([DEFAULTS], [with_atf=auto])
-    AC_ARG_WITH([atf],
-                [AS_HELP_STRING([--with-atf=<yes|no|auto>],
-                                [build atf-based test programs])],
-                [with_atf=${withval}], [with_atf=auto])
-
-    m4_divert_text([DEFAULTS], [
-        found_atf_c=no
-        found_atf_cxx=no
-        found_atf_sh=no
-    ])
-    AM_CONDITIONAL([WITH_ATF], [test x"${found_atf_c}" = x"yes" -o \
-                                     x"${found_atf_cxx}" = x"yes" -o \
-                                     x"${found_atf_sh}" = x"yes"])
-])
-
-dnl _ATF_CHECK_ARG_WITH(check, error_message)
-dnl
-dnl Internal macro to execute a check conditional on the --with-atf flag
-dnl and handle the result accordingly.
-dnl
-dnl 'check' specifies the piece of code to be run to detect the feature.
-dnl This code must set the 'found' shell variable to yes or no depending
-dnl on the raw result of the check.
-AC_DEFUN([_ATF_CHECK_ARG_WITH], [
-    m4_ifdef([atf_arg_with_called], [
-        m4_fatal([ATF_ARG_WITH must be called after the ATF_CHECK_* checks])
-    ])
-
-    m4_divert_text([DEFAULTS], [with_atf=yes])
-
-    if test x"${with_atf}" = x"no"; then
-        _found=no
-    else
-        $1
-        if test x"${with_atf}" = x"auto"; then
-            _found="${found}"
-        else
-            if test x"${found}" = x"yes"; then
-                _found=yes
-            else
-                AC_MSG_ERROR([$2])
-            fi
-        fi
-    fi
-])
diff --git a/contrib/atf/atf-sh/atf-sh.m4 b/contrib/atf/atf-sh/atf-sh.m4
deleted file mode 100644
index 7215d1c7fe43..000000000000
--- a/contrib/atf/atf-sh/atf-sh.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl
-dnl Automated Testing Framework (atf)
-dnl
-dnl Copyright 2011 Google Inc.
-dnl All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions are
-dnl met:
-dnl
-dnl * Redistributions of source code must retain the above copyright
-dnl   notice, this list of conditions and the following disclaimer.
-dnl * Redistributions in binary form must reproduce the above copyright
-dnl   notice, this list of conditions and the following disclaimer in the
-dnl   documentation and/or other materials provided with the distribution.
-dnl * Neither the name of Google Inc. nor the names of its contributors
-dnl   may be used to endorse or promote products derived from this software
-dnl   without specific prior written permission.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-dnl "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-
-dnl ATF_CHECK_SH([version-spec])
-dnl
-dnl Checks if atf-sh is present.  If version-spec is provided, ensures that
-dnl the installed version of atf-sh matches the required version.  This
-dnl argument must be something like '>= 0.14' and accepts any version
-dnl specification supported by pkg-config.
-dnl
-dnl Defines and substitutes ATF_SH with the full path to the atf-sh interpreter.
-AC_DEFUN([ATF_CHECK_SH], [
-    spec="atf-sh[]m4_default_nblank([ $1], [])"
-    _ATF_CHECK_ARG_WITH(
-        [AC_MSG_CHECKING([for ${spec}])
-         PKG_CHECK_EXISTS([${spec}], [found=yes], [found=no])
-         if test "${found}" = yes; then
-             ATF_SH="$(${PKG_CONFIG} --variable=interpreter atf-sh)"
-             AC_SUBST([ATF_SH], [${ATF_SH}])
-             found_atf_sh=yes
-         fi
-         AC_MSG_RESULT([${ATF_SH}])],
-        [required ${spec} not found])
-])
diff --git a/contrib/atf/atf-sh/atf-sh.pc.in b/contrib/atf/atf-sh/atf-sh.pc.in
deleted file mode 100644
index 930dc4c3d4cb..000000000000
--- a/contrib/atf/atf-sh/atf-sh.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# ATF pkg-config file
-
-exec_prefix=__EXEC_PREFIX__
-interpreter=${exec_prefix}/bin/atf-sh
-
-Name: atf-sh
-Description: Automated Testing Framework (POSIX shell binding)
-Version: __ATF_VERSION__