pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

msgpack-git: Update to release 2.0.0

Module Name:	pkgsrc-wip
Committed By:	Jonathan Buschmann <jonthn+pkgsrc%pinacea.com@localhost>
Pushed By:	jonthn
Date:		Sat Jul 2 01:05:03 2016 +0200
Changeset:	341aea197ded4d4e53f1f29476a48b6e481da810

Modified Files:
	msgpack-git/Makefile
	msgpack-git/PLIST
	msgpack-git/distinfo
	msgpack-git/options.mk
Removed Files:
	msgpack-git/patches/patch-bootstrap

Log Message:
 msgpack-git: Update to release 2.0.0

  - Now using Cmake
  - Switch to "release" from Github

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=341aea197ded4d4e53f1f29476a48b6e481da810

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 msgpack-git/Makefile                | 32 +++++++++++++++-----------------
 msgpack-git/PLIST                   | 28 ++++++++++++++++++++++++++--
 msgpack-git/distinfo                |  8 ++++----
 msgpack-git/options.mk              |  1 +
 msgpack-git/patches/patch-bootstrap | 17 -----------------
 5 files changed, 46 insertions(+), 40 deletions(-)

diffs:
diff --git a/msgpack-git/Makefile b/msgpack-git/Makefile
index c052d4b..0ecddf5 100644
--- a/msgpack-git/Makefile
+++ b/msgpack-git/Makefile
@@ -1,43 +1,41 @@
 # $ NetBSD $
 
-DISTNAME=	msgpack-1.4.0
+DISTNAME=	msgpack-2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=msgpack/}
 GITHUB_PROJECT=	msgpack-c
 GITHUB_RELEASE=	cpp-${PKGVERSION_NOREV}
 GITHUB_TYPE=	release
 
-GIT_REPOSITORIES=	msgpack
-GIT_REPO.msgpack=	git://github.com/msgpack/msgpack-c.git
-GIT_MODULE.msgpack=	msgpack-c
-WRKSRC=			${WRKDIR}/${GIT_MODULE.msgpack}
+# GIT_REPOSITORIES=	msgpack
+# GIT_REPO.msgpack=	git://github.com/msgpack/msgpack-c.git
+# GIT_MODULE.msgpack=	msgpack-c
+# WRKSRC=			${WRKDIR}/${GIT_MODULE.msgpack}
 
 HOMEPAGE=	http://msgpack.org/
 COMMENT=	Binary-based efficient object serialization library
 LICENSE=	apache-2.0
 
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS=	aclocal autoconf automake autoheader
+
+CMAKE_ARGS+=	-DMSGPACK_BUILD_TESTS=OFF
+CMAKE_ARGS+=	-DMSGPACK_BUILD_EXAMPLES=OFF
 
 CONFLICTS=	msgpack-[0-9]*
 
 PKGCONFIG_OVERRIDE=	msgpack.pc.in
 
-GCC_REQD+=	4.1
-
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=	-march=i686
-CXXFLAGS+=	-march=i686
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+SOEXT=          dylib
+.else
+SOEXT=          so
 .endif
-
-pre-configure:
-	cd ${WRKSRC} && ./bootstrap
+PLIST_SUBST+=   SOEXT=${SOEXT}
 
 .include "options.mk"
 
-.include "../../wip/mk/git-package.mk"
+# .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/msgpack-git/PLIST b/msgpack-git/PLIST
index d2f5865..fa6af2b 100644
--- a/msgpack-git/PLIST
+++ b/msgpack-git/PLIST
@@ -11,6 +11,7 @@ include/msgpack/adaptor/boost/msgpack_variant.hpp
 include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
 include/msgpack/adaptor/boost/optional.hpp
 include/msgpack/adaptor/boost/string_ref.hpp
+include/msgpack/adaptor/carray.hpp
 include/msgpack/adaptor/char_ptr.hpp
 include/msgpack/adaptor/check_container_size.hpp
 include/msgpack/adaptor/check_container_size_decl.hpp
@@ -45,6 +46,8 @@ include/msgpack/adaptor/pair.hpp
 include/msgpack/adaptor/raw.hpp
 include/msgpack/adaptor/raw_decl.hpp
 include/msgpack/adaptor/set.hpp
+include/msgpack/adaptor/size_equal_only.hpp
+include/msgpack/adaptor/size_equal_only_decl.hpp
 include/msgpack/adaptor/string.hpp
 include/msgpack/adaptor/tr1/unordered_map.hpp
 include/msgpack/adaptor/tr1/unordered_set.hpp
@@ -60,6 +63,7 @@ include/msgpack/fbuffer.h
 include/msgpack/fbuffer.hpp
 include/msgpack/fbuffer_decl.hpp
 include/msgpack/gcc_atomic.h
+include/msgpack/gcc_atomic.hpp
 include/msgpack/iterator.hpp
 include/msgpack/iterator_decl.hpp
 include/msgpack/meta.hpp
@@ -132,6 +136,17 @@ include/msgpack/predef/detail/endian_compat.h
 include/msgpack/predef/detail/os_detected.h
 include/msgpack/predef/detail/platform_detected.h
 include/msgpack/predef/detail/test.h
+include/msgpack/predef/detail/test_def.h
+include/msgpack/predef/hardware.h
+include/msgpack/predef/hardware/simd.h
+include/msgpack/predef/hardware/simd/arm.h
+include/msgpack/predef/hardware/simd/arm/versions.h
+include/msgpack/predef/hardware/simd/ppc.h
+include/msgpack/predef/hardware/simd/ppc/versions.h
+include/msgpack/predef/hardware/simd/x86.h
+include/msgpack/predef/hardware/simd/x86/versions.h
+include/msgpack/predef/hardware/simd/x86_amd.h
+include/msgpack/predef/hardware/simd/x86_amd/versions.h
 include/msgpack/predef/language.h
 include/msgpack/predef/language/objc.h
 include/msgpack/predef/language/stdc.h
@@ -391,6 +406,7 @@ include/msgpack/preprocessor/selection/min.hpp
 include/msgpack/preprocessor/seq.hpp
 include/msgpack/preprocessor/seq/cat.hpp
 include/msgpack/preprocessor/seq/detail/binary_transform.hpp
+include/msgpack/preprocessor/seq/detail/is_empty.hpp
 include/msgpack/preprocessor/seq/detail/split.hpp
 include/msgpack/preprocessor/seq/elem.hpp
 include/msgpack/preprocessor/seq/enum.hpp
@@ -479,6 +495,7 @@ include/msgpack/v1/adaptor/boost/msgpack_variant.hpp
 include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
 include/msgpack/v1/adaptor/boost/optional.hpp
 include/msgpack/v1/adaptor/boost/string_ref.hpp
+include/msgpack/v1/adaptor/carray.hpp
 include/msgpack/v1/adaptor/char_ptr.hpp
 include/msgpack/v1/adaptor/check_container_size.hpp
 include/msgpack/v1/adaptor/check_container_size_decl.hpp
@@ -525,6 +542,8 @@ include/msgpack/v1/adaptor/pair.hpp
 include/msgpack/v1/adaptor/raw.hpp
 include/msgpack/v1/adaptor/raw_decl.hpp
 include/msgpack/v1/adaptor/set.hpp
+include/msgpack/v1/adaptor/size_equal_only.hpp
+include/msgpack/v1/adaptor/size_equal_only_decl.hpp
 include/msgpack/v1/adaptor/string.hpp
 include/msgpack/v1/adaptor/tr1/unordered_map.hpp
 include/msgpack/v1/adaptor/tr1/unordered_set.hpp
@@ -555,7 +574,6 @@ include/msgpack/v1/pack_decl.hpp
 include/msgpack/v1/preprocessor.hpp
 include/msgpack/v1/sbuffer.hpp
 include/msgpack/v1/sbuffer_decl.hpp
-include/msgpack/v1/type.hpp
 include/msgpack/v1/unpack.hpp
 include/msgpack/v1/unpack_decl.hpp
 include/msgpack/v1/version.hpp
@@ -585,6 +603,7 @@ include/msgpack/v2/adaptor/map_decl.hpp
 include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp
 include/msgpack/v2/adaptor/nil_decl.hpp
 include/msgpack/v2/adaptor/raw_decl.hpp
+include/msgpack/v2/adaptor/size_equal_only_decl.hpp
 include/msgpack/v2/adaptor/v4raw_decl.hpp
 include/msgpack/v2/cpp_config_decl.hpp
 include/msgpack/v2/detail/cpp03_zone_decl.hpp
@@ -592,11 +611,13 @@ include/msgpack/v2/detail/cpp11_zone_decl.hpp
 include/msgpack/v2/fbuffer_decl.hpp
 include/msgpack/v2/iterator_decl.hpp
 include/msgpack/v2/meta_decl.hpp
+include/msgpack/v2/object.hpp
 include/msgpack/v2/object_decl.hpp
 include/msgpack/v2/object_fwd.hpp
 include/msgpack/v2/object_fwd_decl.hpp
 include/msgpack/v2/pack_decl.hpp
 include/msgpack/v2/sbuffer_decl.hpp
+include/msgpack/v2/unpack.hpp
 include/msgpack/v2/unpack_decl.hpp
 include/msgpack/v2/vrefbuffer_decl.hpp
 include/msgpack/v2/zbuffer_decl.hpp
@@ -614,5 +635,8 @@ include/msgpack/zbuffer_decl.hpp
 include/msgpack/zone.h
 include/msgpack/zone.hpp
 include/msgpack/zone_decl.hpp
-lib/libmsgpackc.la
+lib/libmsgpackc.${PKGVERSION}.${SOEXT}
+lib/libmsgpackc.2.${SOEXT}
+lib/libmsgpackc.a
+lib/libmsgpackc.${SOEXT}
 lib/pkgconfig/msgpack.pc
diff --git a/msgpack-git/distinfo b/msgpack-git/distinfo
index 58ca7fb..09a7c7a 100644
--- a/msgpack-git/distinfo
+++ b/msgpack-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.3 2015/08/10 22:13:59 jonthn Exp $
 
-SHA1 (msgpack-1.1.0.tar.gz) = 95f69a9ca11d4950367fe99a70579e15c389be7b
-RMD160 (msgpack-1.1.0.tar.gz) = 7d954007f613cebd2d613a712b300b0466378665
-Size (msgpack-1.1.0.tar.gz) = 493551 bytes
-SHA1 (patch-bootstrap) = 3221c60325a534325d4abe720d90a7bef0b51e67
+SHA1 (msgpack-2.0.0.tar.gz) = 5c3a1314d7c12a3bbff9cc14905d9612c7e3c15d
+RMD160 (msgpack-2.0.0.tar.gz) = ba2930eb5ddb40e9a8a51fc7d9f08a921562ee97
+SHA512 (msgpack-2.0.0.tar.gz) = 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
+Size (msgpack-2.0.0.tar.gz) = 446063 bytes
diff --git a/msgpack-git/options.mk b/msgpack-git/options.mk
index 7d526d6..c670a58 100644
--- a/msgpack-git/options.mk
+++ b/msgpack-git/options.mk
@@ -10,4 +10,5 @@ PKG_SUPPORTED_OPTIONS=	tests
 BUILDLINK_DEPMETHOD.googletest+=	build
 .include "../../devel/googletest/buildlink3.mk"
 TEST_TARGET=	check
+CMAKE_ARGS+=	-DMSGPACK_BUILD_TESTS=ON
 .endif
diff --git a/msgpack-git/patches/patch-bootstrap b/msgpack-git/patches/patch-bootstrap
deleted file mode 100644
index b93e769..0000000
--- a/msgpack-git/patches/patch-bootstrap
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bootstrap,v 1.1 2014/12/07 22:08:12 jonthn Exp $
-
---- bootstrap.orig	2014-12-07 19:01:11.000000000 +0000
-+++ bootstrap
-@@ -50,11 +50,7 @@ AUTOMAKE_FILES="config.sub stamp-h.in lt
- CONFIG_AUX_DIR="."
- CONFIG_FILES="stamp-h ltconfig"
- CONFIG_HEADER=""
--if [ x`uname` = x"Darwin" ]; then
--	LIBTOOLIZE="glibtoolize --force --copy"
--else
--	LIBTOOLIZE="libtoolize --force --copy"
--fi
-+LIBTOOLIZE="libtoolize --force --copy"
- LIBTOOLIZE_FILES="config.sub ltmain.sh config.guess"
- RM="rm"
- SUBDIRS="[]"
Home | Main Index | Thread Index | Old Index