CVS commit: src/usr.sbin/pf/ftp-proxy

2013-02-09 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Sat Feb  9 15:36:40 UTC 2013

Modified Files:
src/usr.sbin/pf/ftp-proxy: Makefile

Log Message:
Disable -DWITH_NPF for now; will be converted to BPF mechanism.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/pf/ftp-proxy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/pf/ftp-proxy/Makefile
diff -u src/usr.sbin/pf/ftp-proxy/Makefile:1.7 src/usr.sbin/pf/ftp-proxy/Makefile:1.8
--- src/usr.sbin/pf/ftp-proxy/Makefile:1.7	Sat Sep 15 17:46:25 2012
+++ src/usr.sbin/pf/ftp-proxy/Makefile	Sat Feb  9 15:36:40 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/09/15 17:46:25 plunky Exp $
+#	$NetBSD: Makefile,v 1.8 2013/02/09 15:36:40 rmind Exp $
 #	$OpenBSD: Makefile,v 1.3 2006/11/26 11:31:13 deraadt Exp $
 
 PROG=	ftp-proxy
@@ -15,9 +15,9 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/sys
 
 # NPF support
 .if (${MKNPF} != no)
-SRCS+=		npf.c
-CPPFLAGS+=	-DWITH_NPF
-LDADD+=		-lnpf -lprop
+#SRCS+=		npf.c
+#CPPFLAGS+=	-DWITH_NPF
+#LDADD+=		-lnpf -lprop
 .endif
 
 # IP Filter support



CVS commit: src/usr.sbin/pf/ftp-proxy

2012-09-15 Thread Iain Hibbert
Module Name:src
Committed By:   plunky
Date:   Sat Sep 15 17:46:25 UTC 2012

Modified Files:
src/usr.sbin/pf/ftp-proxy: Makefile

Log Message:
does not need -I${NETBSDSRCDIR}/sys/dist/ipf here, the include files
are installed in /usr/include/netinet


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/pf/ftp-proxy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/pf/ftp-proxy/Makefile
diff -u src/usr.sbin/pf/ftp-proxy/Makefile:1.6 src/usr.sbin/pf/ftp-proxy/Makefile:1.7
--- src/usr.sbin/pf/ftp-proxy/Makefile:1.6	Fri Feb  4 00:19:52 2011
+++ src/usr.sbin/pf/ftp-proxy/Makefile	Sat Sep 15 17:46:25 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/02/04 00:19:52 rmind Exp $
+#	$NetBSD: Makefile,v 1.7 2012/09/15 17:46:25 plunky Exp $
 #	$OpenBSD: Makefile,v 1.3 2006/11/26 11:31:13 deraadt Exp $
 
 PROG=	ftp-proxy
@@ -23,7 +23,7 @@ LDADD+=		-lnpf -lprop
 # IP Filter support
 .if (${MKIPFILTER} != no)
 SRCS+=	ipf.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/ipf -DWITH_IPF
+CPPFLAGS+=-DWITH_IPF
 .endif
 
 BINDIR= /usr/sbin