CVS commit: pkgsrc/security/p11-kit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Sep 27 18:06:36 UTC 2018

Modified Files:
        pkgsrc/security/p11-kit: distinfo
        pkgsrc/security/p11-kit/patches: patch-Makefile.in

Log Message:
p11-kit: Avoid non-portable use of readlink(1) in Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/p11-kit/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/p11-kit/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/p11-kit/distinfo
diff -u pkgsrc/security/p11-kit/distinfo:1.9 pkgsrc/security/p11-kit/distinfo:1.10
--- pkgsrc/security/p11-kit/distinfo:1.9        Wed Sep  5 08:34:10 2018
+++ pkgsrc/security/p11-kit/distinfo    Thu Sep 27 18:06:36 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/09/05 08:34:10 prlw1 Exp $
+$NetBSD: distinfo,v 1.10 2018/09/27 18:06:36 tnn Exp $
 
 SHA1 (p11-kit-0.23.14.tar.gz) = 30cab1d4b716022e6918f9a49976609c425f9cfc
 RMD160 (p11-kit-0.23.14.tar.gz) = 795ea86b15fbcb6865cf65c146c6f54b5a27d1cd
 SHA512 (p11-kit-0.23.14.tar.gz) = fc7e7e0745d7f8e5d783a1f38bad9bbe65b56d54897b6ba2c3118a0d912451c2d48dd113a875e7f7bfcff8fbd6b4905472fcd120630661c12029a16d2b13add4
 Size (p11-kit-0.23.14.tar.gz) = 1266595 bytes
-SHA1 (patch-Makefile.in) = c7f26205c09537593a49dea33c05e1fd29e9dbc3
+SHA1 (patch-Makefile.in) = 1393b1c8892e90362575d5d325a583921f629b3c
 SHA1 (patch-common_compat.c) = b45c24309f2c4bd6389162a9c02c6ac132230e40

Index: pkgsrc/security/p11-kit/patches/patch-Makefile.in
diff -u pkgsrc/security/p11-kit/patches/patch-Makefile.in:1.3 pkgsrc/security/p11-kit/patches/patch-Makefile.in:1.4
--- pkgsrc/security/p11-kit/patches/patch-Makefile.in:1.3       Fri Jul  6 15:33:39 2018
+++ pkgsrc/security/p11-kit/patches/patch-Makefile.in   Thu Sep 27 18:06:36 2018
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.3 2018/07/06 15:33:39 prlw1 Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2018/09/27 18:06:36 tnn Exp $
 
 Install examples into pkgsrc example directory.
+Avoid non-portable use of readlink(1) in Makefile.
 
---- Makefile.in.orig   2018-05-30 14:18:17.000000000 +0000
+--- Makefile.in.orig   2018-08-28 14:02:02.000000000 +0000
 +++ Makefile.in
-@@ -1691,7 +1691,7 @@ libp11_kit_pkcs11_gnu_la_CFLAGS = -DCRYP
+@@ -1730,7 +1730,7 @@ libp11_kit_pkcs11_gnu_la_CFLAGS = -DCRYP
  @OS_WIN32_FALSE@p11_kit_client_la_LIBADD = $(libp11_kit_la_LIBADD)
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = p11-kit/p11-kit-1.pc
@@ -13,3 +14,12 @@ Install examples into pkgsrc example dir
  example_DATA = p11-kit/pkcs11.conf.example
  p11_kit_p11_kit_SOURCES = \
        p11-kit/lists.c \
+@@ -5494,7 +5494,7 @@ p11-kit/pin.gnu.c: p11-kit/pin.h
+ @OS_WIN32_FALSE@install-exec-hook:
+ @OS_WIN32_FALSE@      for i in so dylib; do \
+ @OS_WIN32_FALSE@              test -f $(DESTDIR)$(libdir)/libp11-kit.$$i && \
+-@OS_WIN32_FALSE@                      $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.$$i` $(DESTDIR)$(libdir)/p11-kit-proxy.$$i || true; \
++@OS_WIN32_FALSE@                      $(LN_S) -f `ls -ld $(DESTDIR)$(libdir)/libp11-kit.$$i | sed 's@.* -> @@'` $(DESTDIR)$(libdir)/p11-kit-proxy.$$i || true; \
+ @OS_WIN32_FALSE@      done
+ @OS_WIN32_FALSE@      $(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
+