Page MenuHomeFreeBSD
Files F131668160

D14155.id38810.diff
No OneTemporary
Actions

D14155.id38810.diff
View Options

Index: devel/yaml-cpp/Makefile
===================================================================
--- devel/yaml-cpp/Makefile
+++ devel/yaml-cpp/Makefile
@@ -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 @@
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
Index: devel/yaml-cpp/distinfo
===================================================================
--- devel/yaml-cpp/distinfo
+++ devel/yaml-cpp/distinfo
@@ -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
Index: devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
===================================================================
--- devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/yaml-cpp/emitter.h.orig 2016-01-10 18:11:40 UTC
-+++ include/yaml-cpp/emitter.h
-@@ -122,7 +122,7 @@ class YAML_CPP_API Emitter : private non
- bool CanEmitNewline() const;
-
- private:
-- std::auto_ptr<EmitterState> m_pState;
-+ std::unique_ptr<EmitterState> m_pState;
- ostream_wrapper m_stream;
- };
-
Index: devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
===================================================================
--- devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/yaml-cpp/parser.h.orig 2016-01-10 18:11:40 UTC
-+++ include/yaml-cpp/parser.h
-@@ -40,8 +40,8 @@ class YAML_CPP_API Parser : private nonc
- void HandleTagDirective(const Token& token);
-
- private:
-- std::auto_ptr<Scanner> m_pScanner;
-- std::auto_ptr<Directives> m_pDirectives;
-+ std::unique_ptr<Scanner> m_pScanner;
-+ std::unique_ptr<Directives> m_pDirectives;
- };
- }
-
Index: devel/yaml-cpp/pkg-plist
===================================================================
--- devel/yaml-cpp/pkg-plist
+++ devel/yaml-cpp/pkg-plist
@@ -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/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
Index: games/openxcom/Makefile
===================================================================
--- games/openxcom/Makefile
+++ games/openxcom/Makefile
@@ -22,6 +22,7 @@
GH_PROJECT= OpenXcom
USES= compiler:c++11-lang gmake pkgconfig
+USE_CXXSTD= c++11
USE_SDL= sdl mixer image gfx
USE_GL= gl
Index: games/openxcom/files/patch-src_Basescape_BaseInfoState.cpp
===================================================================
--- /dev/null
+++ games/openxcom/files/patch-src_Basescape_BaseInfoState.cpp
@@ -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"
Index: games/openxcom/files/patch-src_Basescape_CraftInfoState.cpp
===================================================================
--- /dev/null
+++ games/openxcom/files/patch-src_Basescape_CraftInfoState.cpp
@@ -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"
Index: games/openxcom/files/patch-src_Engine_RNG.cpp
===================================================================
--- games/openxcom/files/patch-src_Engine_RNG.cpp
+++ games/openxcom/files/patch-src_Engine_RNG.cpp
@@ -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();
Index: games/openxcom/files/patch-src_Savegame_CraftWeapon.cpp
===================================================================
--- /dev/null
+++ games/openxcom/files/patch-src_Savegame_CraftWeapon.cpp
@@ -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"
Index: games/openxcom/files/patch-src__Engine__RNG.cpp
===================================================================
--- games/openxcom/files/patch-src__Engine__RNG.cpp
+++ games/openxcom/files/patch-src__Engine__RNG.cpp
@@ -1,19 +0,0 @@
---- 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
-@@ -17,6 +17,7 @@
- * along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
- */
- #include "RNG.h"
-+#include <limits>
- #include <math.h>
- #include <time.h>
-
-@@ -86,7 +87,7 @@
- double generate(double min, double max)
- {
- double num = next();
-- return (double)(num / ((double)UINT64_MAX / (max - min)) + min);
-+ return (double)(num / ((double)std::numeric_limits<uint64_t>::max() / (max - min)) + min);
- }
-
- /**
Index: net-mgmt/openbmp/Makefile
===================================================================
--- net-mgmt/openbmp/Makefile
+++ net-mgmt/openbmp/Makefile
@@ -4,6 +4,7 @@
PORTNAME= openbmp
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.0
+PORTREVISION= 1
CATEGORIES= net-mgmt
MAINTAINER= pizzamig@FreeBSD.org
@@ -14,7 +15,8 @@
LIB_DEPENDS= librdkafka.so:net/librdkafka \
libsasl2.so:security/cyrus-sasl2 \
- libyaml-cpp.so:devel/yaml-cpp
+ libyaml-cpp.so:devel/yaml-cpp \
+ libboost_signals.so:devel/boost-libs
USES= cmake:outsource ssl
USE_GITHUB= yes

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 11, 4:45 AM (18 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23563445
Default Alt Text
D14155.id38810.diff (9 KB)

Event Timeline