Module Name: src
Committed By: jmmv
Date: Tue Feb 19 15:35:43 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Log Message:
Fix atf version in pkgconfig files (should be 0.17).
Keeping these files up to date with every new import is too easy to get
wrong. Would be nice if we'd extract the version number in some other
manner, like from lib/libatf-c/bconfig.h.
Found by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.15 src/external/bsd/atf/lib/libatf-c/Makefile:1.16
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.15 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c/Makefile Tue Feb 19 15:35:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2013/02/19 15:35:42 jmmv Exp $
NOLINT= # defined
@@ -89,7 +89,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.17 src/external/bsd/atf/lib/libatf-c++/Makefile:1.18
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.17 Fri Feb 15 17:08:35 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Tue Feb 19 15:35:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/02/15 17:08:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2013/02/19 15:35:43 jmmv Exp $
NOLINT= # defined
@@ -63,7 +63,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.7 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.7 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Tue Feb 19 15:35:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2013/02/19 15:35:43 jmmv Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ 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.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
<${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
CLEANFILES+= atf-sh.pc
