Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move pf reachover makefiles into usr.sbin/pf. ok'ed by itojun. 

before:
	sbin/pfctl
	usr.sbin/authpf
	usr.sbin/spamdb
	libexec/ftp-proxy
	libexec/spamd
	libexec/spamd-setup
	libexec/spamlogd
after:
	usr.sbin/pf/pfctl
	usr.sbin/pf/authpf
	usr.sbin/pf/spamdb
	usr.sbin/pf/ftp-proxy
	usr.sbin/pf/spamd
	usr.sbin/pf/spamd-setup
	usr.sbin/pf/spamlogd
This commit is contained in:
yamt 2004-11-11 11:54:51 +00:00
parent ce23bf1813
commit 096fec04a9
12 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libexec/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.48 2004/06/25 16:34:45 itojun Exp $
# $NetBSD: Makefile,v 1.49 2004/11/11 11:54:51 yamt Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
@ -13,7 +13,4 @@ SUBDIR= atrun comsat fingerd ftpd getNAME getty identd ld.aout_so \
SUBDIR+= hpropd kadmind kpasswdd
.endif
# PF
SUBDIR+=spamd spamd-setup ftp-proxy spamlogd
.include <bsd.subdir.mk>

5
sbin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.89 2004/11/11 01:55:27 christos Exp $
# $NetBSD: Makefile,v 1.90 2004/11/11 11:54:51 yamt Exp $
# @(#)Makefile 8.5 (Berkeley) 3/31/94
# Not ported: XNSrouted enpload scsiformat startslip
@ -50,7 +50,4 @@ SUBDIR+= ping6 rtsol
# IPsec
SUBDIR+= setkey
# PF
SUBDIR+= pfctl
.include <bsd.subdir.mk>

6
usr.sbin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.194 2004/08/23 13:27:38 lukem Exp $
# $NetBSD: Makefile,v 1.195 2004/11/11 11:54:51 yamt Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@ -16,7 +16,7 @@ SUBDIR= ac accton altq amd apm apmd arp bad144 bind bootp catman \
pstat pwd_mkdb powerd quot quotacheck quotaon rarpd rbootd rdate \
repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
rpc.statd rpcbind rwhod sa screenblank sesd \
sliplogin slstats spamdb sntp \
sliplogin slstats sntp \
spray sunlabel sup sushi syslogd tadpolectl tcpdchk \
tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
usbdevs user videomode vipw vnconfig wiconfig wlanctl wsconscfg \
@ -48,6 +48,6 @@ SUBDIR+= racoon
.endif
# PF
SUBDIR+=authpf
SUBDIR+=pf
.include <bsd.subdir.mk>

12
usr.sbin/pf/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
SUBDIR= authpf
SUBDIR+= ftp-proxy
SUBDIR+= pfctl
# notyet SUBDIR+= pflogd
SUBDIR+= spamd
SUBDIR+= spamd-setup
SUBDIR+= spamdb
SUBDIR+= spamlogd
.include <bsd.subdir.mk>

5
usr.sbin/pf/Makefile.inc Normal file
View File

@ -0,0 +1,5 @@
# $NetBSD: Makefile.inc,v 1.1 2004/11/11 11:54:51 yamt Exp $
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
.endif

2
usr.sbin/authpf/Makefile → usr.sbin/pf/authpf/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2004/06/25 00:06:09 itojun Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.10 2003/11/20 23:23:09 avsm Exp $
PROG= authpf

4
libexec/ftp-proxy/Makefile → usr.sbin/pf/ftp-proxy/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/11/11 10:30:13 yamt Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.4 2003/11/20 23:23:09 avsm Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
@ -18,6 +18,8 @@ CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap
DPADD+= ${LIBWRAP}
BINDIR= /usr/libexec
.include <bsd.prog.mk>
.PATH: ${NETBSDSRCDIR}/dist/pf/libexec/ftp-proxy

9
sbin/pfctl/Makefile → usr.sbin/pf/pfctl/Makefile
View File

@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.1 2004/06/22 15:16:30 itojun Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.15 2004/03/10 18:49:49 mcbride Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
PROG= pfctl
SRCS= pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c
SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c
@ -13,6 +15,11 @@ WARNS?= 1
LDADD+= -lm
DPADD+= ${LIBM}
BINDIR= /sbin
.if (${MKDYNAMICROOT} == "no")
LDSTATIC?= -static
.endif
.include <bsd.prog.mk>
.PATH: ${NETBSDSRCDIR}/dist/pf/sbin/pfctl

4
libexec/spamd-setup/Makefile → usr.sbin/pf/spamd-setup/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2004/06/22 15:53:18 itojun Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.3 2004/01/21 08:07:41 deraadt Exp $
PROG= spamd-setup
@ -8,6 +8,8 @@ MAN= spamd-setup.8
LDADD= -lz
DPADD= ${LIBZ}
BINDIR= /usr/libexec
.include <bsd.prog.mk>
.PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamd-setup

4
libexec/spamd/Makefile → usr.sbin/pf/spamd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2004/11/11 11:27:34 yamt Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.7 2004/02/26 07:28:55 beck Exp $
PROG= spamd
@ -11,6 +11,8 @@ WARNS?= 1
CPPFLAGS+= -D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
CPPFLAGS+= -D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
BINDIR= /usr/libexec
.include <bsd.prog.mk>
.PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamd

2
usr.sbin/spamdb/Makefile → usr.sbin/pf/spamdb/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2004/06/25 16:25:00 itojun Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
PROG= spamdb

4
libexec/spamlogd/Makefile → usr.sbin/pf/spamlogd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2004/11/11 11:27:34 yamt Exp $
# $NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
# $OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
PROG= spamlogd
@ -11,6 +11,8 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pf/libexec/spamd
CPPFLAGS+= -D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
CPPFLAGS+= -D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
BINDIR= /usr/libexec
.include <bsd.prog.mk>
.PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamlogd