On Wed, Feb 09, 2022 at 12:55:21AM -0700, Anthony J. Bentley wrote:
> Klemens Nanni writes:
> > > better with 1.11.0pl20220207 so that if there is another proper release
> > > it won't need EPOCH
> >
> > What never version would require EPOCH?
> > 1.11.1, 1.12.0 and 2.0.0 would all be greater than 1.11.0.20220207, no?
>
> 1.11.0.1 would require an EPOCH.
>
> Upstreams adding an extra digit is unusual but not that unusual.
I missed this case, thanks.
> EPOCH is a giant pain. Small risk of a giant pain, versus zero risk.
> For that reason, I prefer to use a pl suffix.
Yup, here's the pl diff.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gtest/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 8 Feb 2022 09:31:46 -0000 1.26
+++ Makefile 9 Feb 2022 09:34:57 -0000
@@ -5,16 +5,15 @@ BROKEN-alpha = googletest/test/gtest_uni
COMMENT = C++ unit test framework
-V= 1.8.1
GH_ACCOUNT= google
GH_PROJECT= googletest
-GH_TAGNAME= release-$V
-PKGNAME = gtest-$V
+GH_COMMIT= 06519cedc3159de8b36a504766ad6b7966555f10
+DISTNAME = gtest-1.11.0pl20220208
-SHARED_LIBS += gmock 0.1 # .0.0
-SHARED_LIBS += gmock_main 0.1 # .0.0
-SHARED_LIBS += gtest 1.1 # .0.0
-SHARED_LIBS += gtest_main 1.1 # .0.0
+SHARED_LIBS += gmock 1.0 # .0.0
+SHARED_LIBS += gmock_main 1.0 # .0.0
+SHARED_LIBS += gtest 2.0 # .0.0
+SHARED_LIBS += gtest_main 2.0 # .0.0
CATEGORIES = devel
@@ -28,11 +27,9 @@ CXXFLAGS += -mxgot
# New BSD
PERMIT_PACKAGE = Yes
-SEPARATE_BUILD = Yes
-
WANTLIB = m ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/gtest/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 31 Oct 2021 16:09:26 -0000 1.5
+++ distinfo 9 Feb 2022 09:35:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (googletest-1.8.1.tar.gz) = m/H+UYKmBLQTXtwaQlrjVsmtFemyP58SoC6AGEw6JJw=
-SIZE (googletest-1.8.1.tar.gz) = 992298
+SHA256 (gtest-1.11.0pl20220208-06519ced.tar.gz) =
sRI4OZi04SMfIwCe725y3/CchJ110HBAZa2XOcxh9LA=
+SIZE (gtest-1.11.0pl20220208-06519ced.tar.gz) = 835586
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gtest/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 31 Oct 2021 16:09:26 -0000 1.4
+++ pkg/PLIST 9 Feb 2022 09:29:35 -0000
@@ -2,35 +2,28 @@
include/gmock/
include/gmock/gmock-actions.h
include/gmock/gmock-cardinalities.h
-include/gmock/gmock-generated-actions.h
-include/gmock/gmock-generated-actions.h.pump
-include/gmock/gmock-generated-function-mockers.h
-include/gmock/gmock-generated-function-mockers.h.pump
-include/gmock/gmock-generated-matchers.h
-include/gmock/gmock-generated-matchers.h.pump
-include/gmock/gmock-generated-nice-strict.h
-include/gmock/gmock-generated-nice-strict.h.pump
+include/gmock/gmock-function-mocker.h
include/gmock/gmock-matchers.h
include/gmock/gmock-more-actions.h
include/gmock/gmock-more-matchers.h
+include/gmock/gmock-nice-strict.h
include/gmock/gmock-spec-builders.h
include/gmock/gmock.h
include/gmock/internal/
include/gmock/internal/custom/
include/gmock/internal/custom/README.md
include/gmock/internal/custom/gmock-generated-actions.h
-include/gmock/internal/custom/gmock-generated-actions.h.pump
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-generated-internal-utils.h.pump
include/gmock/internal/gmock-internal-utils.h
include/gmock/internal/gmock-port.h
+include/gmock/internal/gmock-pp.h
include/gtest/
+include/gtest/gtest-assertion-result.h
include/gtest/gtest-death-test.h
+include/gtest/gtest-matchers.h
include/gtest/gtest-message.h
include/gtest/gtest-param-test.h
-include/gtest/gtest-param-test.h.pump
include/gtest/gtest-printers.h
include/gtest/gtest-spi.h
include/gtest/gtest-test-part.h
@@ -47,17 +40,11 @@ include/gtest/internal/custom/gtest.h
include/gtest/internal/gtest-death-test-internal.h
include/gtest/internal/gtest-filepath.h
include/gtest/internal/gtest-internal.h
-include/gtest/internal/gtest-linked_ptr.h
-include/gtest/internal/gtest-param-util-generated.h
-include/gtest/internal/gtest-param-util-generated.h.pump
include/gtest/internal/gtest-param-util.h
include/gtest/internal/gtest-port-arch.h
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-string.h
-include/gtest/internal/gtest-tuple.h
-include/gtest/internal/gtest-tuple.h.pump
include/gtest/internal/gtest-type-util.h
-include/gtest/internal/gtest-type-util.h.pump
lib/cmake/
lib/cmake/GTest/
lib/cmake/GTest/GTestConfig.cmake
