Update to 1.6.0

Changes for 1.6.0:

* New feature: ADD_FAILURE_AT() for reporting a test failure at the
  given source location -- useful for writing testing utilities.
* New feature: the universal value printer is moved from Google Mock
  to Google Test.
* New feature: type parameters and value parameters are reported in
  the XML report now.
* A gtest_disable_pthreads CMake option.
* Colored output works in GNU Screen sessions now.
* Parameters of value-parameterized tests are now printed in the
  textual output.
* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
  now correctly reported.
* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
  ostream.
* More complete handling of exceptions.
* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
  name is already used by another library.
* --gtest_catch_exceptions is now true by default, allowing a test
  program to continue after an exception is thrown.
* Value-parameterized test fixtures can now derive from Test and
  WithParamInterface<T> separately, easing conversion of legacy tests.
* Death test messages are clearly marked to make them more
  distinguishable from other messages.
* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
  PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
  IBM XL C++ (Visual Age C++), and C++0x.
* Bug fixes and implementation clean-ups.
* Potentially incompatible changes: disables the harmful 'make install'
  command in autotools.

Changes for 1.5.0:

 * New feature: assertions can be safely called in multiple threads
   where the pthreads library is available.
 * New feature: predicates used inside EXPECT_TRUE() and friends
   can now generate custom failure messages.
 * New feature: Google Test can now be compiled as a DLL.
 * New feature: fused source files are included.
 * New feature: prints help when encountering unrecognized Google Test flags.
 * Experimental feature: CMake build script (requires CMake 2.6.4+).
 * Experimental feature: the Pump script for meta programming.
 * double values streamed to an assertion are printed with enough precision
   to differentiate any two different values.
 * Google Test now works on Solaris and AIX.
 * Build and test script improvements.
 * Bug fixes and implementation clean-ups.

 Potentially breaking changes:

 * Stopped supporting VC++ 7.1 with exceptions disabled.
 * Dropped support for 'make install'.

5 files changed, 62 insertions, 8 deletions

diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index e1a9a06ac86..ec974fd572e 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2010/01/26 01:20:57 reed Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/13 10:54:39 ryoon Exp $
 #
 
-DISTNAME=	gtest-1.4.0
+DISTNAME=	gtest-1.6.0
 PKGNAME=	${DISTNAME:S/gtest/googletest/}
 CATEGORIES=	devel
 MASTER_SITES=	http://googletest.googlecode.com/files/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://code.google.com/p/googletest/
 COMMENT=	Google's C++ testing framework
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+INSTALLATION_DIRS=	bin
+
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c++ c
 USE_LIBTOOL=	yes
@@ -23,4 +26,14 @@ SUBST_MESSAGE.rpathfix=	Adding rpath to gtest-config
 SUBST_SED.rpathfix=	-e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g'
 SUBST_STAGE.rpathfix=	pre-configure
 
+SUBST_CLASSES+=			fix-python
+SUBST_STAGE.fix-python=		pre-configure
+SUBST_MESSAGE.fix-python=	Fixing dynamic python
+SUBST_FILES.fix-python+=	scripts/*py
+SUBST_SED.fix-python+=		-e 's,/usr/bin/env python,${PYTHONBIN},'
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${DESTDIR}${PREFIX}/bin
+
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/googletest/PLIST b/devel/googletest/PLIST
index cc4f90efaf4..98107ec588e 100644
--- a/devel/googletest/PLIST
+++ b/devel/googletest/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2010/01/26 01:20:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/05/13 10:54:39 ryoon Exp $
 bin/gtest-config
 include/gtest/gtest-death-test.h
 include/gtest/gtest-message.h
 include/gtest/gtest-param-test.h
+include/gtest/gtest-printers.h
 include/gtest/gtest-spi.h
 include/gtest/gtest-test-part.h
 include/gtest/gtest-typed-test.h
diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo
index f58f01e728b..f87c91ff656 100644
--- a/devel/googletest/distinfo
+++ b/devel/googletest/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/01/26 01:20:57 reed Exp $
+$NetBSD: distinfo,v 1.4 2011/05/13 10:54:39 ryoon Exp $
 
-SHA1 (gtest-1.4.0.tar.bz2) = d26e1a67ec08a9d6167ecf77c61961c469f448b2
-RMD160 (gtest-1.4.0.tar.bz2) = 2688f9e4c68af10a5974af91c0fe2dd551cf72c7
-Size (gtest-1.4.0.tar.bz2) = 525425 bytes
+SHA1 (gtest-1.6.0.zip) = 00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621
+RMD160 (gtest-1.6.0.zip) = ae4be5325f0cd83fea9902aa8674915ef2dcf8b4
+Size (gtest-1.6.0.zip) = 1121697 bytes
+SHA1 (patch-Makefile.in) = f071727b3f8bc1c50837cc59dc87a20ff203ed72
+SHA1 (patch-configure) = 7e11bf665760d489ad0bbb0806d2f88c7e335738
diff --git a/devel/googletest/patches/patch-Makefile.in b/devel/googletest/patches/patch-Makefile.in
new file mode 100644
index 00000000000..75657557c94
--- /dev/null
+++ b/devel/googletest/patches/patch-Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/05/13 10:54:39 ryoon Exp $
+
+* Enable 'make install'
+
+--- Makefile.in.orig	2011-04-15 19:51:48.000000000 +0000
++++ Makefile.in
+@@ -1215,14 +1215,14 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-m4dataDATA \
++install-data-am: install-m4dataDATA \
+ 	install-pkgincludeHEADERS install-pkginclude_internalHEADERS
+ 
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local install-libLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
diff --git a/devel/googletest/patches/patch-configure b/devel/googletest/patches/patch-configure
new file mode 100644
index 00000000000..9521d06dc49
--- /dev/null
+++ b/devel/googletest/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/05/13 10:54:39 ryoon Exp $
+
+* Improve compatibility
+
+--- configure.orig	2011-04-15 19:51:47.000000000 +0000
++++ configure
+@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+        have_pthreads="$acx_pthread_ok"
+ fi
+- if test "x$have_pthreads" == "xyes"; then
++ if test "x$have_pthreads" = "xyes"; then
+   HAVE_PTHREADS_TRUE=
+   HAVE_PTHREADS_FALSE='#'
+ else