Attachment #148803 for bug #187562

Lines 2-20 Link Here

(-)devel/googlemock/Makefile (-5 / +32 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= googlemock	4	PORTNAME= googlemock
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 \
		8	https://googlemock.googlecode.com/svn-history/r407/trunk/scripts/:svn
9	DISTNAME= gmock-${PORTVERSION}	9	DISTNAME= gmock-${PORTVERSION}
		10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gmock_doctor.py:svn
		11	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
10		12
11	MAINTAINER= clsung@FreeBSD.org	13	MAINTAINER= clsung@FreeBSD.org
12	COMMENT= Library for writing and using C++ mock classes	14	COMMENT= Library for writing and using C++ mock classes
13		15
14	BUILD_DEPENDS= googletest>=1.5.0:${PORTSDIR}/devel/googletest	16	LICENSE= BSD3CLAUSE
15		17
16	USES= libtool	18	BUILD_DEPENDS= googletest>=1.7.0:${PORTSDIR}/devel/googletest
		19
		20	USES= libtool shebangfix zip
17	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
19		23
		24	CONFIGURE_ENV= ac_cv_path_PYTHON=python2
		25	python_OLD_CMD= /usr/bin/env python
		26	python_CMD= /usr/bin/env python2
		27	SHEBANG_FILES= scripts/fuse_gmock_files.py scripts/gmock_doctor.py
		28
		29	OPTIONS_DEFINE= TEST
		30
		31	TEST_USE= python:2,build
		32	TEST_ALL_TARGET=check
		33
		34	post-extract:
		35	# XXX gmock_doctor.py is missing from distfile before r455 or 1.8.0
		36	${CP} ${DISTDIR}/gmock_doctor.py ${WRKSRC}/scripts
		37
		38	post-patch:
		39	# enable vendor make install again (revert r562)
		40	${REINPLACE_CMD} -E 's/ install-(exec\|data)-local//' \
		41	${WRKSRC}/Makefile.in
		42
		43	post-install:
		44	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin
		45	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
		46
20	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/googlemock/distinfo (-2 / +4 lines)
1	SHA256 (gmock-1.5.0.tar.gz) = 21fe9db0de2ae36af1c3bf97dab2b24c38f2392d7b4e376f1c22e71b48c95a39	1	SHA256 (gmock-1.7.0.zip) = 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b
2	SIZE (gmock-1.5.0.tar.gz) = 1759469	2	SIZE (gmock-1.7.0.zip) = 2167746
		3	SHA256 (gmock_doctor.py) = 92a8eaf7f4c0716ecd9622b97d907e68d5eb63d6c89acbc1fc72d573d00fc47d
		4	SIZE (gmock_doctor.py) = 23590

Lines 8-14 include/gmock/gmock-generated-matchers.h Link Here

(-)devel/googlemock/pkg-plist (-1 / +1 lines)
8	include/gmock/gmock-generated-nice-strict.h	8	include/gmock/gmock-generated-nice-strict.h
9	include/gmock/gmock-matchers.h	9	include/gmock/gmock-matchers.h
10	include/gmock/gmock-more-actions.h	10	include/gmock/gmock-more-actions.h
11	include/gmock/gmock-printers.h	11	include/gmock/gmock-more-matchers.h
12	include/gmock/gmock-spec-builders.h	12	include/gmock/gmock-spec-builders.h
13	include/gmock/gmock.h	13	include/gmock/gmock.h
14	include/gmock/internal/gmock-generated-internal-utils.h	14	include/gmock/internal/gmock-generated-internal-utils.h




# $FreeBSD$

PORTNAME=	googletest
PORTVERSION=	1.7.0
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	GOOGLE_CODE
DISTNAME=	gtest-${PORTVERSION}


LICENSE=	BSD3CLAUSE

USES=		libtool shebangfix zip
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
python_OLD_CMD=	/usr/bin/env python
python_CMD=	/usr/bin/env python2
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
		scripts/pump.py

OPTIONS_DEFINE=	TEST
	cd ${WRKSRC}; ${MAKE} check

TEST_USES=	python:2,build
TEST_ALL_TARGET=check

post-patch:
# enable vendor make install again (revert r562)
	${REINPLACE_CMD} -E 's/ install-(exec|data)-local//' \
		${WRKSRC}/Makefile.in

post-install:
	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/googletest/distinfo (-2 / +2 lines)
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




--- include/gtest/internal/gtest-port.h.orig	2010-04-16 06:02:02.000000000 +0800
+++ include/gtest/internal/gtest-port.h	2013-10-16 23:39:02.000000000 +0800
@@ -173,6 +173,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #ifndef _WIN32_WCE
 #include <sys/stat.h>
 #endif  // !_WIN32_WCE
@@ -399,7 +400,7 @@
 // defining __GNUC__ and friends, but cannot compile GCC's tuple
 // implementation.  MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
 // Feature Pack download, which we cannot assume the user has.
-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
+#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \
     || _MSC_VER >= 1600
 #define GTEST_USE_OWN_TR1_TUPLE 0
 #else

Lines 2-7 bin/gtest-config Link Here

(-)devel/googletest/pkg-plist (+1 lines)
2	include/gtest/gtest-death-test.h	2	include/gtest/gtest-death-test.h
3	include/gtest/gtest-message.h	3	include/gtest/gtest-message.h
4	include/gtest/gtest-param-test.h	4	include/gtest/gtest-param-test.h
		5	include/gtest/gtest-printers.h
5	include/gtest/gtest-spi.h	6	include/gtest/gtest-spi.h
6	include/gtest/gtest-test-part.h	7	include/gtest/gtest-test-part.h
7	include/gtest/gtest-typed-test.h	8	include/gtest/gtest-typed-test.h

Return to bug 187562

Lines 2-9 Link Here

(-)devel/googletest/Makefile (-5 / +15 lines)
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 COMMENT= Framework for writing C++ tests on a vari Link Here
13		12
14	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE
15		14
16	USES= libtool python:2,build shebangfix	15	USES= libtool shebangfix zip
17	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19		18
		19	CONFIGURE_ENV= ac_cv_path_PYTHON=python2
20	python_OLD_CMD= /usr/bin/env python	20	python_OLD_CMD= /usr/bin/env python
21	python_CMD= /usr/bin/env python2	21	python_CMD= /usr/bin/env python2
22	SHEBANG_FILES= scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \	22	SHEBANG_FILES= scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
23	scripts/pump.py	23	scripts/pump.py
24		24
25	regression-test:	25	OPTIONS_DEFINE= TEST
26	cd ${WRKSRC}; ${MAKE} check
27		26
		27	TEST_USES= python:2,build
		28	TEST_ALL_TARGET=check
		29
		30	post-patch:
		31	# enable vendor make install again (revert r562)
		32	${REINPLACE_CMD} -E 's/ install-(exec\|data)-local//' \
		33	${WRKSRC}/Makefile.in
		34
		35	post-install:
		36	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin
		37
28	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)devel/googletest/files/patch-include_gtest_internal_gtest-port.h (-19 lines)
1	--- include/gtest/internal/gtest-port.h.orig 2010-04-16 06:02:02.000000000 +0800
2	+++ include/gtest/internal/gtest-port.h 2013-10-16 23:39:02.000000000 +0800
3	@@ -173,6 +173,7 @@
4	#include <stdlib.h>
5	#include <stdio.h>
6	#include <string.h>
7	+#include <unistd.h>
8	#ifndef _WIN32_WCE
9	#include <sys/stat.h>
10	#endif // !_WIN32_WCE
11	@@ -399,7 +400,7 @@
12	// defining __GNUC__ and friends, but cannot compile GCC's tuple
13	// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
14	// Feature Pack download, which we cannot assume the user has.
15	-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
16	+#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \
17	\|\| _MSC_VER >= 1600
18	#define GTEST_USE_OWN_TR1_TUPLE 0
19	#else