From 272d89adac1ff17d318139484b9aa0dc4d2f55ef Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 16 Apr 2017 10:16:35 +0000
Subject: [PATCH] Different compilers and versions of compilers have different
 warnings. Remove -Werror to give code a greater chance of building.

ok deraadt@ florian@
---
 sbin/ldattach/Makefile       | 4 ++--
 usr.bin/htpasswd/Makefile    | 4 ++--
 usr.bin/pctr/Makefile        | 4 ++--
 usr.sbin/identd/Makefile     | 4 ++--
 usr.sbin/mksuncd/Makefile    | 4 ++--
 usr.sbin/tftp-proxy/Makefile | 4 ++--
 usr.sbin/tftpd/Makefile      | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sbin/ldattach/Makefile b/sbin/ldattach/Makefile
index 5a2011e43c4..18e6f0118d4 100644
--- a/sbin/ldattach/Makefile
+++ b/sbin/ldattach/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 2012/09/12 09:19:54 haesbaert Exp $
+#	$OpenBSD: Makefile,v 1.4 2017/04/16 10:16:35 jsg Exp $
 
 PROG=		ldattach
 SRCS=		ldattach.c atomicio.c
 MAN=		ldattach.8
 
-CFLAGS+=	-Wall -Werror
+CFLAGS+=	-Wall
 CDIAGFLAGS=
 LDADD+=		-lutil
 
diff --git a/usr.bin/htpasswd/Makefile b/usr.bin/htpasswd/Makefile
index a73b356a0c4..e2a3b24154c 100644
--- a/usr.bin/htpasswd/Makefile
+++ b/usr.bin/htpasswd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.1 2014/03/17 12:49:13 florian Exp $
+#	$OpenBSD: Makefile,v 1.2 2017/04/16 10:16:35 jsg Exp $
 PROG=		htpasswd
 SRCS=		htpasswd.c
 MAN=		htpasswd.1
 
-CFLAGS+=	-g -W -Wall -Werror
+CFLAGS+=	-g -W -Wall
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 
diff --git a/usr.bin/pctr/Makefile b/usr.bin/pctr/Makefile
index d5c8aa14ecd..b78b7932bec 100644
--- a/usr.bin/pctr/Makefile
+++ b/usr.bin/pctr/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 2012/09/12 09:19:54 haesbaert Exp $
+#	$OpenBSD: Makefile,v 1.9 2017/04/16 10:16:35 jsg Exp $
 
 MAN=pctr.1
 
-CFLAGS+=-W -Wall -Werror
+CFLAGS+=-W -Wall
 CDIAGFLAGS=
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
diff --git a/usr.sbin/identd/Makefile b/usr.sbin/identd/Makefile
index 94dd280cf7f..4bf6733d63f 100644
--- a/usr.sbin/identd/Makefile
+++ b/usr.sbin/identd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2016/02/01 19:08:33 jca Exp $
+#	$OpenBSD: Makefile,v 1.3 2017/04/16 10:16:35 jsg Exp $
 
 PROG=	identd
 LDADD=	-levent
 DPADD=	${LIBEVENT}
-CFLAGS+= -Wall -Werror
+CFLAGS+= -Wall
 
 MAN=	identd.8
 
diff --git a/usr.sbin/mksuncd/Makefile b/usr.sbin/mksuncd/Makefile
index 1d2baff290b..05efbd9d5ab 100644
--- a/usr.sbin/mksuncd/Makefile
+++ b/usr.sbin/mksuncd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2014/07/16 20:07:03 okan Exp $
+#	$OpenBSD: Makefile,v 1.5 2017/04/16 10:16:35 jsg Exp $
 
 .if ${MACHINE} == "sparc64"
 
 PROG=	mksuncd
-CFLAGS+=-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes
 CDIAGFLAGS=
 
 .else
diff --git a/usr.sbin/tftp-proxy/Makefile b/usr.sbin/tftp-proxy/Makefile
index 929696ecdcd..4760ab93647 100644
--- a/usr.sbin/tftp-proxy/Makefile
+++ b/usr.sbin/tftp-proxy/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2012/09/12 09:19:54 haesbaert Exp $
+#	$OpenBSD: Makefile,v 1.5 2017/04/16 10:16:35 jsg Exp $
 
 PROG=	tftp-proxy
 SRCS=	tftp-proxy.c filter.c
@@ -6,7 +6,7 @@ MAN=	tftp-proxy.8
 LDADD=	-levent
 DPADD=	${LIBEVENT}
 
-CFLAGS+=-Wall -Werror
+CFLAGS+=-Wall
 CDIAGFLAGS=
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/tftpd/Makefile b/usr.sbin/tftpd/Makefile
index 8ecff27caaa..e516c18cc0f 100644
--- a/usr.sbin/tftpd/Makefile
+++ b/usr.sbin/tftpd/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 2012/09/12 09:19:54 haesbaert Exp $
+#	$OpenBSD: Makefile,v 1.6 2017/04/16 10:16:35 jsg Exp $
 
 PROG=	tftpd
 SRCS=	tftpd.c
 LDADD=	-levent
 DPADD=	${LIBEVENT}
-CFLAGS+= -Wall -Werror
+CFLAGS+= -Wall
 CDIAGFLAGS=
 
 MAN=	tftpd.8
-- 
2.20.1