Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Feb 2018 10:12:30 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r462092 - in head: devel/yaml-cpp devel/yaml-cpp/files games/openxcom games/openxcom/files net-mgmt/openbmp
Message-ID:  <201802171012.w1HACUSB027083@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Feb 17 10:12:29 2018
New Revision: 462092
URL: https://svnweb.freebsd.org/changeset/ports/462092

Log:
  - Update devel/yaml-cpp to 0.6.1
  - This new version drops dependency on boost-libs
  - Fix openxcom to build with this new version [1]
  - Add explicit dependency on boost to net-mgmt/openbmp, now that
    yamp-cpp does not pull that in for it [2]
  
  Approved by:		pizzamig [2],
  			Maintainer timeout [1]
  Differential Revision:	https://reviews.freebsd.org/D14155

Added:
  head/games/openxcom/files/patch-src_Basescape_BaseInfoState.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Basescape_CraftInfoState.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Engine_RNG.cpp
     - copied, changed from r462091, head/games/openxcom/files/patch-src__Engine__RNG.cpp
  head/games/openxcom/files/patch-src_Savegame_CraftWeapon.cpp   (contents, props changed)
Deleted:
  head/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
  head/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
  head/games/openxcom/files/patch-src__Engine__RNG.cpp
Modified:
  head/devel/yaml-cpp/Makefile
  head/devel/yaml-cpp/distinfo
  head/devel/yaml-cpp/pkg-plist
  head/games/openxcom/Makefile
  head/net-mgmt/openbmp/Makefile

Modified: head/devel/yaml-cpp/Makefile
==============================================================================
--- head/devel/yaml-cpp/Makefile	Sat Feb 17 09:50:54 2018	(r462091)
+++ head/devel/yaml-cpp/Makefile	Sat Feb 17 10:12:29 2018	(r462092)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	yaml-cpp
-PORTVERSION=	0.5.3
-DISTVERSIONPREFIX=	release-
-PORTREVISION=	7
+PORTVERSION=	0.6.1
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -12,9 +11,6 @@ COMMENT=	YAML parser and emitter in C++ matching the Y
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jbeder

Modified: head/devel/yaml-cpp/distinfo
==============================================================================
--- head/devel/yaml-cpp/distinfo	Sat Feb 17 09:50:54 2018	(r462091)
+++ head/devel/yaml-cpp/distinfo	Sat Feb 17 10:12:29 2018	(r462092)
@@ -1,2 +1,3 @@
-SHA256 (jbeder-yaml-cpp-release-0.5.3_GH0.tar.gz) = ac50a27a201d16dc69a881b80ad39a7be66c4d755eda1f76c3a68781b922af8f
-SIZE (jbeder-yaml-cpp-release-0.5.3_GH0.tar.gz) = 2016737
+TIMESTAMP = 1517659229
+SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.1_GH0.tar.gz) = 25ec37e6d82ab8c485926d69a5567741c7263515f8631e5dcb3fb4708e6b0d0d
+SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.1_GH0.tar.gz) = 1396262

Modified: head/devel/yaml-cpp/pkg-plist
==============================================================================
--- head/devel/yaml-cpp/pkg-plist	Sat Feb 17 09:50:54 2018	(r462091)
+++ head/devel/yaml-cpp/pkg-plist	Sat Feb 17 10:12:29 2018	(r462092)
@@ -1,3 +1,54 @@
+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-matchers.h
+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-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/gtest/gtest-death-test.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
+include/gtest/gtest-typed-test.h
+include/gtest/gtest.h
+include/gtest/gtest_pred_impl.h
+include/gtest/gtest_prod.h
+include/gtest/internal/custom/gtest-port.h
+include/gtest/internal/custom/gtest-printers.h
+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
 include/yaml-cpp/anchor.h
 include/yaml-cpp/binary.h
 include/yaml-cpp/contrib/anchordict.h
@@ -35,7 +86,15 @@ include/yaml-cpp/parser.h
 include/yaml-cpp/stlemitter.h
 include/yaml-cpp/traits.h
 include/yaml-cpp/yaml.h
+lib/cmake/yaml-cpp/yaml-cpp-config-version.cmake
+lib/cmake/yaml-cpp/yaml-cpp-config.cmake
+lib/cmake/yaml-cpp/yaml-cpp-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/yaml-cpp/yaml-cpp-targets.cmake
+lib/libgmock.so
+lib/libgmock_main.so
+lib/libgtest.so
+lib/libgtest_main.so
 lib/libyaml-cpp.so
 lib/libyaml-cpp.so.0
-lib/libyaml-cpp.so.0.5.3
+lib/libyaml-cpp.so.0.6.0
 libdata/pkgconfig/yaml-cpp.pc

Modified: head/games/openxcom/Makefile
==============================================================================
--- head/games/openxcom/Makefile	Sat Feb 17 09:50:54 2018	(r462091)
+++ head/games/openxcom/Makefile	Sat Feb 17 10:12:29 2018	(r462092)
@@ -22,6 +22,7 @@ GH_ACCOUNT=	SupSuper
 GH_PROJECT=	OpenXcom
 
 USES=		compiler:c++11-lang gmake pkgconfig
+USE_CXXSTD=	c++11
 USE_SDL=	sdl mixer image gfx
 USE_GL=		gl
 

Added: head/games/openxcom/files/patch-src_Basescape_BaseInfoState.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Basescape_BaseInfoState.cpp	Sat Feb 17 10:12:29 2018	(r462092)
@@ -0,0 +1,10 @@
+--- src/Basescape/BaseInfoState.cpp.orig	2014-06-13 19:14:43 UTC
++++ src/Basescape/BaseInfoState.cpp
+@@ -17,6 +17,7 @@
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "BaseInfoState.h"
++#include <cmath>
+ #include <sstream>
+ #include "../Engine/Game.h"
+ #include "../Engine/Action.h"

Added: head/games/openxcom/files/patch-src_Basescape_CraftInfoState.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Basescape_CraftInfoState.cpp	Sat Feb 17 10:12:29 2018	(r462092)
@@ -0,0 +1,10 @@
+--- src/Basescape/CraftInfoState.cpp.orig	2014-06-13 19:14:43 UTC
++++ src/Basescape/CraftInfoState.cpp
+@@ -17,6 +17,7 @@
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "CraftInfoState.h"
++#include <cmath>
+ #include <sstream>
+ #include "../Engine/Game.h"
+ #include "../Resource/ResourcePack.h"

Copied and modified: head/games/openxcom/files/patch-src_Engine_RNG.cpp (from r462091, head/games/openxcom/files/patch-src__Engine__RNG.cpp)
==============================================================================
--- head/games/openxcom/files/patch-src__Engine__RNG.cpp	Sat Feb 17 09:50:54 2018	(r462091, copy source)
+++ head/games/openxcom/files/patch-src_Engine_RNG.cpp	Sat Feb 17 10:12:29 2018	(r462092)
@@ -1,5 +1,5 @@
---- src/Engine/RNG.cpp.orig	2014-06-13 23:14:43.000000000 +0400
-+++ src/Engine/RNG.cpp	2014-09-11 18:52:08.000000000 +0400
+--- src/Engine/RNG.cpp.orig	2014-06-13 19:14:43 UTC
++++ src/Engine/RNG.cpp
 @@ -17,6 +17,7 @@
   * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -8,7 +8,7 @@
  #include <math.h>
  #include <time.h>
  
-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ int generate(int min, int max)
  double generate(double min, double max)
  {
  	double num = next();

Added: head/games/openxcom/files/patch-src_Savegame_CraftWeapon.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Savegame_CraftWeapon.cpp	Sat Feb 17 10:12:29 2018	(r462092)
@@ -0,0 +1,10 @@
+--- src/Savegame/CraftWeapon.cpp.orig	2014-06-13 19:14:43 UTC
++++ src/Savegame/CraftWeapon.cpp
+@@ -16,6 +16,7 @@
+  * You should have received a copy of the GNU General Public License
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include <cmath>
+ #include "CraftWeapon.h"
+ #include "../Ruleset/RuleCraftWeapon.h"
+ #include "../Ruleset/Ruleset.h"

Modified: head/net-mgmt/openbmp/Makefile
==============================================================================
--- head/net-mgmt/openbmp/Makefile	Sat Feb 17 09:50:54 2018	(r462091)
+++ head/net-mgmt/openbmp/Makefile	Sat Feb 17 10:12:29 2018	(r462092)
@@ -4,6 +4,7 @@
 PORTNAME=	openbmp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -12,6 +13,7 @@ COMMENT=	OpenBMP Server Collector
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/exception/all.hpp:devel/boost-libs
 LIB_DEPENDS=	librdkafka.so:net/librdkafka \
 				libsasl2.so:security/cyrus-sasl2 \
 				libyaml-cpp.so:devel/yaml-cpp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802171012.w1HACUSB027083>