diff options
Diffstat (limited to 'net/libzrtpcpp')
| -rw-r--r-- | net/libzrtpcpp/Makefile | 18 | ||||
| -rw-r--r-- | net/libzrtpcpp/PLIST | 4 | ||||
| -rw-r--r-- | net/libzrtpcpp/buildlink3.mk | 13 | ||||
| -rw-r--r-- | net/libzrtpcpp/distinfo | 10 | ||||
| -rw-r--r-- | net/libzrtpcpp/options.mk | 15 | ||||
| -rw-r--r-- | net/libzrtpcpp/patches/patch-CMakeLists.txt | 10 |
6 files changed, 48 insertions, 22 deletions
diff --git a/net/libzrtpcpp/Makefile b/net/libzrtpcpp/Makefile index 63b645414ca..c9fde6a7351 100644 --- a/net/libzrtpcpp/Makefile +++ b/net/libzrtpcpp/Makefile @@ -1,17 +1,19 @@ -# $NetBSD: Makefile,v 1.8 2014/04/07 04:11:22 rodent Exp $ +# $NetBSD: Makefile,v 1.9 2015/04/18 03:36:23 rodent Exp $ -DISTNAME= V4.2.0 +GITHUB_TAG= V4.4.0 +DISTNAME= ${GITHUB_TAG} PKGNAME= libzrtpcpp${DISTNAME:S/V/-/1} CATEGORIES= net -MASTER_SITES= https://github.com/wernerd/ZRTPCPP/archive/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=wernerd/} +GITHUB_PROJECT= ZRTPCPP DIST_SUBDIR= ${PKGBASE} MAINTAINER= rodent@NetBSD.org -HOMEPAGE= http://wiki.gnutelephony.org/ +HOMEPAGE= http://www.gnutelephony.org/index.php/GNU_ZRTP COMMENT= ZRTP extension for GNU ccRTP LICENSE= gnu-gpl-v3 -WRKSRC= ${WRKDIR}/ZRTPCPP-${PKGVERSION_NOREV} +WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} USE_PKGLOCALEDIR= yes GCC_REQD+= 4.7 @@ -22,8 +24,10 @@ USE_CMAKE= yes PKG_DESTDIR_SUPPORT= destdir CMAKE_ARGS+= -DLIBDIRNAME=lib -BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7i -BUILDLINK_DEPMETHOD.openssl= build +.include "options.mk" + +BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 +#BUILDLINK_DEPMETHOD.openssl= build .include "../../mk/pthread.buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/libzrtpcpp/PLIST b/net/libzrtpcpp/PLIST index 3ea40cd52b7..b6eafb2db3c 100644 --- a/net/libzrtpcpp/PLIST +++ b/net/libzrtpcpp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/04/07 04:11:22 rodent Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/04/18 03:36:23 rodent Exp $ include/libzrtpcpp/CcrtpTimeoutProvider.h include/libzrtpcpp/ZrtpCWrapper.h include/libzrtpcpp/ZrtpCallback.h @@ -10,5 +10,5 @@ include/libzrtpcpp/common/osSpecifics.h include/libzrtpcpp/zrtpccrtp.h lib/libzrtpcpp.so lib/libzrtpcpp.so.4 -lib/libzrtpcpp.so.4.2.0 +lib/libzrtpcpp.so.4.4.0 lib/pkgconfig/libzrtpcpp.pc diff --git a/net/libzrtpcpp/buildlink3.mk b/net/libzrtpcpp/buildlink3.mk index 70f5b9d40f8..e078dfd0f4a 100644 --- a/net/libzrtpcpp/buildlink3.mk +++ b/net/libzrtpcpp/buildlink3.mk @@ -1,14 +1,21 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/04/07 05:34:23 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2015/04/18 03:36:23 rodent Exp $ BUILDLINK_TREE+= libzrtpcpp .if !defined(LIBZRTPCPP_BUILDLINK3_MK) LIBZRTPCPP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libzrtpcpp+= libzrtpcpp>=0.9.0 -BUILDLINK_ABI_DEPENDS.libzrtpcpp?= libzrtpcpp>=4.2.0 +BUILDLINK_API_DEPENDS.libzrtpcpp+= libzrtpcpp>=4.4.0 +BUILDLINK_ABI_DEPENDS.libzrtpcpp?= libzrtpcpp>=4.4.0 BUILDLINK_PKGSRCDIR.libzrtpcpp?= ../../net/libzrtpcpp +pkgbase := libzrtpcpp +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.libzrtpcpp:Msqlite3) +.include "../../databases/sqlite3/buildlink3.mk" +.endif + .include "../../mk/pthread.buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/libzrtpcpp/distinfo b/net/libzrtpcpp/distinfo index 0da2d7f11bc..649d369f4e5 100644 --- a/net/libzrtpcpp/distinfo +++ b/net/libzrtpcpp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2014/04/07 04:11:22 rodent Exp $ +$NetBSD: distinfo,v 1.5 2015/04/18 03:36:23 rodent Exp $ -SHA1 (libzrtpcpp/V4.2.0.tar.gz) = fdba0ac3a849279ece82fe7e78172f3709bde6a8 -RMD160 (libzrtpcpp/V4.2.0.tar.gz) = a48238527518078a08e5d733dddac619ce46d1c0 -Size (libzrtpcpp/V4.2.0.tar.gz) = 1922243 bytes -SHA1 (patch-CMakeLists.txt) = 4635e03e618872e75c2081e8247b77cff1d0d339 +SHA1 (libzrtpcpp/V4.4.0.tar.gz) = edbd5484f476439dff3692aed85680173bb78d65 +RMD160 (libzrtpcpp/V4.4.0.tar.gz) = 7018a4507aaa67debb52d54a428750e9f9e01eef +Size (libzrtpcpp/V4.4.0.tar.gz) = 1933037 bytes +SHA1 (patch-CMakeLists.txt) = 1c56d64b67a381cda790bbdab3892f3be408231f diff --git a/net/libzrtpcpp/options.mk b/net/libzrtpcpp/options.mk new file mode 100644 index 00000000000..182e1b7c335 --- /dev/null +++ b/net/libzrtpcpp/options.mk @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2015/04/18 03:36:23 rodent Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libzrtpcpp +PKG_SUPPORTED_OPTIONS= sqlite3 +PKG_SUGGESTED_OPTIONS+= # blank + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Msqlite3) +BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7 +.include "../../databases/sqlite3/buildlink3.mk" +CMAKE_ARGS+= -DSQLITE=ON +.else +CMAKE_ARGS+= -DSQLITE=OFF +.endif diff --git a/net/libzrtpcpp/patches/patch-CMakeLists.txt b/net/libzrtpcpp/patches/patch-CMakeLists.txt index 37f9de70397..67f591aab34 100644 --- a/net/libzrtpcpp/patches/patch-CMakeLists.txt +++ b/net/libzrtpcpp/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/10 02:58:52 rodent Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2015/04/18 03:36:23 rodent Exp $ Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS. ---- CMakeLists.txt.orig 2013-11-23 12:30:36.000000000 +0000 +--- CMakeLists.txt.orig 2015-03-29 10:38:44.000000000 +0000 +++ CMakeLists.txt -@@ -80,18 +80,6 @@ include(CheckLibraryExists) +@@ -85,18 +85,6 @@ include(CheckLibraryExists) include(CheckIncludeFiles) include(CheckFunctionExists) @@ -20,6 +20,6 @@ Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS. - set(LIBDIRNAME "lib${LIB_SUFFIX}") -endif() - - check_include_files(stdlib.h HAVE_STDLIB_H) - check_include_files(string.h HAVE_STRING_H) + MESSAGE(STATUS "Configuring GNU ${PROJECT_NAME} ${VERSION} for ${PACKAGE}, commit: ${GIT_COMMIT} ...") + |