CVS commit: pkgsrc/devel/googletest

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Jul  4 20:51:07 UTC 2017

Modified Files:
        pkgsrc/devel/googletest: Makefile distinfo
Added Files:
        pkgsrc/devel/googletest/patches:
            patch-googletest_include_gtest_internal_gtest-port-arch.h
            patch-googletest_include_gtest_internal_gtest-port.h

Log Message:
googletest: Add NetBSD support

Backport upstream patch:

"Add NetBSD support"
https://github.com/google/googletest/commit/4bab34d2084259cba67f3bfb51217c10d606e175

Bump PKGREVISION to 1.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/googletest/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/googletest/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h \
    pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/googletest/Makefile
diff -u pkgsrc/devel/googletest/Makefile:1.13 pkgsrc/devel/googletest/Makefile:1.14
--- pkgsrc/devel/googletest/Makefile:1.13       Wed May  3 08:38:40 2017
+++ pkgsrc/devel/googletest/Makefile    Tue Jul  4 20:51:07 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2017/05/03 08:38:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2017/07/04 20:51:07 kamil Exp $
 
 DISTNAME=      googletest-1.8.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=    release-${PKGVERSION_NOREV}
@@ -15,4 +16,7 @@ INSTALLATION_DIRS=    bin
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++11
 
+post-install:
+       ${RUN} cd ${DESTDIR} && find . -name '*.orig' -exec rm -f {} \;
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/googletest/distinfo
diff -u pkgsrc/devel/googletest/distinfo:1.7 pkgsrc/devel/googletest/distinfo:1.8
--- pkgsrc/devel/googletest/distinfo:1.7        Mon Oct 31 16:43:17 2016
+++ pkgsrc/devel/googletest/distinfo    Tue Jul  4 20:51:07 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/10/31 16:43:17 wiz Exp $
+$NetBSD: distinfo,v 1.8 2017/07/04 20:51:07 kamil Exp $
 
 SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
 RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
 SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 Size (googletest-1.8.0.tar.gz) = 1281617 bytes
+SHA1 (patch-googletest_include_gtest_internal_gtest-port-arch.h) = 105ef4b84a5fea957c9cffc0f202829c774136dc
+SHA1 (patch-googletest_include_gtest_internal_gtest-port.h) = 86319a127b60083e07d565dbeb496af17a6f84e4

Added files:

Index: pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h
diff -u /dev/null pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h:1.1
--- /dev/null   Tue Jul  4 20:51:07 2017
+++ pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h   Tue Jul  4 20:51:07 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-googletest_include_gtest_internal_gtest-port-arch.h,v 1.1 2017/07/04 20:51:07 kamil Exp $
+
+--- googletest/include/gtest/internal/gtest-port-arch.h.orig   2016-07-14 17:15:38.000000000 +0000
++++ googletest/include/gtest/internal/gtest-port-arch.h
+@@ -84,6 +84,8 @@
+ # define GTEST_OS_HPUX 1
+ #elif defined __native_client__
+ # define GTEST_OS_NACL 1
++#elif defined __NetBSD__
++# define GTEST_OS_NETBSD 1
+ #elif defined __OpenBSD__
+ # define GTEST_OS_OPENBSD 1
+ #elif defined __QNX__
Index: pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h
diff -u /dev/null pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h:1.1
--- /dev/null   Tue Jul  4 20:51:07 2017
+++ pkgsrc/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h        Tue Jul  4 20:51:07 2017
@@ -0,0 +1,31 @@
+$NetBSD: patch-googletest_include_gtest_internal_gtest-port.h,v 1.1 2017/07/04 20:51:07 kamil Exp $
+
+--- googletest/include/gtest/internal/gtest-port.h.orig        2016-07-14 17:15:38.000000000 +0000
++++ googletest/include/gtest/internal/gtest-port.h
+@@ -128,6 +128,7 @@
+ //   GTEST_OS_MAC      - Mac OS X
+ //     GTEST_OS_IOS    - iOS
+ //   GTEST_OS_NACL     - Google Native Client (NaCl)
++//   GTEST_OS_NETBSD   - NetBSD
+ //   GTEST_OS_OPENBSD  - OpenBSD
+ //   GTEST_OS_QNX      - QNX
+ //   GTEST_OS_SOLARIS  - Sun Solaris
+@@ -601,7 +602,7 @@ struct _RTL_CRITICAL_SECTION;
+ // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+ // to your compiler flags.
+ # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
+-    || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
++    || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD)
+ #endif  // GTEST_HAS_PTHREAD
+ 
+ #if GTEST_HAS_PTHREAD
+@@ -790,7 +791,8 @@ using ::std::tuple_size;
+      (GTEST_OS_MAC && !GTEST_OS_IOS) || \
+      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
+      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
+-     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
++     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \
++     GTEST_OS_NETBSD)
+ # define GTEST_HAS_DEATH_TEST 1
+ #endif
+