Import of pkgsrc-2016Q3

security/libssh/Makefile

@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.19 2014/02/12 23:18:33 tron Exp $
+# $NetBSD: Makefile,v 1.22 2016/03/05 11:27:54 jperkin Exp $
 #
 # history: upstream renamed 0.11 to 0.1.1;
 # we have to use the old-style convention so that version compares work.
 #
-VER=			0.5.4
+VER=			0.7.3
 DISTNAME=		libssh-${VER}
-PKGNAME=		libssh-0.54
-PKGREVISION=		3
+PKGNAME=		libssh-0.73
+PKGREVISION=		1
 CATEGORIES=		security
-MASTER_SITES=		https://red.libssh.org/attachments/download/41/
+MASTER_SITES=		https://red.libssh.org/attachments/download/195/
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		is@NetBSD.org
 HOMEPAGE=		http://www.libssh.org/
-COMMENT=		SSHv2+v1 protocol library; libssh.org version ${VER}
+COMMENT=		SSHv2+v1 protocol library
 LICENSE=		2-clause-bsd
 
 DIST_SUBDIR=		security

security/libssh/PLIST

@@ -1,16 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2013/02/01 13:33:49 is Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/02/23 15:49:42 wiz Exp $
+include/libssh/callbacks.h
+include/libssh/legacy.h
+include/libssh/libssh.h
+include/libssh/libsshpp.hpp
+include/libssh/server.h
+include/libssh/sftp.h
+include/libssh/ssh2.h
+lib/cmake/libssh/libssh-config-version.cmake
+lib/cmake/libssh/libssh-config.cmake
+lib/libssh.so
+lib/libssh.so.4
+lib/libssh.so.4.4.1
+lib/libssh_threads.so
+lib/libssh_threads.so.4
+lib/libssh_threads.so.4.4.1
 lib/pkgconfig/libssh.pc
 lib/pkgconfig/libssh_threads.pc
-include/libssh/callbacks.h
-include/libssh/libssh.h
-include/libssh/ssh2.h
-include/libssh/legacy.h
-include/libssh/sftp.h
-include/libssh/server.h
-@comment, XXX PLIST lib handling seems to be broke
-lib/libssh.so.4.2.4
-lib/libssh.so.4
-lib/libssh.so
-lib/libssh_threads.so.4.2.4
-lib/libssh_threads.so.4
-lib/libssh_threads.so

security/libssh/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 23:18:33 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2016/03/05 11:27:54 jperkin Exp $
 
 BUILDLINK_TREE+=	libssh
 
@@ -6,18 +6,17 @@ BUILDLINK_TREE+=	libssh
 LIBSSH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libssh+=	libssh>=0.54
-BUILDLINK_ABI_DEPENDS.libssh+=	libssh>=0.54nb3
+BUILDLINK_ABI_DEPENDS.libssh+=	libssh>=0.73nb1
 BUILDLINK_PKGSRCDIR.libssh?=	../../security/libssh
 
 pkgbase := libssh
 .include "../../mk/pkg-build-options.mk"
 
-PKG_OPTIONS?=		# empty
-.if !empty(PKG_OPTIONS:Mzlib)
+.if !empty(PKG_BUILD_OPTIONS.libssh:Mzlib)
 .include "../../devel/zlib/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mopenssl)
+.if !empty(PKG_BUILD_OPTIONS.libssh:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
 .endif
 .endif # LIBSSH_BUILDLINK3_MK

security/libssh/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2013/02/01 13:33:49 is Exp $
+$NetBSD: distinfo,v 1.11 2016/02/23 15:49:42 wiz Exp $
 
-SHA1 (security/libssh-0.5.4.tar.gz) = 4a372378db8fffaf28d5c79d80b2235843aa587c
-RMD160 (security/libssh-0.5.4.tar.gz) = a134cb99f57c544cd31d43bf28506b42b27131e2
-Size (security/libssh-0.5.4.tar.gz) = 321265 bytes
-SHA1 (patch-aa) = 76de63b15c0ef380cb2bc4ab5b96bf437a79faef
+SHA1 (security/libssh-0.7.3.tar.xz) = 9de2a8fde51aa7b7855008fafd5bf47ebb01289f
+RMD160 (security/libssh-0.7.3.tar.xz) = af73d82dad552233791aea8ac1198232e0fb0f68
+SHA512 (security/libssh-0.7.3.tar.xz) = 6797ea9492c9d07e0169163e6559a7880dd368ee763eff297b3cbddda5e892703cf32506f9513e7d9b5135984e1e888c4893b342df07da1b7ee30968c9185869
+Size (security/libssh-0.7.3.tar.xz) = 350464 bytes
+SHA1 (patch-aa) = 2f9a7c8a629188f40f3c94d4304b1e44720e45ae

security/libssh/options.mk

@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2013/02/01 16:47:51 is Exp $
+# $NetBSD: options.mk,v 1.2 2015/11/18 21:00:51 christos Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.${PKGNAME}
 PKG_OPTIONS_REQUIRED_GROUPS=	crypto
-PKG_OPTIONS_GROUP.crypto=	openssl gcrypt
+PKG_OPTIONS_GROUP.crypto=	openssl libgcrypt
 #PKG_SUPPORTED_OPTIONS=		compression
 PKG_SUGGESTED_OPTIONS=		openssl # XXX zlib
 
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+=		--with-openssl=${SSLBASE:Q}
 .include "../../security/openssl/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mgcrypt)
-BUILDLINK_API_DEPENDS.gcrypt+=	gcrypt>=1.4
+.if !empty(PKG_OPTIONS:Mlibgcrypt)
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.4
 CONFIGURE_ARGS+=		--with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt:Q}
 CONFIGURE_ARGS+=		--with-openssl=no
 .include "../../security/libgcrypt/buildlink3.mk"

security/libssh/patches/patch-aa

@@ -1,5 +1,9 @@
---- CMakeLists.txt.orig	2013-01-30 11:46:25.000000000 +0000
-+++ CMakeLists.txt	2013-01-30 11:45:52.000000000 +0000
+$NetBSD: patch-aa,v 1.6 2015/11/18 21:00:51 christos Exp $
+
+Disable out of source build test
+
+--- CMakeLists.txt.orig	2015-09-16 02:44:35.000000000 -0400
++++ CMakeLists.txt	2015-11-17 10:44:55.000000000 -0500
 @@ -36,8 +36,8 @@
  include(CPackConfig.cmake)
  
@@ -9,5 +13,5 @@
 +#include(MacroEnsureOutOfSourceBuild)
 +#macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
  
- # add macros
- include(MacroAddPlugin)
+ # search for libraries
+ if (WITH_ZLIB)