Link pf 4.1 to the build:

 - move ftp-proxy from libexec to usr.sbin
 - add tftp-proxy
 - new altq mtag link

Approved by:	re (kensmith)

3 files changed, 11 insertions, 14 deletions

diff --git a/libexec/Makefile b/libexec/Makefile
index 6d25b58..6a32d10 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -8,7 +8,6 @@ SUBDIR=	atrun \
 	comsat \
 	fingerd \
 	ftpd \
-	${_ftp-proxy} \
 	getty \
 	lukemftpd \
 	${_mail.local} \
@@ -32,6 +31,7 @@ SUBDIR=	atrun \
 	tcpd \
 	telnetd \
 	tftpd \
+	${_tftp-proxy} \
 	${_ypxfr}
 
 .if ${MK_NIS} != "no"
@@ -40,7 +40,7 @@ _ypxfr=		ypxfr
 .endif
 
 .if ${MK_PF} != "no"
-_ftp-proxy=	ftp-proxy
+_tftp-proxy=	tftp-proxy
 .endif
 
 .if !defined(NO_PIC)
diff --git a/libexec/ftp-proxy/Makefile b/libexec/ftp-proxy/Makefile
deleted file mode 100644
index e229001..0000000
--- a/libexec/ftp-proxy/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../contrib/pf/ftp-proxy
-
-PROG=	ftp-proxy
-MAN=	ftp-proxy.8
-
-SRCS=   ftp-proxy.c getline.c util.c
-
-WARNS?=	2
-
-.include <bsd.prog.mk>
diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile
new file mode 100644
index 0000000..45d8068
--- /dev/null
+++ b/libexec/tftp-proxy/Makefile
@@ -0,0 +1,9 @@
+#	$FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/pf/tftp-proxy
+
+PROG=	tftp-proxy
+SRCS=	tftp-proxy.c filter.c
+MAN=	tftp-proxy.8
+
+.include <bsd.prog.mk>