[pkgsrc/pkgsrc-2017Q1]: pkgsrc/security/zebedee Pullup ticket #5343 - request...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a838a8575a1
branches:  pkgsrc-2017Q1
changeset: 360329:8a838a8575a1
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 08:52:47 2017 +0000

description:
Pullup ticket #5343 - requested by sevan
security/zebedee: build fix

Revisions pulled up:
- security/zebedee/distinfo                                     1.14-1.15
- security/zebedee/patches/patch-aa                             1.11-1.12

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr 21 13:22:00 UTC 2017

   Modified Files:
           pkgsrc/security/zebedee: distinfo
           pkgsrc/security/zebedee/patches: patch-aa

   Log Message:
   Honour existing LDFLAGS.

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr 21 13:33:32 UTC 2017

   Modified Files:
           pkgsrc/security/zebedee: distinfo
           pkgsrc/security/zebedee/patches: patch-aa

   Log Message:
   Use BSD_INSTALL.

diffstat:

 security/zebedee/distinfo         |   4 ++--
 security/zebedee/patches/patch-aa |  13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r ffa49e5ae72b -r 8a838a8575a1 security/zebedee/distinfo
--- a/security/zebedee/distinfo Mon May 01 08:51:40 2017 +0000
+++ b/security/zebedee/distinfo Mon May 01 08:52:47 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2016/04/01 17:11:36 jperkin Exp $
+$NetBSD: distinfo,v 1.13.10.1 2017/05/01 08:52:47 bsiegert Exp $
 
 SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986
 RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30
 SHA512 (zebedee-2.5.3.tar.gz) = 05ce8f7bd57fbb07b746c0754f0cb34b7d76270b9d5430fed7108f2025bff5dae87961d4645415700da4438a1fbfdcd538c84763fcbc77593767466d63f3e5c6
 Size (zebedee-2.5.3.tar.gz) = 176088 bytes
-SHA1 (patch-aa) = 33386527015bd1dcba0729a33ee241199aa69b76
+SHA1 (patch-aa) = 0f94fa69d77e13038f96875fede97a6984cdc9c2
 SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b
 SHA1 (patch-doc__jp_ftpgw.tcl.pod) = d5dd66ba31df3c61bba2c0b983ca1f1106bd9f2a
 SHA1 (patch-doc__jp_zebedee.pod) = d78e9f2ebb13d8ad7256cde8921f3bab3296e9db
diff -r ffa49e5ae72b -r 8a838a8575a1 security/zebedee/patches/patch-aa
--- a/security/zebedee/patches/patch-aa Mon May 01 08:51:40 2017 +0000
+++ b/security/zebedee/patches/patch-aa Mon May 01 08:52:47 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2016/04/01 17:11:36 jperkin Exp $
+$NetBSD: patch-aa,v 1.10.10.1 2017/05/01 08:52:47 bsiegert Exp $
 
 --- Makefile.orig      2005-09-06 05:59:53.000000000 +0000
 +++ Makefile
@@ -61,7 +61,7 @@
  
  # This is a BSD-style install
  
-@@ -87,6 +89,7 @@ INSTALL_linux = install -c
+@@ -87,12 +89,13 @@ INSTALL_linux = install -c
  INSTALL_linux64 = $(INSTALL_linux)
  INSTALL_solaris = /usr/ucb/install -c
  INSTALL_freebsd = install -c
@@ -69,6 +69,13 @@
  INSTALL_tru64 = installbsd -c
  INSTALL_irix = install -c
  INSTALL_hpux = install -c
+ INSTALL_macosx = install
+ INSTALL_bsdi = install -c
+-INSTALL = $(INSTALL_$(OS))
++INSTALL = $(BSD_INSTALL)
+ 
+ # InnoSetup compiler for Win32 (see http://www.jordanr.dhs.org/)
+ 
 @@ -148,12 +151,14 @@ DEFINES_linux = -DHAVE_PTHREADS
  DEFINES_linux64 = $(DEFINES_linux)
  DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS
@@ -116,7 +123,7 @@
 +CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
  
 -LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
-+LDFLAGS=  $(PTHREAD_LDFLAGS)
++LDFLAGS +=  $(PTHREAD_LDFLAGS)
 +LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) $(PTHREAD_LIBS)
  
  OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ)