From 3ad52e24ee7514e60d151877932a110bc101f938 Mon Sep 17 00:00:00 2001
From: apb <apb@NetBSD.org>
Date: Tue, 5 Mar 2013 13:42:04 +0000
Subject: [PATCH] A different way of dealing with a warning from gcc-4.1 when
 compiling zic.c.  Instead of setting WARNS=0 and NOGCCERROR=1, just add
 -Wno-error to COPTS.zic.c when using an old version of gcc.

Also include bsd.own.mk earlier.
---
 usr.sbin/zic/Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index 8d16e4cd0fe8..d259c95c59cd 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,19 +1,18 @@
-#	$NetBSD: Makefile,v 1.12 2013/03/05 10:19:58 martin Exp $
+#	$NetBSD: Makefile,v 1.13 2013/03/05 13:42:04 apb Exp $
 
 .include "Makefile.inc"
+.include <bsd.own.mk>
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
 COPTS.zic.c	+= -Wno-format-nonliteral
 COPTS.scheck.c	+= -Wno-format-nonliteral
-.else
-# warning with older gcc:
-# "comparison is always false due to limited range of data type"
-# and no way to make it shut up?
-WARNS=         0
-NOGCCERROR=    1
-.endif
 
-.include <bsd.own.mk>
+.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
+# gcc-4.1 says:
+# "warning: comparison is always false due to limited range of data type"
+# and there is no -Wno-foo option to suppress that warning.
+#
+COPTS.zic.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-error :}
+.endif # HAVE_GCC < 45
 
 PROG=	zic
 SRCS=	zic.c scheck.c ialloc.c