Move basic ifilter utils to sbin where they shold have been committed by

me in the first place. While we're at it: add MAINTAINER line

8 files changed, 8 insertions, 36 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index dd6257a..c7c83b3 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -27,10 +27,7 @@ SUBDIR=	IPXrouted \
 	fdwrite \
 	inetd \
 	iostat \
-	ipfstat \
 	ipftest \
-	ipmon \
-	ipnat \
 	ipresend \
 	ipsend \
 	iptest \
diff --git a/usr.sbin/ipfstat/Makefile b/usr.sbin/ipfstat/Makefile
deleted file mode 100644
index e506180..0000000
--- a/usr.sbin/ipfstat/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
-
-PROG=	ipfstat
-MAN8=	ipfstat.8
-SRCS=	fils.c parse.c opt.c kmem.c facpri.c
-CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index f3255fa..5debdd5 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -17,4 +17,6 @@ CLEANFILES+=	opt_ipfilter.h
 opt_ipfilter.h:	Makefile
 	echo "#define IPFILTER 1" > opt_ipfilter.h
 
+MAINTAINER=	guido@freebsd.org
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ipmon/Makefile b/usr.sbin/ipmon/Makefile
deleted file mode 100644
index 96cffcf..0000000
--- a/usr.sbin/ipmon/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
-
-PROG=	ipmon
-MAN8=	ipmon.8
-SRCS=	ipmon.c
-
-CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ipnat/Makefile b/usr.sbin/ipnat/Makefile
deleted file mode 100644
index 8eed3a4..0000000
--- a/usr.sbin/ipnat/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
-
-PROG=	ipnat
-MAN1=	ipnat.1
-MAN4=	ipnat.4
-MAN5=	ipnat.5
-SRCS=	ipnat.c kmem.c natparse.c
-CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 8a9d8b2..1313213 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -12,4 +12,6 @@ CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
+MAINTAINER=	guido@freebsd.org
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 75a45b3..4b1b80e 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -19,4 +19,6 @@ CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 DPADD=	${LIBL}
 LDADD=	-ll
 
+MAINTAINER=	guido@freebsd.org
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index f296945..9465369 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -12,4 +12,6 @@ CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
+MAINTAINER=	guido@freebsd.org
+
 .include <bsd.prog.mk>