Fri Apr 21 13:22:00 2017 UTC ()
Honour existing LDFLAGS.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/security/zebedee/distinfo
diff -r1.10 -r1.11 pkgsrc/security/zebedee/patches/patch-aa
cvs diff -r1.13 -r1.14 pkgsrc/security/zebedee/distinfo (expand / switch to unified diff)

--- pkgsrc/security/zebedee/distinfo 2016/04/01 17:11:36 1.13
+++ pkgsrc/security/zebedee/distinfo 2017/04/21 13:22:00 1.14
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.13 2016/04/01 17:11:36 jperkin Exp $ 1$NetBSD: distinfo,v 1.14 2017/04/21 13:22:00 jperkin Exp $
2 2
3SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 3SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986
4RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 4RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30
5SHA512 (zebedee-2.5.3.tar.gz) = 05ce8f7bd57fbb07b746c0754f0cb34b7d76270b9d5430fed7108f2025bff5dae87961d4645415700da4438a1fbfdcd538c84763fcbc77593767466d63f3e5c6 5SHA512 (zebedee-2.5.3.tar.gz) = 05ce8f7bd57fbb07b746c0754f0cb34b7d76270b9d5430fed7108f2025bff5dae87961d4645415700da4438a1fbfdcd538c84763fcbc77593767466d63f3e5c6
6Size (zebedee-2.5.3.tar.gz) = 176088 bytes 6Size (zebedee-2.5.3.tar.gz) = 176088 bytes
7SHA1 (patch-aa) = 33386527015bd1dcba0729a33ee241199aa69b76 7SHA1 (patch-aa) = babec54a8e81e4d429077d6556150aea5f6de6b8
8SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b 8SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b
9SHA1 (patch-doc__jp_ftpgw.tcl.pod) = d5dd66ba31df3c61bba2c0b983ca1f1106bd9f2a 9SHA1 (patch-doc__jp_ftpgw.tcl.pod) = d5dd66ba31df3c61bba2c0b983ca1f1106bd9f2a
10SHA1 (patch-doc__jp_zebedee.pod) = d78e9f2ebb13d8ad7256cde8921f3bab3296e9db 10SHA1 (patch-doc__jp_zebedee.pod) = d78e9f2ebb13d8ad7256cde8921f3bab3296e9db
cvs diff -r1.10 -r1.11 pkgsrc/security/zebedee/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/zebedee/patches/patch-aa 2016/04/01 17:11:36 1.10
+++ pkgsrc/security/zebedee/patches/patch-aa 2017/04/21 13:22:00 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.10 2016/04/01 17:11:36 jperkin Exp $ 1$NetBSD: patch-aa,v 1.11 2017/04/21 13:22:00 jperkin Exp $
2 2
3--- Makefile.orig 2005-09-06 05:59:53.000000000 +0000 3--- Makefile.orig 2005-09-06 05:59:53.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -20,7 +20,9 @@ CC_win32 = gcc -mno-cygwin 5@@ -20,7 +20,9 @@ CC_win32 = gcc -mno-cygwin
6 CC_linux = gcc -pthread 6 CC_linux = gcc -pthread
7 CC_linux64 = $(CC_linux) -m64 7 CC_linux64 = $(CC_linux) -m64
8 CC_solaris = gcc 8 CC_solaris = gcc
9+CC_dragonfly = cc 9+CC_dragonfly = cc
10 CC_freebsd = gcc -pthread 10 CC_freebsd = gcc -pthread
11+CC_netbsd = cc 11+CC_netbsd = cc
12 CC_tru64 = cc 12 CC_tru64 = cc
13 CC_irix = cc -n32 -woff 1110 13 CC_irix = cc -n32 -woff 1110
14 CC_hpux = cc -Ae +DAportable 14 CC_hpux = cc -Ae +DAportable
@@ -106,27 +106,27 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 17:1 @@ -106,27 +106,27 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 17:1
106+OSLIBS_hpux = -lnsl 106+OSLIBS_hpux = -lnsl
107+OSLIBS_macosx = 107+OSLIBS_macosx =
108 OSLIBS_bsdi = 108 OSLIBS_bsdi =
109 OSLIBS = $(OSLIBS_$(OS)) 109 OSLIBS = $(OSLIBS_$(OS))
110  110
111@@ -186,9 +193,10 @@ SERVICEOBJ = $(SERVICEOBJ_$(OS)) 111@@ -186,9 +193,10 @@ SERVICEOBJ = $(SERVICEOBJ_$(OS))
112 #### You REALLY shouldn't have to modify anything beyond here ... 112 #### You REALLY shouldn't have to modify anything beyond here ...
113 #### 113 ####
114  114
115-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) 115-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
116+CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) 116+CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
117  117
118-LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) 118-LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
119+LDFLAGS= $(PTHREAD_LDFLAGS) 119+LDFLAGS += $(PTHREAD_LDFLAGS)
120+LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) $(PTHREAD_LIBS) 120+LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) $(PTHREAD_LIBS)
121  121
122 OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ) 122 OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ)
123  123
124@@ -196,17 +204,17 @@ ZBDFILES = server.zbd vncviewer.zbd vncs 124@@ -196,17 +204,17 @@ ZBDFILES = server.zbd vncviewer.zbd vncs
125 client1.key client2.key clients.id 125 client1.key client2.key clients.id
126  126
127 TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt NOTICE.txt \ 127 TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt NOTICE.txt \
128- zebedee.html ftpgw.tcl.html zebedee.ja_JP.html zebedee.iss 128- zebedee.html ftpgw.tcl.html zebedee.ja_JP.html zebedee.iss
129+ zebedee.html ftpgw.tcl.html zebedee.ja_JP.html 129+ zebedee.html ftpgw.tcl.html zebedee.ja_JP.html
130  130
131 EXTRAFILES = $(ZBDFILES) $(TXTFILES) 131 EXTRAFILES = $(ZBDFILES) $(TXTFILES)
132  132