CVS commit: pkgsrc/security/argon2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 10 09:36:54 UTC 2018

Modified Files:
        pkgsrc/security/argon2: distinfo
        pkgsrc/security/argon2/patches: patch-Makefile

Log Message:
Better -install_name on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/argon2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/argon2/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/security/argon2/distinfo
diff -u pkgsrc/security/argon2/distinfo:1.3 pkgsrc/security/argon2/distinfo:1.4
--- pkgsrc/security/argon2/distinfo:1.3 Sat Dec 30 11:34:12 2017
+++ pkgsrc/security/argon2/distinfo     Wed Jan 10 09:36:54 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/12/30 11:34:12 adam Exp $
+$NetBSD: distinfo,v 1.4 2018/01/10 09:36:54 adam Exp $
 
 SHA1 (phc-winner-argon2-20171227.tar.gz) = c398df55c8fffe70c9a952dd3f696115437234d8
 RMD160 (phc-winner-argon2-20171227.tar.gz) = e4cf2482f11724f580da0051a8c982f9237d3451
 SHA512 (phc-winner-argon2-20171227.tar.gz) = 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 Size (phc-winner-argon2-20171227.tar.gz) = 1503745 bytes
-SHA1 (patch-Makefile) = 63ab5d95fa44966d9713bbc81cdabf8e3fa0b855
+SHA1 (patch-Makefile) = d075b01a8452d7d7beac22b72521662ad8527b10

Index: pkgsrc/security/argon2/patches/patch-Makefile
diff -u pkgsrc/security/argon2/patches/patch-Makefile:1.3 pkgsrc/security/argon2/patches/patch-Makefile:1.4
--- pkgsrc/security/argon2/patches/patch-Makefile:1.3   Sat Dec 30 11:34:12 2017
+++ pkgsrc/security/argon2/patches/patch-Makefile       Wed Jan 10 09:36:54 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.3 2017/12/30 11:34:12 adam Exp $
+$NetBSD: patch-Makefile,v 1.4 2018/01/10 09:36:54 adam Exp $
 
 Remove -O3 -g compiler flags.
 Disable -march=native since it causes problems on NetBSD.
@@ -32,12 +32,14 @@ Use the same shared library name across 
        LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
        SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT)
        LINKED_LIB_EXT := so
-@@ -69,7 +68,7 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
+@@ -69,8 +68,8 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_
        LIB_CFLAGS := -shared -fPIC
  endif
  ifeq ($(KERNEL_NAME), Darwin)
 -      LIB_EXT := $(ABI_VERSION).dylib
+-      LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
 +      LIB_EXT := dylib
-       LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
++      LIB_CFLAGS := -dynamiclib -install_name ${DESTDIR}${PREFIX}/lib/lib$(LIB_NAME).$(LIB_EXT)
        LINKED_LIB_EXT := dylib
  endif
+ ifeq ($(findstring CYGWIN, $(KERNEL_NAME)), CYGWIN)