[src/trunk]: src/external/bsd/atf Update reachover Makefiles for atf 0.16.

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12b449afbbb5
branches:  trunk
changeset: 780096:12b449afbbb5
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Wed Jul 11 22:40:16 2012 +0000

description:
Update reachover Makefiles for atf 0.16.

As part of this change (and as done upstream and in various packaging
systems), start shipping shared libraries of both libatf-c and libatf-c++.

diffstat:

 external/bsd/atf/lib/libatf-c++/Makefile      |  5 ++---
 external/bsd/atf/lib/libatf-c++/shlib_version |  3 +++
 external/bsd/atf/lib/libatf-c/Makefile        |  5 ++---
 external/bsd/atf/lib/libatf-c/bconfig.h       |  8 ++++----
 external/bsd/atf/lib/libatf-c/shlib_version   |  3 +++
 external/bsd/atf/tests/atf/atf-c++/Makefile   |  3 ++-
 external/bsd/atf/tests/atf/atf-c/Makefile     |  3 ++-
 external/bsd/atf/usr.bin/atf-sh/Makefile      |  4 ++--
 8 files changed, 20 insertions(+), 14 deletions(-)

diffs (144 lines):

diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Wed Jul 11 22:40:16 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/11 22:40:16 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -8,7 +8,6 @@
 LIBISCXX=      yes
 LDADD=         -L${.OBJDIR}/../libatf-c -latf-c
 DPADD=         ${LIBATF_C}
-NOPIC=         # defined; interface is still too unstable
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:         ${SRCDIR}
@@ -55,7 +54,7 @@
 
 realall: atf-c++.pc
 atf-c++.pc: Makefile atf-c++.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
            -e 's,__CXX__,g++,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/lib/libatf-c++/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/lib/libatf-c++/shlib_version     Wed Jul 11 22:40:16 2012 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
+major=0
+minor=0
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Wed Jul 11 22:40:16 2012 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/11 22:40:16 jmmv Exp $
 
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
 LIB=           atf-c
-NOPIC=         # defined; interface is still too unstable
 
 CWARNFLAGS+=   -Wno-missing-noreturn
 
@@ -90,7 +89,7 @@
 
 realall: atf-c.pc
 atf-c.pc: Makefile atf-c.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
            -e 's,__CC__,gcc,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h   Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h   Wed Jul 11 22:40:16 2012 +0000
@@ -96,19 +96,19 @@
 #define PACKAGE_NAME "Automated Testing Framework"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.15"
+#define PACKAGE_STRING "Automated Testing Framework 0.16"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "atf"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
+#define PACKAGE_URL "http://code.google.com/p/kyua/wiki/ATF";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15"
+#define PACKAGE_VERSION "0.16"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.15"
+#define VERSION "0.16"
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/lib/libatf-c/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/lib/libatf-c/shlib_version       Wed Jul 11 22:40:16 2012 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
+major=0
+minor=0
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/tests/atf/atf-c++/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/Makefile       Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/Makefile       Wed Jul 11 22:40:16 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,7 @@
 
 FILESDIR=      ${TESTSDIR}
 FILES=         macros_hpp_test.cpp
+FILES+=                unused_test.cpp
 
 TESTS_CXX=
 .for test in   atf_c++_test \
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/tests/atf/atf-c/Makefile
--- a/external/bsd/atf/tests/atf/atf-c/Makefile Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/tests/atf/atf-c/Makefile Wed Jul 11 22:40:16 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/11 22:40:16 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,7 @@
 
 FILESDIR=      ${TESTSDIR}
 FILES=         macros_h_test.c
+FILES+=                unused_test.c
 
 TESTS_C=
 .for test in   atf_c_test \
diff -r 9a4d505803a4 -r 12b449afbbb5 external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Wed Jul 11 22:38:40 2012 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Wed Jul 11 22:40:16 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,7 @@
 
 realall: atf-sh.pc
 atf-sh.pc: Makefile atf-sh.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
            -e 's,__EXEC_PREFIX__,/usr,g' \
            <${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
 CLEANFILES+=   atf-sh.pc