Index: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile
===================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile	(revision 295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile	(revision 295340)
@@ -1,51 +1,52 @@
 # $FreeBSD$
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
 .include <src.opts.mk>
 
 CONTRIB=${.CURDIR}/../../../contrib/bsnmp
 .PATH: ${CONTRIB}/snmpd
 
 PROG=	bsnmpd
 SRCS=	main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c
 SRCS+=	oid.h tree.c tree.h
 XSYM=	snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \
 	sysUpTime snmpTrapOID coldStart authenticationFailure \
 	begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable \
 	freeBSD freeBSDVersion
 CLEANFILES= oid.h tree.c tree.h
 MAN=	bsnmpd.1 snmpmod.3
-NO_WERROR=
 
 FILESGROUPS= BMIBS DEFS
 
 BMIBS=	FOKUS-MIB.txt BEGEMOT-MIB.txt BEGEMOT-SNMPD.txt
 BMIBSDIR= ${SHAREDIR}/snmp/mibs
 DEFS=	tree.def
 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
 
 LDFLAGS= -Wl,-export-dynamic
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+= -DHAVE_LIBCRYPTO
 .endif
 
 oid.h: tree.def Makefile
 	gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
 
 .ORDER: tree.c tree.h
 tree.c tree.h: tree.def
 	gensnmptree -l < ${.ALLSRC}
 
 MANFILTER=	sed -e 's%@MODPATH@%${LIBDIR}/%g'		\
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\
 		    -e 's%@MIBSPATH@%${BMIBSDIR}/%g'
+
+WARNS?=		6
 
 .include <bsd.prog.mk>
Index: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
===================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	(revision 295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	(revision 295340)
@@ -1,29 +1,27 @@
 # $FreeBSD$
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
 CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_mibII
 
 MOD=	mibII
 SRCS=	mibII.c mibII_begemot.c mibII_ifmib.c mibII_ifstack.c		\
 	mibII_interfaces.c mibII_ip.c mibII_ipaddr.c mibII_nettomedia.c	\
 	mibII_rcvaddr.c mibII_route.c mibII_tcp.c mibII_udp.c
 XSYM=	ipAddrTable ifTable ifRcvAddressEntry ifMIB ipMIB tcpMIB udpMIB	\
 	ipForward ifIndex linkDown linkUp
 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
 BMIBS=	BEGEMOT-IP-MIB.txt BEGEMOT-MIB2-MIB.txt
 
 .include <bsd.snmpmod.mk>
 
 smilint:
 	env SMIPATH=/usr/share/snmp/mibs:/usr/local/share/snmp/mibs \
 	    smilint -c /dev/null -l6 -i group-membership ${BMIBS:C/^/${CONTRIB}\/snmp_mibII\//}
Index: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc
===================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc	(revision 295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc	(revision 295340)
@@ -1,13 +1,15 @@
 # $FreeBSD$
 # Author: Shteryana Shopova <syrinx@FreeBSD.org>
 
 BINDIR?= /usr/bin
 
 CFLAGS+= -I. -I${.CURDIR}
 
 .if exists(${.OBJDIR}/../libbsnmptools)
 LIBBSNMPTOOLSDIR=      ${.OBJDIR}/../libbsnmptools
 .else
 LIBBSNMPTOOLSDIR=      ${.CURDIR}/../libbsnmptools
 .endif
 LIBBSNMPTOOLS=         ${LIBBSNMPTOOLSDIR}/libbsnmptools.a
+
+WARNS?=		6