CVS commit: pkgsrc/security/libssh2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 12 17:28:10 UTC 2020

Modified Files:
        pkgsrc/security/libssh2: Makefile distinfo
Added Files:
        pkgsrc/security/libssh2/patches: patch-Makefile.in

Log Message:
libssh2: fix unportable test(1) operator in Makefile.in

Skip check for Makefile.am.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/libssh2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/libssh2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/libssh2/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libssh2/Makefile
diff -u pkgsrc/security/libssh2/Makefile:1.20 pkgsrc/security/libssh2/Makefile:1.21
--- pkgsrc/security/libssh2/Makefile:1.20       Sat Jan 18 21:48:23 2020
+++ pkgsrc/security/libssh2/Makefile    Thu Mar 12 17:28:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 21:48:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2020/03/12 17:28:10 wiz Exp $
 
 DISTNAME=      libssh2-1.9.0
 PKGREVISION=   1
@@ -21,6 +21,9 @@ CONFIGURE_ARGS+=      --disable-examples-buil
 PKGCONFIG_OVERRIDE+=   libssh2.pc.in
 TEST_TARGET=           check
 
+# patched in Makefile.in
+CHECK_PORTABILITY_SKIP+=       Makefile.am
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/libssh2/distinfo
diff -u pkgsrc/security/libssh2/distinfo:1.12 pkgsrc/security/libssh2/distinfo:1.13
--- pkgsrc/security/libssh2/distinfo:1.12       Tue Jul  9 10:42:59 2019
+++ pkgsrc/security/libssh2/distinfo    Thu Mar 12 17:28:10 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2019/07/09 10:42:59 nia Exp $
+$NetBSD: distinfo,v 1.13 2020/03/12 17:28:10 wiz Exp $
 
 SHA1 (libssh2-1.9.0.tar.gz) = 21e98282b103307a16792e5e2d4c99beaf0b3b9c
 RMD160 (libssh2-1.9.0.tar.gz) = eb3553a9b2c05d5b6a24159db8a1478f9aea3877
 SHA512 (libssh2-1.9.0.tar.gz) = 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
 Size (libssh2-1.9.0.tar.gz) = 888551 bytes
+SHA1 (patch-Makefile.in) = f3d511ca98a0979181541bbd3c0cdc72bf71b7ef

Added files:

Index: pkgsrc/security/libssh2/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/security/libssh2/patches/patch-Makefile.in:1.1
--- /dev/null   Thu Mar 12 17:28:10 2020
+++ pkgsrc/security/libssh2/patches/patch-Makefile.in   Thu Mar 12 17:28:10 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/03/12 17:28:10 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- Makefile.in.orig   2019-06-20 06:19:26.000000000 +0000
++++ Makefile.in
+@@ -1028,7 +1028,7 @@ $(DSP): win32/msvcproj.head win32/msvcpr
+       for file in $$sorted_hdrs; do \
+               echo "# Begin Source File"; \
+               echo ""; \
+-              if [ "$$file" == "libssh2_config.h" ]; \
++              if [ "$$file" = "libssh2_config.h" ]; \
+               then \
+                       echo "SOURCE=.\\"$$file; \
+               else \