Import of pkgsrc-2014Q1

net/libzrtpcpp/Makefile

@@ -1,15 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2013/06/27 01:40:45 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/12 23:18:22 tron Exp $
 
-DISTNAME=	libzrtpcpp-2.3.3
+DISTNAME=	V4.1.2
+PKGNAME=	libzrtpcpp${DISTNAME:S/V/-/1}
+PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU:=ccrtp/}
+MASTER_SITES=	https://github.com/wernerd/ZRTPCPP/archive/
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://wiki.gnutelephony.org/
 COMMENT=	ZRTP extension for GNU ccRTP
 LICENSE=	gnu-gpl-v3
 
+WRKSRC=		${WRKDIR}/ZRTPCPP-${PKGVERSION_NOREV}
+
 USE_PKGLOCALEDIR=	yes
+GCC_REQD+=		4.7
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++

net/libzrtpcpp/PLIST

@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/17 00:55:35 rodent Exp $
-include/libzrtpcpp/TimeoutProvider.h
+@comment $NetBSD: PLIST,v 1.2 2014/01/10 02:58:51 rodent Exp $
+include/libzrtpcpp/CcrtpTimeoutProvider.h
 include/libzrtpcpp/ZrtpCWrapper.h
 include/libzrtpcpp/ZrtpCallback.h
 include/libzrtpcpp/ZrtpCodes.h
 include/libzrtpcpp/ZrtpConfigure.h
 include/libzrtpcpp/ZrtpQueue.h
 include/libzrtpcpp/ZrtpUserCallback.h
+include/libzrtpcpp/common/osSpecifics.h
 include/libzrtpcpp/zrtpccrtp.h
 lib/libzrtpcpp.so
-lib/libzrtpcpp.so.2
-lib/libzrtpcpp.so.${PKGVERSION}
+lib/libzrtpcpp.so.4
+lib/libzrtpcpp.so.4.1.1
 lib/pkgconfig/libzrtpcpp.pc

net/libzrtpcpp/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/04/22 06:10:42 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:18:22 tron Exp $
 
 BUILDLINK_TREE+=	libzrtpcpp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libzrtpcpp
 LIBZRTPCPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libzrtpcpp+=	libzrtpcpp>=0.9.0
-BUILDLINK_ABI_DEPENDS.libzrtpcpp?=	libzrtpcpp>=1.4.6nb1
+BUILDLINK_ABI_DEPENDS.libzrtpcpp?=	libzrtpcpp>=4.1.2nb1
 BUILDLINK_PKGSRCDIR.libzrtpcpp?=	../../net/libzrtpcpp
 
 .include "../../mk/pthread.buildlink3.mk"

net/libzrtpcpp/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/06/27 01:40:45 rodent Exp $
+$NetBSD: distinfo,v 1.3 2014/01/10 02:58:51 rodent Exp $
 
-SHA1 (libzrtpcpp-2.3.3.tar.gz) = b1bdf9d54f8170f9bfac396b590608e08cfba1b5
-RMD160 (libzrtpcpp-2.3.3.tar.gz) = 1f7bf6734036e6b62b94be530fb7ea299e124728
-Size (libzrtpcpp-2.3.3.tar.gz) = 256971 bytes
-SHA1 (patch-CMakeLists.txt) = 4c47e69e4b1d48748c14268a25e192e7bb1ae953
+SHA1 (V4.1.2.tar.gz) = 4dd9a916437e6a9d82ccc86fb566e40f801f8340
+RMD160 (V4.1.2.tar.gz) = 6b51a90a036baf9c965fb22c5aa2d5adf130bd03
+Size (V4.1.2.tar.gz) = 1919843 bytes
+SHA1 (patch-CMakeLists.txt) = 4635e03e618872e75c2081e8247b77cff1d0d339

net/libzrtpcpp/patches/patch-CMakeLists.txt

@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/17 00:55:36 rodent Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/10 02:58:52 rodent Exp $
 
 Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS.
 
---- CMakeLists.txt.orig	2012-10-17 13:16:16.000000000 +0000
+--- CMakeLists.txt.orig	2013-11-23 12:30:36.000000000 +0000
 +++ CMakeLists.txt
-@@ -71,18 +71,6 @@ endif()
- enable_arg(ccrtp true "Enable GNU ccRTP support for GNU ZRTP")
- args_help()
+@@ -80,18 +80,6 @@ include(CheckLibraryExists)
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
  
 -if (NOT LIB_SUFFIX)
 -    set(LIBDIRNAME "lib")
@@ -20,6 +20,6 @@ Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS.
 -    set(LIBDIRNAME "lib${LIB_SUFFIX}")
 -endif()
 -
- # setup the Thread include and lib
- find_package(Threads)
- if(CMAKE_HAVE_PTHREAD_H)
+ check_include_files(stdlib.h HAVE_STDLIB_H)
+ check_include_files(string.h HAVE_STRING_H)
+