[src/trunk]: src/external/bsd/atf Deduce the version number to encode in pkgc...

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

details:   https://anonhg.NetBSD.org/src/rev/ad5b56e4a1ce
branches:  trunk
changeset: 785446:ad5b56e4a1ce
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Thu Mar 14 07:10:05 2013 +0000

description:
Deduce the version number to encode in pkgconfig files by getting it from
bconfig.h.  Also make the build of these files depends on bconfig.h itself.

This should fix once and for all the problems of the
atf/atf-{c,c++}/pkg_config_test:version tests breaking because the
pkgconfig files hold an old version number during update builds.

diffstat:

 external/bsd/atf/Makefile.inc            |   7 +++++++
 external/bsd/atf/lib/Makefile.inc        |   3 +++
 external/bsd/atf/lib/libatf-c++/Makefile |  10 +++++-----
 external/bsd/atf/lib/libatf-c/Makefile   |   9 ++++-----
 external/bsd/atf/usr.bin/Makefile.inc    |   3 +++
 external/bsd/atf/usr.bin/atf-sh/Makefile |  10 +++++-----
 6 files changed, 27 insertions(+), 15 deletions(-)

diffs (120 lines):

diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/Makefile.inc     Thu Mar 14 07:10:05 2013 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv Exp $
+
+TOPDIR=                ${NETBSDSRCDIR}/external/bsd/atf
+SRCDIR=                ${TOPDIR}/dist
+
+ATF_VERSION!=  grep 'define VERSION' ${TOPDIR}/lib/libatf-c/bconfig.h \
+               | cut -d '"' -f 2
diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/lib/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/lib/Makefile.inc Thu Mar 14 07:10:05 2013 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:06 jmmv Exp $
+
+.include "../Makefile.inc"
diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Thu Mar 14 06:43:32 2013 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Thu Mar 14 07:10:05 2013 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2013/03/14 07:10:06 jmmv Exp $
 
 NOLINT=                # defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           atf-c++
 LIBISCXX=      yes
@@ -16,10 +16,10 @@
 LIBDPLIBS+=     m      ${.CURDIR}/../../../../../lib/libm
 
 
-SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:         ${SRCDIR}
 .PATH:         ${SRCDIR}/atf-c++
 .PATH:         ${SRCDIR}/atf-c++/detail
+.PATH:         ${TOPDIR}/lib/libatf-c  # For bconfig.h
 
 CPPFLAGS+=     -I${.CURDIR}/../libatf-c
 CPPFLAGS+=     -I.
@@ -62,8 +62,8 @@
 FILESDIR=      /usr/lib/pkgconfig
 
 realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c++.pc: Makefile atf-c++.pc.in bconfig.h
+       ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
            -e 's,__CXX__,g++,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Thu Mar 14 06:43:32 2013 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Thu Mar 14 07:10:05 2013 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2013/02/19 15:35:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2013/03/14 07:10:06 jmmv Exp $
 
 NOLINT=                # defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           atf-c
 
 CWARNFLAGS+=   -Wno-missing-noreturn
 
-SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:         ${SRCDIR}
 .PATH:         ${SRCDIR}/atf-c
 .PATH:         ${SRCDIR}/atf-c/detail
@@ -88,8 +87,8 @@
 FILESDIR=      /usr/lib/pkgconfig
 
 realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c.pc: Makefile atf-c.pc.in bconfig.h
+       ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
            -e 's,__CC__,gcc,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/usr.bin/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/usr.bin/Makefile.inc     Thu Mar 14 07:10:05 2013 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:06 jmmv Exp $
+
+.include "../Makefile.inc"
diff -r 1da27a3e1478 -r ad5b56e4a1ce external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Thu Mar 14 06:43:32 2013 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Thu Mar 14 07:10:05 2013 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2013/03/14 07:10:07 jmmv Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
-SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:         ${SRCDIR}/atf-sh
+.PATH:         ${TOPDIR}/lib/libatf-c  # For bconfig.h.
 
 BINDIR=                /usr/bin
 PROG_CXX=      atf-sh
@@ -28,8 +28,8 @@
 FILESDIR_atf-sh.pc=    /usr/lib/pkgconfig
 
 realall: atf-sh.pc
-atf-sh.pc: Makefile atf-sh.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-sh.pc: Makefile atf-sh.pc.in bconfig.h
+       ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
            -e 's,__EXEC_PREFIX__,/usr,g' \
            <${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
 CLEANFILES+=   atf-sh.pc