Import of pkgsrc-2015Q2

net/ccrtp/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/04/05 13:55:59 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/18 03:11:47 rodent Exp $
 #
 
-DISTNAME=	ccrtp-2.0.8
+DISTNAME=	ccrtp-2.1.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=ccrtp/}
 
@@ -10,16 +10,23 @@ HOMEPAGE=	http://www.gnu.org/software/ccrtp/
 COMMENT=	RTP and RTSP protocol implementation using GNU CommonCpp
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libccrtp1.pc.in
+USE_CMAKE=		yes
+PKGCONFIG_OVERRIDE+=	libccrtp.pc.in
 INFO_FILES=		yes
 
+SUBST_CLASSES+=		info
+SUBST_FILES.info=	doc/cmake_install.cmake
+SUBST_MESSAGE.info=	Fixing infodir path.
+SUBST_SED.info=		-e 's|share/info|info|1'
+SUBST_STAGE.info=	post-configure
+
 .include "options.mk"
 
-.include "../../security/libgcrypt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ucommon+=	ucommon>=6.3.1
 .include "../../devel/ucommon/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

net/ccrtp/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/17 00:54:16 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/04/18 03:11:47 rodent Exp $
 include/ccrtp/CryptoContext.h
 include/ccrtp/CryptoContextCtrl.h
 include/ccrtp/base.h
@@ -15,6 +15,7 @@ include/ccrtp/rtcppkt.h
 include/ccrtp/rtp.h
 include/ccrtp/rtppkt.h
 include/ccrtp/sources.h
-info/ccrtp.info
-lib/libccrtp.la
+lib/libccrtp.so
+lib/libccrtp.so.SOVERSION
 lib/pkgconfig/libccrtp.pc
+info/ccrtp.info

net/ccrtp/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:18:19 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2015/04/18 03:11:47 rodent Exp $
 
 BUILDLINK_TREE+=	ccrtp
 
@@ -9,7 +9,17 @@ BUILDLINK_API_DEPENDS.ccrtp+=	ccrtp>=2.0.0
 BUILDLINK_ABI_DEPENDS.ccrtp?=	ccrtp>=2.0.6nb2
 BUILDLINK_PKGSRCDIR.ccrtp?=	../../net/ccrtp
 
+pkgbase := ccrtp
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.ccrtp:Mlibgcrypt)
 .include "../../security/libgcrypt/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ccrtp:Mopenssl)
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .include "../../devel/ucommon/buildlink3.mk"
 .endif # CCRTP_BUILDLINK3_MK
 

net/ccrtp/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/04/05 13:55:59 rodent Exp $
+$NetBSD: distinfo,v 1.5 2015/04/18 03:11:47 rodent Exp $
 
-SHA1 (ccrtp-2.0.8.tar.gz) = e26eb4a97871fd9844e5d12fe07e06bf5fd5d144
-RMD160 (ccrtp-2.0.8.tar.gz) = 3ee14ec8198c20c436f581b60801cde182457b3e
-Size (ccrtp-2.0.8.tar.gz) = 751694 bytes
-SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 150315c24f4c578b8cf045b9050e188d54e0fc8a
+SHA1 (ccrtp-2.1.2.tar.gz) = ecad8c17c5ed61e1c9fb1b785592958c678b7c4b
+RMD160 (ccrtp-2.1.2.tar.gz) = b3b2cb2f6822e08422b19fcd1528f976ca10ad66
+Size (ccrtp-2.1.2.tar.gz) = 764869 bytes
+SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 407f3a7f6536028a1b727a826183133dfe3ce4d6

net/ccrtp/options.mk

@@ -1,11 +1,17 @@
-# $NetBSD: options.mk,v 1.1 2013/04/17 00:54:16 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2015/04/18 03:11:47 rodent Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ccrtp
-PKG_SUPPORTED_OPTIONS=	debug
-PKG_SUGGESTED_OPTIONS+=	# blank
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ccrtp
+PKG_OPTIONS_GROUP.tls=		libgcrypt openssl
+PKG_OPTIONS_REQUIRED_GROUPS=	tls
+PKG_SUGGESTED_OPTIONS+=		openssl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug
+.if !empty(PKG_OPTIONS:Mlibgcrypt)
+.include "../../security/libgcrypt/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.8
+.include "../../security/openssl/buildlink3.mk"
 .endif

net/ccrtp/patches/patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp

@@ -1,4 +1,6 @@
-$NetBSD: patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp,v 1.1 2014/02/21 20:30:27 joerg Exp $
+$NetBSD: patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp,v 1.2 2015/04/18 03:11:47 rodent Exp $
+
+Fix build with newer libgcrypt.
 
 --- src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp.orig	2012-06-18 15:19:04.000000000 +0000
 +++ src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp