Attachment 148803 Details for Bug 187562 – combined

[patch] combined

update.diff (text/plain), 5.93 KB, created by Jan Beich on 2014-10-31 00:42:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-10-31 00:42:18 UTC

Size: 5.93 KB

patch

obsolete

>Index: devel/googlemock/Makefile
>===================================================================
>--- devel/googlemock/Makefile	(revision 371776)
>+++ devel/googlemock/Makefile	(working copy)
>@@ -2,19 +2,46 @@
> # $FreeBSD$
> 
> PORTNAME=	googlemock
>-PORTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTVERSION=	1.7.0
> CATEGORIES=	devel
>-MASTER_SITES=	GOOGLE_CODE
>+MASTER_SITES=	GOOGLE_CODE \
>+		https://googlemock.googlecode.com/svn-history/r407/trunk/scripts/:svn
> DISTNAME=	gmock-${PORTVERSION}
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gmock_doctor.py:svn
>+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	clsung@FreeBSD.org
> COMMENT=	Library for writing and using C++ mock classes
> 
>-BUILD_DEPENDS=	googletest>=1.5.0:${PORTSDIR}/devel/googletest
>+LICENSE=	BSD3CLAUSE
> 
>-USES=		libtool
>+BUILD_DEPENDS=	googletest>=1.7.0:${PORTSDIR}/devel/googletest
>+
>+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_gmock_files.py scripts/gmock_doctor.py
>+
>+OPTIONS_DEFINE=	TEST
>+
>+TEST_USE=	python:2,build
>+TEST_ALL_TARGET=check
>+
>+post-extract:
>+# XXX gmock_doctor.py is missing from distfile before r455 or 1.8.0
>+	${CP} ${DISTDIR}/gmock_doctor.py ${WRKSRC}/scripts
>+
>+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/gmock-config ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
>+
> .include <bsd.port.mk>
>Index: devel/googlemock/distinfo
>===================================================================
>--- devel/googlemock/distinfo	(revision 371776)
>+++ devel/googlemock/distinfo	(working copy)
>@@ -1,2 +1,4 @@
>-SHA256 (gmock-1.5.0.tar.gz) = 21fe9db0de2ae36af1c3bf97dab2b24c38f2392d7b4e376f1c22e71b48c95a39
>-SIZE (gmock-1.5.0.tar.gz) = 1759469
>+SHA256 (gmock-1.7.0.zip) = 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b
>+SIZE (gmock-1.7.0.zip) = 2167746
>+SHA256 (gmock_doctor.py) = 92a8eaf7f4c0716ecd9622b97d907e68d5eb63d6c89acbc1fc72d573d00fc47d
>+SIZE (gmock_doctor.py) = 23590
>Index: devel/googlemock/pkg-plist
>===================================================================
>--- devel/googlemock/pkg-plist	(revision 371776)
>+++ devel/googlemock/pkg-plist	(working copy)
>@@ -8,7 +8,7 @@ include/gmock/gmock-generated-matchers.h
> include/gmock/gmock-generated-nice-strict.h
> include/gmock/gmock-matchers.h
> include/gmock/gmock-more-actions.h
>-include/gmock/gmock-printers.h
>+include/gmock/gmock-more-matchers.h
> include/gmock/gmock-spec-builders.h
> include/gmock/gmock.h
> include/gmock/internal/gmock-generated-internal-utils.h
>Index: devel/googletest/Makefile
>===================================================================
>--- devel/googletest/Makefile	(revision 371776)
>+++ devel/googletest/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	googletest
>-PORTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTVERSION=	1.7.0
> CATEGORIES=	devel
> MASTER_SITES=	GOOGLE_CODE
> DISTNAME=	gtest-${PORTVERSION}
>@@ -13,16 +12,27 @@ COMMENT=	Framework for writing C++ tests on a vari
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=		libtool python:2,build shebangfix
>+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
> 
>-regression-test:
>-	cd ${WRKSRC}; ${MAKE} check
>+OPTIONS_DEFINE=	TEST
> 
>+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>
>Index: devel/googletest/distinfo
>===================================================================
>--- devel/googletest/distinfo	(revision 371776)
>+++ devel/googletest/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
>-SIZE (gtest-1.5.0.tar.gz) = 896874
>+SHA256 (gtest-1.7.0.zip) = 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d
>+SIZE (gtest-1.7.0.zip) = 1164254
>Index: devel/googletest/files/patch-include_gtest_internal_gtest-port.h
>===================================================================
>--- devel/googletest/files/patch-include_gtest_internal_gtest-port.h	(revision 371776)
>+++ devel/googletest/files/patch-include_gtest_internal_gtest-port.h	(working copy)
>@@ -1,19 +0,0 @@
>---- 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
>Index: devel/googletest/pkg-plist
>===================================================================
>--- devel/googletest/pkg-plist	(revision 371776)
>+++ devel/googletest/pkg-plist	(working copy)
>@@ -2,6 +2,7 @@ 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

Actions: View | Diff

Attachments on bug 187562: 140844 | 144798 | 145880 | 148803 | 148804 | 148805 | 148806 | 148807 | 148808 | 149345 | 149822 | 149823 | 149824