@@ -1,17 +1,17 @@
-#	$NetBSD: Makefile,v 1.33 2008/10/25 22:27:39 apb Exp $
+#	$NetBSD: Makefile,v 1.34 2012/01/30 16:13:21 darrenr Exp $
 
 .include <bsd.own.mk>
 
 PROG=		ipftest
-SRCS=		ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
+SRCS=		ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c ip_nat6.c \
 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
-		ip_pool.c ip_scan.c ip_sync.c \
+		ip_dstlist.c ip_pool.c ip_sync.c \
 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
-		ipf_l.c ipnat_y.c ipnat_l.c md5.c radix.c bpf_filter.c
+		ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c bpf_filter.c
 MAN=		ipftest.1
 
 CPPFLAGS+=	-DIPFILTER_LOG -DIPFILTER_LOOKUP \
-		-DIPFILTER_SCAN -DIPFILTER_SYNC -DIPFILTER_CKSUM \
+		-DIPFILTER_SYNC -DIPFILTER_CKSUM \
 		-I.
 
 COPTS.radix.c=	-Wno-error

@@ -1,33 +1,145 @@
-#	$NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2012/01/30 16:13:21 darrenr Exp $
 
 LIBISPRIVATE=	yes
 
 LIB=		ipf
 
-SRCS=		addicmp.c addipopt.c alist_free.c alist_new.c bcopywrap.c \
-		binprint.c buildopts.c checkrev.c count6bits.c count4bits.c \
-		debug.c facpri.c flags.c fill6bits.c gethost.c \
-		getifname.c getnattype.c getport.c getportproto.c \
-		getproto.c getsumd.c hostname.c \
-		icmpcode.c initparse.c ionames.c \
-		ipoptsec.c ipf_dotuning.c ipft_ef.c ipft_hx.c ipft_pc.c \
-		ipft_sn.c ipft_td.c ipft_tx.c kmem.c kmemcpywrap.c \
-		kvatoname.c load_file.c load_hash.c load_hashnode.c \
-		load_http.c load_pool.c load_poolnode.c load_url.c \
-		mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c \
-		optname.c optprint.c optprintv6.c optvalue.c portname.c \
-		print_toif.c printactivenat.c printaps.c printbuf.c \
-		printhash.c printhash_live.c printhashnode.c printip.c \
-		printpool.c printpool_live.c \
-		printpoolnode.c printfr.c printfraginfo.c printhashdata.c \
+SRCS=		addicmp.c \
+		addipopt.c \
+		alist_free.c \
+		alist_new.c \
+		allocmbt.c \
+		assigndefined.c \
+		bcopywrap.c \
+		binprint.c \
+		buildopts.c \
+		checkrev.c \
+		connecttcp.c \
+		count4bits.c \
+		count6bits.c \
+		debug.c \
+		dupmbt.c \
+		facpri.c \
+		familyname.c \
+		fill6bits.c \
+		findword.c \
+		flags.c \
+		freembt.c \
+		ftov.c \
+		genmask.c \
+		gethost.c \
+		geticmptype.c \
+		getifname.c \
+		getnattype.c \
+		getport.c \
+		getportproto.c \
+		getproto.c \
+		getsumd.c \
+		hostname.c \
+		icmpcode.c \
+		icmptypename.c \
+		icmptypes.c \
+		initparse.c \
+		interror.c \
+		ionames.c \
+		ipferror.c \
+		ipf_perror.c \
+		ipf_dotuning.c \
+		ipft_hx.c \
+		ipft_pc.c \
+		ipft_tx.c \
+		ipoptsec.c \
+		kmem.c \
+		kmemcpywrap.c \
+		kvatoname.c \
+		load_file.c \
+		load_dstlist.c \
+		load_dstlistnode.c \
+		load_hash.c \
+		load_hashnode.c \
+		load_http.c \
+		load_pool.c \
+		load_poolnode.c \
+		load_url.c \
+		msgdsize.c \
+		mutex_emul.c \
+		nametokva.c \
+		nat_setgroupmap.c \
+		ntomask.c \
+		optname.c \
+		optprint.c \
+		optprintv6.c \
+		optvalue.c \
+		parsefields.c \
+		parseipfexpr.c \
+		parsewhoisline.c \
+		poolio.c \
+		portname.c \
+		print_toif.c \
+		printactiveaddr.c \
+		printactivenat.c \
+		printaddr.c \
+		printaps.c \
+		printbuf.c \
+		printdstlist.o \
+		printdstlistdata.o \
+		printdstlistnode.o \
+		printdstlistpolicy.o \
+		printdstl_live.o \
+		printfieldhdr.c \
+		printfr.c \
+		printfraginfo.c \
+		printhash.c \
+		printhashdata.c \
+		printhashnode.c \
+		printhash_live.c \
+		printhost.c \
 		printhostmap.c \
-		printifname.c printhostmask.c printlog.c printmask.c \
-		printnat.c printpooldata.c printportcmp.c printpacket.c \
-		printpacket6.c printproto.c \
-		printsbuf.c printstate.c printtqtable.c printtunable.c \
-		remove_hash.c remove_hashnode.c remove_pool.c \
-		remove_poolnode.c resetlexer.c rwlock_emul.c tcpflags.c \
-		tcp_flags.c var.c verbose.c v6ionames.c \
+		printhostmask.c \
+		printifname.c \
+		printip.c \
+		printipfexpr.c \
+		printlog.c \
+		printlookup.c \
+		printmask.c \
+		printnat.c \
+		printnataddr.c \
+		printnatfield.c \
+		printnatside.c \
+		printpool.c \
+		printpooldata.c \
+		printpoolfield.c \
+		printpoolnode.c \
+		printpool_live.c \
+		printproto.c \
+		printportcmp.c \
+		printpacket.c \
+		printpacket6.c \
+		printsbuf.c \
+		printstate.c \
+		printstatefields.c \
+		printtcpflags.c \
+		printtqtable.c \
+		printtunable.c \
+		printunit.c \
+		remove_hash.c \
+		remove_hashnode.c \
+		remove_pool.c \
+		remove_poolnode.c \
+		resetlexer.c \
+		rwlock_emul.c \
+		save_execute.c \
+		save_file.c \
+		save_nothing.c \
+		save_syslog.c \
+		save_v1trap.c \
+		save_v2trap.c \
+		tcpflags.c \
+		tcp_flags.c \
+		var.c \
+		verbose.c \
+		vtof.c \
+		v6ionames.c \
 		v6optvalue.c
 
 CPPFLAGS.printstate.c=	-Wno-error