CVS commit: src/crypto/external/bsd/libsaslc/lib

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Aug 25 15:30:54 UTC 2011

Modified Files:
src/crypto/external/bsd/libsaslc/lib: Makefile

Log Message:
msg.c uses non-literal format strings


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/libsaslc/lib/Makefile

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

Modified files:

Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.4 src/crypto/external/bsd/libsaslc/lib/Makefile:1.5
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.4	Fri Apr 15 18:05:42 2011
+++ src/crypto/external/bsd/libsaslc/lib/Makefile	Thu Aug 25 15:30:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/04/15 18:05:42 elric Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/25 15:30:54 joerg Exp $
 
 .include bsd.own.mk
 
@@ -26,6 +26,8 @@
 SRCS+= saslc.c
 SRCS+= xsess.c
 
+COPTS.msg.c = -Wno-format-nonliteral
+
 CPPFLAGS+=-I${EXTDIST}/include
 MAN=libsaslc.3
 WARNS?=4

CVS commit: src/crypto/external/bsd/libsaslc/lib

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Feb 12 22:23:11 UTC 2011

Modified Files:
src/crypto/external/bsd/libsaslc/lib: Makefile

Log Message:
Don't use DPADD/LDADD for libraries.  Use LIBDPLIBS instead.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/lib/Makefile

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

Modified files:

Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.2 src/crypto/external/bsd/libsaslc/lib/Makefile:1.3
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.2	Fri Feb 11 23:44:44 2011
+++ src/crypto/external/bsd/libsaslc/lib/Makefile	Sat Feb 12 22:23:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/11 23:44:44 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/12 22:23:11 matt Exp $
 
 .include bsd.own.mk
 
@@ -16,7 +16,9 @@
 SRCS+= mech_crammd5.c
 SRCS+= mech_digestmd5.c
 SRCS+= mech_external.c
+.if (${MKKERBEROS} != no)
 SRCS+= mech_gssapi.c
+.endif
 SRCS+= mech_login.c
 SRCS+= mech_plain.c
 SRCS+= msg.c
@@ -35,7 +37,9 @@
 INCS+= saslc.h
 INCSDIR=/usr/include
 
-LDADD+=-lssl -lgssapi
-DPADD+=${LIBSSL}
+LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+.if (${MKKERBEROS} != no)
+LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/lib/libgssapi
+.endif
 
 .include bsd.lib.mk