[src/trunk]: src/external/bsd/atf Remove revision.h and associated complexity...

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

details:   https://anonhg.NetBSD.org/src/rev/33e297eb27bb
branches:  trunk
changeset: 326672:33e297eb27bb
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Tue Feb 11 18:07:30 2014 +0000

description:
Remove revision.h and associated complexity from atf-version.

Arguably, this was never needed and only made the code and the build system
more complex for no real reason.

diffstat:

 external/bsd/atf/dist/tools/atf-version.cpp     |  23 +----------------------
 external/bsd/atf/usr.bin/atf-version/Makefile   |   3 +--
 external/bsd/atf/usr.bin/atf-version/revision.h |   3 ---
 3 files changed, 2 insertions(+), 27 deletions(-)

diffs (66 lines):

diff -r d96b9b9fab72 -r 33e297eb27bb external/bsd/atf/dist/tools/atf-version.cpp
--- a/external/bsd/atf/dist/tools/atf-version.cpp       Tue Feb 11 17:28:20 2014 +0000
+++ b/external/bsd/atf/dist/tools/atf-version.cpp       Tue Feb 11 18:07:30 2014 +0000
@@ -31,8 +31,6 @@
 #include <iostream>
 
 #include "application.hpp"
-#include "revision.h"
-#include "ui.hpp"
 
 class atf_version : public tools::application::app {
     static const char* m_description;
@@ -55,28 +53,9 @@
 int
 atf_version::main(void)
 {
-    using tools::ui::format_text;
-    using tools::ui::format_text_with_tag;
-
     std::cout <<
         "Automated Testing Framework " ATF_VERSION " (atf-" ATF_VERSION ")\n"
-        "Copyright (c) 2007 The NetBSD Foundation, Inc.\n\n";
-
-#if defined(PACKAGE_REVISION_TYPE_DIST)
-    std::cout << format_text("Built from a distribution file; no revision "
-        "information available.") << "\n";
-#elif defined(PACKAGE_REVISION_TYPE_GIT)
-    std::cout << format_text_with_tag(PACKAGE_REVISION_BRANCH, "Branch: ",
-                                      false) << "\n";
-    std::cout << format_text_with_tag(PACKAGE_REVISION_BASE
-#   if PACKAGE_REVISION_MODIFIED
-        " (locally modified)"
-#   endif
-        " " PACKAGE_REVISION_DATE,
-        "Base revision: ", false) << "\n";
-#else
-#   error "Unknown PACKAGE_REVISION_TYPE value"
-#endif
+        "Copyright (c) 2007 The NetBSD Foundation, Inc.\n";
 
     return EXIT_SUCCESS;
 }
diff -r d96b9b9fab72 -r 33e297eb27bb external/bsd/atf/usr.bin/atf-version/Makefile
--- a/external/bsd/atf/usr.bin/atf-version/Makefile     Tue Feb 11 17:28:20 2014 +0000
+++ b/external/bsd/atf/usr.bin/atf-version/Makefile     Tue Feb 11 18:07:30 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/11 18:07:30 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,6 @@
 
 CPPFLAGS+=     -DATF_VERSION=\"$(ATF_VERSION)\"
 CPPFLAGS+=     -I${SRCDIR}/tools
-CPPFLAGS+=     -I${.CURDIR}
 
 USE_ATF_LIBTOOLS=      yes
 
diff -r d96b9b9fab72 -r 33e297eb27bb external/bsd/atf/usr.bin/atf-version/revision.h
--- a/external/bsd/atf/usr.bin/atf-version/revision.h   Tue Feb 11 17:28:20 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: revision.h,v 1.1 2010/07/03 08:14:13 jmmv Exp $        */
-
-#define PACKAGE_REVISION_TYPE_DIST