svn commit: r295340 - in user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd: bsnmpd modules/snmp_mibII tools

[Garrett Cooper]

Author: ngie
Date: Fri Feb  5 23:46:33 2016
New Revision: 295340
URL: https://svnweb.freebsd.org/changeset/base/295340

Log:
  Set WARNS?= 6; remove NO_WERROR; reap unused CFLAGS

Modified:
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
  user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile	Fri Feb  5 23:39:24 2016	(r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile	Fri Feb  5 23:46:33 2016	(r295340)
@@ -16,7 +16,6 @@ XSYM=	snmpMIB begemotSnmpdModuleTable be
 	freeBSD freeBSDVersion
 CLEANFILES= oid.h tree.c tree.h
 MAN=	bsnmpd.1 snmpmod.3
-NO_WERROR=
 
 FILESGROUPS= BMIBS DEFS
 
@@ -27,7 +26,7 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
 
 CFLAGS+= -DSNMPTREE_TYPES
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
+CFLAGS+= -DUSE_TCPWRAPPERS
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
 LIBADD=	begemot bsnmp wrap
 
@@ -48,4 +47,6 @@ MANFILTER=	sed -e 's%@MODPATH@%${LIBDIR}
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\
 		    -e 's%@MIBSPATH@%${BMIBSDIR}/%g'
 
+WARNS?=		6
+
 .include <bsd.prog.mk>

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	Fri Feb  5 23:39:24 2016	(r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	Fri Feb  5 23:46:33 2016	(r295340)
@@ -15,8 +15,6 @@ MAN=	snmp_mibII.3
 
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
-# XXX Work around clang warning, until maintainer approves fix.
-NO_WERROR.clang=
 
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h

Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc	Fri Feb  5 23:39:24 2016	(r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc	Fri Feb  5 23:46:33 2016	(r295340)
@@ -11,3 +11,5 @@ LIBBSNMPTOOLSDIR=      ${.OBJDIR}/../lib
 LIBBSNMPTOOLSDIR=      ${.CURDIR}/../libbsnmptools
 .endif
 LIBBSNMPTOOLS=         ${LIBBSNMPTOOLSDIR}/libbsnmptools.a
+
+WARNS?=		6