View | Details | Raw Unified | Return to bug 187562 | Differences between
and this patch

Collapse All | Expand All

(-)devel/googletest/Makefile (-8 / +10 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	googletest
4
PORTNAME=	googletest
5
PORTVERSION=	1.5.0
5
PORTVERSION=	1.7.0
6
PORTREVISION=	1
7
CATEGORIES=	devel
6
CATEGORIES=	devel
8
MASTER_SITES=	GOOGLE_CODE
7
MASTER_SITES=	GOOGLE_CODE
9
DISTNAME=	gtest-${PORTVERSION}
8
DISTNAME=	gtest-${PORTVERSION}
Lines 13-28 Link Here
13
12
14
LICENSE=	BSD3CLAUSE
13
LICENSE=	BSD3CLAUSE
15
14
16
USES=		libtool python:2,build shebangfix
15
USES=		cmake python:2,build shebangfix zip
17
GNU_CONFIGURE=	yes
16
#CMAKE_ARGS+=	-Dgtest_build_samples=ON
18
USE_LDCONFIG=	yes
19
17
20
python_OLD_CMD=	/usr/bin/env python
18
python_OLD_CMD=	/usr/bin/env python
21
python_CMD=	/usr/bin/env python2
19
python_CMD=	/usr/bin/env python2
22
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
20
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
23
		scripts/pump.py
21
		scripts/pump.py
22
do-install:
23
	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib
24
	${INSTALL_DATA} ${WRKSRC}/libgtest* ${STAGEDIR}${LOCALBASE}/lib
25
	${MKDIR} ${STAGEDIR}${LOCALBASE}/include
26
	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${LOCALBASE}/include)
27
	${RM} ${STAGEDIR}${LOCALBASE}/include/gtest/*.pump \
28
	${STAGEDIR}${LOCALBASE}/include/gtest/internal/*.pump
24
29
25
regression-test:
26
	cd ${WRKSRC}; ${MAKE} check
27
28
.include <bsd.port.mk>
30
.include <bsd.port.mk>
(-)devel/googletest/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
1
SHA256 (gtest-1.7.0.zip) = 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d
2
SIZE (gtest-1.5.0.tar.gz) = 896874
2
SIZE (gtest-1.7.0.zip) = 1164254
(-)devel/googletest/files/patch-include_gtest_internal_gtest-port.h (-19 / +28 lines)
Lines 1-19 Link Here
1
--- include/gtest/internal/gtest-port.h.orig	2010-04-16 06:02:02.000000000 +0800
1
--- include/gtest/internal/gtest-port.h.orig	2014-08-16 09:30:13.114359210 +0100
2
+++ include/gtest/internal/gtest-port.h	2013-10-16 23:39:02.000000000 +0800
2
+++ include/gtest/internal/gtest-port.h	2014-08-16 09:32:56.496223003 +0100
3
@@ -173,6 +173,7 @@
3
@@ -92,6 +92,7 @@
4
 #include <stdlib.h>
4
 // the given platform; otherwise undefined):
5
 #include <stdio.h>
5
 //   GTEST_OS_AIX      - IBM AIX
6
 #include <string.h>
6
 //   GTEST_OS_CYGWIN   - Cygwin
7
+#include <unistd.h>
7
+//   GTEST_OS_FREEBSD  - FreeBSD
8
 #ifndef _WIN32_WCE
8
 //   GTEST_OS_HPUX     - HP-UX
9
 #include <sys/stat.h>
9
 //   GTEST_OS_LINUX    - Linux
10
 #endif  // !_WIN32_WCE
10
 //     GTEST_OS_LINUX_ANDROID - Google Android
11
@@ -399,7 +400,7 @@
11
@@ -248,6 +249,8 @@
12
 // defining __GNUC__ and friends, but cannot compile GCC's tuple
12
 #   define GTEST_OS_IOS_SIMULATOR 1
13
 // implementation.  MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
13
 #  endif
14
 // Feature Pack download, which we cannot assume the user has.
14
 # endif
15
-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
15
+#elif defined __FreeBSD__
16
+#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \
16
+# define GTEST_OS_FREEBSD 1
17
     || _MSC_VER >= 1600
17
 #elif defined __linux__
18
 #define GTEST_USE_OWN_TR1_TUPLE 0
18
 # define GTEST_OS_LINUX 1
19
 #else
19
 # if defined __ANDROID__
20
@@ -646,7 +649,7 @@
21
      (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
22
      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
23
      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
24
-     GTEST_OS_OPENBSD || GTEST_OS_QNX)
25
+     GTEST_OS_FREEBSD || GTEST_OS_OPENBSD || GTEST_OS_QNX)
26
 # define GTEST_HAS_DEATH_TEST 1
27
 # include <vector>  // NOLINT
28
 #endif
(-)devel/googletest/pkg-plist (-8 / +1 lines)
Lines 1-7 Link Here
1
bin/gtest-config
2
include/gtest/gtest-death-test.h
1
include/gtest/gtest-death-test.h
3
include/gtest/gtest-message.h
2
include/gtest/gtest-message.h
4
include/gtest/gtest-param-test.h
3
include/gtest/gtest-param-test.h
4
include/gtest/gtest-printers.h
5
include/gtest/gtest-spi.h
5
include/gtest/gtest-spi.h
6
include/gtest/gtest-test-part.h
6
include/gtest/gtest-test-part.h
7
include/gtest/gtest-typed-test.h
7
include/gtest/gtest-typed-test.h
Lines 19-29 Link Here
19
include/gtest/internal/gtest-tuple.h
19
include/gtest/internal/gtest-tuple.h
20
include/gtest/internal/gtest-type-util.h
20
include/gtest/internal/gtest-type-util.h
21
lib/libgtest.a
21
lib/libgtest.a
22
lib/libgtest.so
23
lib/libgtest.so.0
24
lib/libgtest.so.0.0.0
25
lib/libgtest_main.a
22
lib/libgtest_main.a
26
lib/libgtest_main.so
27
lib/libgtest_main.so.0
28
lib/libgtest_main.so.0.0.0
29
share/aclocal/gtest.m4

Return to bug 187562