aboutsummaryrefslogtreecommitdiff
path: root/devel/googlemock
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-11-15 01:41:12 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-11-15 01:41:12 +0000
commit750eaf67969f5fa326409c1de3de7d4ca1fe2015 (patch)
tree42c6e1333b9a5ecd61fa4cf730c9deeb6f592a78 /devel/googlemock
parent59b2541df62b617661f2b5e337c3e512684f8ea4 (diff)
downloadports-750eaf67969f5fa326409c1de3de7d4ca1fe2015.tar.gz
ports-750eaf67969f5fa326409c1de3de7d4ca1fe2015.zip
devel/google{test,mock}: update to 1.8.0.11
Notes
Notes: svn path=/head/; revision=426138
Diffstat (limited to 'devel/googlemock')
-rw-r--r--devel/googlemock/Makefile10
-rw-r--r--devel/googlemock/distinfo5
-rw-r--r--devel/googlemock/files/patch-Makefile.am16
-rw-r--r--devel/googlemock/files/patch-scripts_gmock__doctor.py41
-rw-r--r--devel/googlemock/pkg-plist3
5 files changed, 28 insertions, 47 deletions
diff --git a/devel/googlemock/Makefile b/devel/googlemock/Makefile
index eda5e6b8a396..31d6876a2b02 100644
--- a/devel/googlemock/Makefile
+++ b/devel/googlemock/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= googlemock
-PORTVERSION= 1.7.0
DISTVERSIONPREFIX= release-
-PORTREVISION= 1
+DISTVERSION= 1.8.0-11
+DISTVERSIONSUFFIX= -ga2b8a8e
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org
@@ -14,13 +14,15 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_pthread.m4:devel/autoconf-archive \
- googletest>=1.7.0:devel/googletest
+ googletest>=1.8.0:devel/googletest
LIB_DEPENDS= libgtest.so:devel/googletest
USE_GITHUB= yes
GH_ACCOUNT= google
+GH_PROJECT= googletest
-USES= autoreconf libtool
+USES= autoreconf libtool localbase
+WRKSRC_SUBDIR= ${PORTNAME}
GNU_CONFIGURE= yes
# fused-src python tests are only useful for bundling. There's no point in
# running them before installing system-wide without source files.
diff --git a/devel/googlemock/distinfo b/devel/googlemock/distinfo
index 96af375d199f..0e55d069b829 100644
--- a/devel/googlemock/distinfo
+++ b/devel/googlemock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (google-googlemock-release-1.7.0_GH0.tar.gz) = 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232
-SIZE (google-googlemock-release-1.7.0_GH0.tar.gz) = 296168
+TIMESTAMP = 1471419713
+SHA256 (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 5e7cb72292eec51ca0ecb9c83d4769c667b7ead7daba83a89cbc20f7fbd2fd74
+SIZE (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 1282276
diff --git a/devel/googlemock/files/patch-Makefile.am b/devel/googlemock/files/patch-Makefile.am
new file mode 100644
index 000000000000..73e3dedeaad8
--- /dev/null
+++ b/devel/googlemock/files/patch-Makefile.am
@@ -0,0 +1,16 @@
+Move custom headers into their own directory
+
+--- Makefile.am.orig 2016-11-03 20:36:28 UTC
++++ Makefile.am
+@@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir
+ pkginclude_internal_HEADERS = \
+ include/gmock/internal/gmock-generated-internal-utils.h \
+ include/gmock/internal/gmock-internal-utils.h \
+- include/gmock/internal/gmock-port.h \
++ include/gmock/internal/gmock-port.h
++
++pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
++pkginclude_internal_custom_HEADERS = \
+ include/gmock/internal/custom/gmock-generated-actions.h \
+ include/gmock/internal/custom/gmock-matchers.h \
+ include/gmock/internal/custom/gmock-port.h
diff --git a/devel/googlemock/files/patch-scripts_gmock__doctor.py b/devel/googlemock/files/patch-scripts_gmock__doctor.py
deleted file mode 100644
index 608e635886ca..000000000000
--- a/devel/googlemock/files/patch-scripts_gmock__doctor.py
+++ /dev/null
@@ -1,41 +0,0 @@
-From ac830d6b197f8b8dad24782d7900c69cee0ab77e Mon Sep 17 00:00:00 2001
-From: Syl <srouquette@gmail.com>
-Date: Sun, 30 Aug 2015 08:57:48 +0200
-Subject: [PATCH] Fix gmock_doctor.py for Python3
-
---- scripts/gmock_doctor.py.orig 2013-09-19 00:32:04 UTC
-+++ scripts/gmock_doctor.py
-@@ -590,7 +590,7 @@ def main():
- print ('Please copy and paste the compiler errors here. Press c-D when '
- 'you are done:')
- else:
-- print 'Waiting for compiler errors on stdin . . .'
-+ print ('Waiting for compiler errors on stdin . . .')
-
- msg = sys.stdin.read().strip()
- diagnoses = Diagnose(msg)
-@@ -608,18 +608,18 @@ If you send your source code and the com
- %s, you can be helped and I can get smarter --
- win-win for us!""" % (msg, _EMAIL))
- else:
-- print '------------------------------------------------------------'
-- print 'Your code appears to have the following',
-+ print ('------------------------------------------------------------')
-+ print ('Your code appears to have the following',)
- if count > 1:
-- print '%s diseases:' % (count,)
-+ print ('%s diseases:' % (count,))
- else:
-- print 'disease:'
-+ print ('disease:')
- i = 0
- for d in diagnoses:
- i += 1
- if count > 1:
-- print '\n#%s:' % (i,)
-- print d
-+ print ('\n#%s:' % (i,))
-+ print (d)
- print ("""
- How did I do? If you think I'm wrong or unhelpful, please send your
- source code and the compiler's error messages to %s.
diff --git a/devel/googlemock/pkg-plist b/devel/googlemock/pkg-plist
index beed971d4166..caba3b153a6c 100644
--- a/devel/googlemock/pkg-plist
+++ b/devel/googlemock/pkg-plist
@@ -11,6 +11,9 @@ include/gmock/gmock-more-actions.h
include/gmock/gmock-more-matchers.h
include/gmock/gmock-spec-builders.h
include/gmock/gmock.h
+include/gmock/internal/custom/gmock-generated-actions.h
+include/gmock/internal/custom/gmock-matchers.h
+include/gmock/internal/custom/gmock-port.h
include/gmock/internal/gmock-generated-internal-utils.h
include/gmock/internal/gmock-internal-utils.h
include/gmock/internal/gmock-port.h