MFC r266650, r267172 (both by jmmv):

r266650:

  Change libatf-c and libatf-c++ to be private libraries.

  We should not be leaking these interfaces to the outside world given
  that it's much easier for third-party components to use the devel/atf
  package from ports.

  As a side-effect, we can also drop the ATF pkgconfig and aclocal files
  from the base system.  Nothing in the base system needs these, and it
  was quite ugly to have to get them installed only so that a few ports
  could build.  The offending ports have been fixed to depend on
  devel/atf explicitly.

  Reviewed by:  bapt

r267172:

  Homogenize libatf-* version numbers with upstream.

  The libatf-* major version numbers in FreeBSD were one version ahead of
  upstream because, when atf was first imported into FreeBSD, the upstream
  numbers were not respected.  This is just confusing and bound to cause
  problems down the road.

  Fix this by taking advantage of the fact that libatf-* are now private
  and that atf is not yet built by default.  However, and unfortunately, a
  clean build is needed for tests to continue working once "make
  delete-old-libs" has been run; hence the note in UPDATING.

Phabric: D701
Approved by: jmmv (maintainer, mentor)

19 files changed, 62 insertions, 325 deletions

diff --git a/UPDATING b/UPDATING
index 327c15e..8e6edb0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,22 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20140831:
+	The libatf-c and libatf-c++ major versions were downgraded to 0 and
+	1 respectively to match the upstream numbers.  They were out of
+	sync because, when they were originally added to FreeBSD, the
+	upstream versions were not respected.  These libraries are private
+	and not yet built by default, so renumbering them should be a
+	non-issue.  However, unclean source trees will yield broken test
+	programs once the operator executes "make delete-old-libs" after a
+	"make installworld".
+
+	If you are using WITH_TESTS=yes (not the default), wipe the object
+	tree and rebuild from scratch to prevent spurious test failures.
+	This is only needed once: the old, misnumbered libraries have been
+	added to OptionalObsoleteFiles.inc so they will be removed during a
+	clean upgrade.
+
 20140814:
 	The ixgbe tunables now match their sysctl counterparts, for example:
 	hw.ixgbe.enable_aim => hw.ix.enable_aim
diff --git a/contrib/atf/FREEBSD-Xlist b/contrib/atf/FREEBSD-Xlist
index bcc8a4b..5af9ed5 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 0763d04..0000000
--- 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 f366bb0..0000000
--- 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 d0237b8..0000000
--- 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 6fd5274..0000000
--- 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 464a5a7..0000000
--- 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 7215d1c..0000000
--- 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 930dc4c..0000000
--- 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__
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 934304a..2e4b31c 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -12,8 +12,6 @@
         ..
     ..
     share
-        aclocal
-        ..
         atf
         ..
         doc
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 5ff6214..2db59e7 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -28,7 +28,8 @@
 .include <bsd.init.mk>
 
 LIB=		atf-c++
-SHLIB_MAJOR=	2
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
 
 # libatf-c++ depends on the C version of the ATF library to build.
 DPADD=		${LIBATF_C}
@@ -72,20 +73,6 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
 MAN=		atf-c++-api.3
 
-all: atf-c++.pc
-atf-c++.pc: atf-c++.pc.in atf-version
-	sed -e 's,__CXX__,${CXX},g' \
-	    -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
-	    -e 's,__LIBDIR__,${LIBDIR},g' \
-	    -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
-	    <${ATF}/atf-c++/atf-c++.pc.in >atf-c++.pc
-
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		atf-c++.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-	${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${ATF}/atf-c++/atf-c++.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
 .endif
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index c5a1d24..56355f2 100644
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -26,6 +26,4 @@ ATF_TESTS_CXX+=	${_T}
 SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 .endfor
 
-ATF_TESTS_SH=	pkg_config_test
-
 .include <bsd.test.mk>
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 69c4611..34685af 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -28,7 +28,8 @@
 .include <bsd.init.mk>
 
 LIB=		atf-c
-SHLIB_MAJOR=	1
+PRIVATELIB=	true
+SHLIB_MAJOR=	0
 
 ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
@@ -74,22 +75,6 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c-api.3
 
-all: atf-c.pc
-atf-c.pc: atf-c.pc.in atf-version
-	sed -e 's,__CC__,${CC},g' \
-	    -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
-	    -e 's,__LIBDIR__,${LIBDIR},g' \
-	    -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
-	    <${ATF}/atf-c/atf-c.pc.in >atf-c.pc
-
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		atf-c.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-	${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${ATF}/atf-c/atf-common.m4 ${DESTDIR}${SHAREDIR}/aclocal
-	${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${ATF}/atf-c/atf-c.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
 .endif
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index 1a091d3..70ba1a5 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -33,6 +33,4 @@ ATF_TESTS_C+=	${_T}
 SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
-ATF_TESTS_SH=	pkg_config_test
-
 .include <bsd.test.mk>
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index 0cfa863..0841498 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -37,11 +37,11 @@ MAN=		atf-check.1
 
 CFLAGS+=	-I${ATF}
 
-DPADD+=		${LIBATF_CXX} ${LIBATF_C}
-
 LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
 LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
+DPADD+=		${LIBATF_CXX} ${LIBATF_C}
 LDADD+=		-latf-c++ -latf-c
+USEPRIVATELIB=	atf-c++ atf-c
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk
index 1be7244..c82557c 100644
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -72,6 +72,7 @@ MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}.c
 DPADD.${_T}+= ${LIBATF_C}
 LDADD.${_T}+= -latf-c
+USEPRIVATELIB+= atf-c
 TEST_INTERFACE.${_T}= atf
 .endfor
 .endif
@@ -85,6 +86,7 @@ MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc}
 DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C}
 LDADD.${_T}+= -latf-c++ -latf-c
+USEPRIVATELIB+= atf-c++
 TEST_INTERFACE.${_T}= atf
 .endfor
 .endif
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 9aa598c..47ec226 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -13,8 +13,8 @@ LIBCRT0?=	${DESTDIR}${LIBDIR}/crt0.o
 LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
 LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
-LIBATF_C?=	${DESTDIR}${LIBDIR}/libatf-c.a
-LIBATF_CXX?=	${DESTDIR}${LIBDIR}/libatf-c++.a
+LIBATF_C?=	${DESTDIR}${LIBPRIVATEDIR}/libatf-c.a
+LIBATF_CXX?=	${DESTDIR}${LIBPRIVATEDIR}/libatf-c++.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBAUDITD?=	${DESTDIR}${LIBDIR}/libauditd.a
 LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 73fd541..b3fad77 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4070,7 +4070,38 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 .endif
 
 .if ${MK_TESTS} == yes
+OLD_LIBS+=usr/lib/libatf-c++.a
+OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
+OLD_LIBS+=usr/lib/libatf-c++.so.2
+OLD_LIBS+=usr/lib/libatf-c++_p.a
+OLD_LIBS+=usr/lib/libatf-c.a
+OLD_LIBS+=usr/lib/libatf-c.so
+OLD_LIBS+=usr/lib/libatf-c.so.1
+OLD_LIBS+=usr/lib/libatf-c_p.a
+OLD_LIBS+=usr/lib/private/libatf-c.so.1
+OLD_LIBS+=usr/lib/private/libatf-c++.so.2
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_LIBS+=usr/lib32/libatf-c++.a
+OLD_LIBS+=usr/lib32/libatf-c++.so
+OLD_LIBS+=usr/lib32/libatf-c++.so.1
+OLD_LIBS+=usr/lib32/libatf-c++.so.2
+OLD_LIBS+=usr/lib32/libatf-c++_p.a
+OLD_LIBS+=usr/lib32/libatf-c.a
+OLD_LIBS+=usr/lib32/libatf-c.so
+OLD_LIBS+=usr/lib32/libatf-c.so.1
+OLD_LIBS+=usr/lib32/libatf-c_p.a
+OLD_LIBS+=usr/lib32/private/libatf-c.so.1
+OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
+.endif
+OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
+OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
+OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
+OLD_FILES+=usr/share/aclocal/atf-c++.m4
+OLD_FILES+=usr/share/aclocal/atf-c.m4
+OLD_FILES+=usr/share/aclocal/atf-common.m4
+OLD_FILES+=usr/share/aclocal/atf-sh.m4
+OLD_DIRS+=usr/share/aclocal
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
@@ -4085,6 +4116,7 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
@@ -4092,6 +4124,7 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
index de2e51e..c407a41 100644
--- a/usr.bin/atf/atf-sh/Makefile
+++ b/usr.bin/atf/atf-sh/Makefile
@@ -39,24 +39,13 @@ CFLAGS+=	-I${ATF}
 
 DPADD+=		${LIBATF_C} ${LIBATF_CXX}
 LDADD+=		-latf-c++ -latf-c
+USEPRIVATELIB=	atf-c++ atf-c
 
 FILESGROUPS=	SUBR
 
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
 
-all: atf-sh.pc
-atf-sh.pc: atf-sh.pc.in atf-version
-	sed -e 's,__EXEC_PREFIX__,/usr,g' \
-	    -e "s,__ATF_VERSION__,$$(cat atf-version),g" \
-	    <${ATF}/atf-sh/atf-sh.pc.in >atf-sh.pc
-
-beforeinstall:
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		atf-sh.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-	${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${ATF}/atf-sh/atf-sh.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif