summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2018-01-30 07:22:17 +0000
committeradam <adam@pkgsrc.org>2018-01-30 07:22:17 +0000
commit213874ac7e2024341bb523b8318e57da6d82d208 (patch)
treef409b4ea58e66946bbb85107995e10119ba065f7 /textproc
parent3ccda371be2fef70c80f2effc0d9fdb4b48a4de8 (diff)
downloadpkgsrc-213874ac7e2024341bb523b8318e57da6d82d208.tar.gz
yaml-cpp: updated to 0.6.0
0.6.0: requires C++11 removes dependency on Boost bug fixes performance improvements
Diffstat (limited to 'textproc')
-rw-r--r--textproc/yaml-cpp/Makefile13
-rw-r--r--textproc/yaml-cpp/PLIST8
-rw-r--r--textproc/yaml-cpp/buildlink3.mk4
-rw-r--r--textproc/yaml-cpp/distinfo11
-rw-r--r--textproc/yaml-cpp/patches/patch-test_gmock-1.7.0_configure24
5 files changed, 17 insertions, 43 deletions
diff --git a/textproc/yaml-cpp/Makefile b/textproc/yaml-cpp/Makefile
index 298ae7d824e..d2a348acfa5 100644
--- a/textproc/yaml-cpp/Makefile
+++ b/textproc/yaml-cpp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/09/23 08:39:53 roy Exp $
-#
+# $NetBSD: Makefile,v 1.5 2018/01/30 07:22:17 adam Exp $
-DISTNAME= yaml-cpp-0.5.3
+DISTNAME= yaml-cpp-0.6.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=jbeder/}
@@ -11,17 +10,15 @@ COMMENT= YAML parser and emitter for C++
LICENSE= mit
GITHUB_TAG= ${DISTNAME}
+EXTRACT_USING= bsdtar
-EXTRACT_USING= bsdtar
USE_CMAKE= yes
-USE_LANGUAGES= c c++
-
+USE_LANGUAGES= c c++11
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-
+CMAKE_ARGS+= -DYAML_CPP_BUILD_TESTS=OFF # issue 539
PKGCONFIG_OVERRIDE+= yaml-cpp.pc.cmake
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
TEST_TARGET= test
-.include "../../devel/boost-headers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/yaml-cpp/PLIST b/textproc/yaml-cpp/PLIST
index 948f0ad103c..55128fed46e 100644
--- a/textproc/yaml-cpp/PLIST
+++ b/textproc/yaml-cpp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/09/19 09:52:21 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/30 07:22:17 adam Exp $
include/yaml-cpp/anchor.h
include/yaml-cpp/binary.h
include/yaml-cpp/contrib/anchordict.h
@@ -36,7 +36,11 @@ 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-release.cmake
+lib/cmake/yaml-cpp/yaml-cpp-targets.cmake
lib/libyaml-cpp.so
-lib/libyaml-cpp.so.0.5
lib/libyaml-cpp.so.${PKGVERSION}
+lib/libyaml-cpp.so.0.6
lib/pkgconfig/yaml-cpp.pc
diff --git a/textproc/yaml-cpp/buildlink3.mk b/textproc/yaml-cpp/buildlink3.mk
index 0c2a7d1b108..313ab7964da 100644
--- a/textproc/yaml-cpp/buildlink3.mk
+++ b/textproc/yaml-cpp/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:36 rillig Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/30 07:22:17 adam Exp $
BUILDLINK_TREE+= yaml-cpp
@@ -9,7 +8,6 @@ YAML_CPP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.yaml-cpp+= yaml-cpp>=0.5.0
BUILDLINK_PKGSRCDIR.yaml-cpp?= ../../textproc/yaml-cpp
-.include "../../devel/boost-headers/buildlink3.mk"
.endif # YAML_CPP_BUILDLINK3_MK
BUILDLINK_TREE+= -yaml-cpp
diff --git a/textproc/yaml-cpp/distinfo b/textproc/yaml-cpp/distinfo
index a67501381df..35c27d3d75b 100644
--- a/textproc/yaml-cpp/distinfo
+++ b/textproc/yaml-cpp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/09/19 09:52:21 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2018/01/30 07:22:17 adam Exp $
-SHA1 (yaml-cpp-0.5.3.tar.gz) = f1e4c3963f86cfbaa362265f15559adc2ee23589
-RMD160 (yaml-cpp-0.5.3.tar.gz) = 7596dc6941d4b6ef09481b6a49113a4993b013a4
-SHA512 (yaml-cpp-0.5.3.tar.gz) = cb11acccc5261e4513b597becf6be5d7fef05ef89a11eda3fc7db9e513adf953a2ec9c1bf70b91277076d793f0c65a496c7243d9b4a4240623e5f7034f8d4ad3
-Size (yaml-cpp-0.5.3.tar.gz) = 2016629 bytes
-SHA1 (patch-test_gmock-1.7.0_configure) = 3d6e638bfca8240a273474328f7c28837dfc8e24
+SHA1 (yaml-cpp-0.6.0.tar.gz) = 73a3a3cec52238cf2041d001eaaccf9beb091f1f
+RMD160 (yaml-cpp-0.6.0.tar.gz) = ac61658e404fa3f086725c2d6cde956a34908c92
+SHA512 (yaml-cpp-0.6.0.tar.gz) = 186886201277a5d452801fd8f71e51434a31538af0443d0ab7ce8bb584e1171d083b28e21d29755bada9192e75b319e5e20a047325600045b1060385a307ab24
+Size (yaml-cpp-0.6.0.tar.gz) = 1396163 bytes
diff --git a/textproc/yaml-cpp/patches/patch-test_gmock-1.7.0_configure b/textproc/yaml-cpp/patches/patch-test_gmock-1.7.0_configure
deleted file mode 100644
index 27469470531..00000000000
--- a/textproc/yaml-cpp/patches/patch-test_gmock-1.7.0_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-test_gmock-1.7.0_configure,v 1.1 2016/09/19 09:52:21 fhajny Exp $
-
-Portability.
-
---- test/gmock-1.7.0/configure.orig 2016-01-10 18:11:40.000000000 +0000
-+++ test/gmock-1.7.0/configure
-@@ -15591,7 +15591,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
- HAVE_PTHREADS_TRUE=
- HAVE_PTHREADS_FALSE='#'
- else
-@@ -15621,7 +15621,7 @@ else
- enable_external_gtest=yes
- fi
-
--if test "x$with_gtest" == "xno"; then :
-+if test "x$with_gtest" = "xno"; then :
- as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow
- GoogleMock to use any installed version and fall back upon its internal