Index: stable/12/tools/tools/netmap/Makefile
===================================================================
--- stable/12/tools/tools/netmap/Makefile	(revision 366498)
+++ stable/12/tools/tools/netmap/Makefile	(revision 366499)
@@ -1,38 +1,36 @@
 #
 # $FreeBSD$
 #
 # For multiple programs using a single source file each,
 # we can just define 'progs' and create custom targets.
 PROGS	=	pkt-gen nmreplay bridge lb
 
 CLEANFILES = $(PROGS) *.o
 MAN=
-CFLAGS += -Werror -Wall
-CFLAGS += -Wextra
 
+.include <bsd.prog.mk>
+.include <bsd.lib.mk>
+
 LDFLAGS += -lpthread
 .ifdef WITHOUT_PCAP
 CFLAGS += -DNO_PCAP
 .else
 LDFLAGS += -lpcap
 .endif
 LDFLAGS += -lm # used by nmreplay
-
-.include <bsd.prog.mk>
-.include <bsd.lib.mk>
 
 CFLAGS += -Wno-cast-align
 
 all: $(PROGS)
 
 pkt-gen: pkt-gen.o
 	$(CC) $(CFLAGS) -o pkt-gen pkt-gen.o $(LDFLAGS)
 
 bridge: bridge.o
 	$(CC) $(CFLAGS) -o bridge bridge.o
 
 nmreplay: nmreplay.o
 	$(CC) $(CFLAGS) -o nmreplay nmreplay.o $(LDFLAGS)
 
 lb: lb.o pkt_hash.o
 	$(CC) $(CFLAGS) -o lb lb.o pkt_hash.o $(LDFLAGS)
Index: stable/12
===================================================================
--- stable/12	(revision 366498)
+++ stable/12	(revision 366499)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r366394