Add missing dependency: devel/argp This fixes build on NetBSD-7.99.39 with pkgsrc-current from 2016-10-09. Bump PKGREVISION to 2.diff -r1.22 -r1.23 pkgsrc/security/libssh/Makefile
(kamil)
@@ -1,30 +1,31 @@ | @@ -1,30 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.22 2016/03/05 11:27:54 jperkin Exp $ | 1 | # $NetBSD: Makefile,v 1.23 2016/10/09 22:02:07 kamil Exp $ | |
2 | # | 2 | # | |
3 | # history: upstream renamed 0.11 to 0.1.1; | 3 | # history: upstream renamed 0.11 to 0.1.1; | |
4 | # we have to use the old-style convention so that version compares work. | 4 | # we have to use the old-style convention so that version compares work. | |
5 | # | 5 | # | |
6 | VER= 0.7.3 | 6 | VER= 0.7.3 | |
7 | DISTNAME= libssh-${VER} | 7 | DISTNAME= libssh-${VER} | |
8 | PKGNAME= libssh-0.73 | 8 | PKGNAME= libssh-0.73 | |
9 | PKGREVISION= 1 | 9 | PKGREVISION= 2 | |
10 | CATEGORIES= security | 10 | CATEGORIES= security | |
11 | MASTER_SITES= https://red.libssh.org/attachments/download/195/ | 11 | MASTER_SITES= https://red.libssh.org/attachments/download/195/ | |
12 | EXTRACT_SUFX= .tar.xz | 12 | EXTRACT_SUFX= .tar.xz | |
13 | 13 | |||
14 | MAINTAINER= is@NetBSD.org | 14 | MAINTAINER= is@NetBSD.org | |
15 | HOMEPAGE= http://www.libssh.org/ | 15 | HOMEPAGE= http://www.libssh.org/ | |
16 | COMMENT= SSHv2+v1 protocol library | 16 | COMMENT= SSHv2+v1 protocol library | |
17 | LICENSE= 2-clause-bsd | 17 | LICENSE= 2-clause-bsd | |
18 | 18 | |||
19 | DIST_SUBDIR= security | 19 | DIST_SUBDIR= security | |
20 | 20 | |||
21 | USE_CMAKE= yes | 21 | USE_CMAKE= yes | |
22 | USE_LANGUAGES= c c++ | 22 | USE_LANGUAGES= c c++ | |
23 | 23 | |||
24 | PKGCONFIG_OVERRIDE+= libssh.pc.in | 24 | PKGCONFIG_OVERRIDE+= libssh.pc.in | |
25 | TEST_TARGET= check | 25 | TEST_TARGET= check | |
26 | 26 | |||
27 | .include "options.mk" | 27 | .include "options.mk" | |
28 | 28 | |||
29 | .include "../../devel/argp/buildlink3.mk" | |||
29 | .include "../../devel/zlib/buildlink3.mk" | 30 | .include "../../devel/zlib/buildlink3.mk" | |
30 | .include "../../mk/bsd.pkg.mk" | 31 | .include "../../mk/bsd.pkg.mk" |
@@ -1,24 +1,26 @@ | @@ -1,24 +1,26 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.16 2016/03/05 11:27:54 jperkin Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.17 2016/10/09 22:02:07 kamil Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= libssh | 3 | BUILDLINK_TREE+= libssh | |
4 | 4 | |||
5 | .if !defined(LIBSSH_BUILDLINK3_MK) | 5 | .if !defined(LIBSSH_BUILDLINK3_MK) | |
6 | LIBSSH_BUILDLINK3_MK:= | 6 | LIBSSH_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.libssh+= libssh>=0.54 | 8 | BUILDLINK_API_DEPENDS.libssh+= libssh>=0.54 | |
9 | BUILDLINK_ABI_DEPENDS.libssh+= libssh>=0.73nb1 | 9 | BUILDLINK_ABI_DEPENDS.libssh+= libssh>=0.73nb1 | |
10 | BUILDLINK_PKGSRCDIR.libssh?= ../../security/libssh | 10 | BUILDLINK_PKGSRCDIR.libssh?= ../../security/libssh | |
11 | 11 | |||
12 | pkgbase := libssh | 12 | pkgbase := libssh | |
13 | .include "../../mk/pkg-build-options.mk" | 13 | .include "../../mk/pkg-build-options.mk" | |
14 | 14 | |||
15 | .if !empty(PKG_BUILD_OPTIONS.libssh:Mzlib) | 15 | .if !empty(PKG_BUILD_OPTIONS.libssh:Mzlib) | |
16 | .include "../../devel/zlib/buildlink3.mk" | 16 | .include "../../devel/zlib/buildlink3.mk" | |
17 | .endif | 17 | .endif | |
18 | 18 | |||
19 | .if !empty(PKG_BUILD_OPTIONS.libssh:Mopenssl) | 19 | .if !empty(PKG_BUILD_OPTIONS.libssh:Mopenssl) | |
20 | .include "../../security/openssl/buildlink3.mk" | 20 | .include "../../security/openssl/buildlink3.mk" | |
21 | .endif | 21 | .endif | |
22 | ||||
23 | .include "../../devel/argp/buildlink3.mk" | |||
22 | .endif # LIBSSH_BUILDLINK3_MK | 24 | .endif # LIBSSH_BUILDLINK3_MK | |
23 | 25 | |||
24 | BUILDLINK_TREE+= -libssh | 26 | BUILDLINK_TREE+= -libssh |