diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /sbin/pfctl | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'sbin/pfctl')
| -rw-r--r-- | sbin/pfctl/Makefile | 3 | ||||
| -rw-r--r-- | sbin/pfctl/Makefile.depend | 1 | ||||
| -rw-r--r-- | sbin/pfctl/parse.y | 8 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.c | 2 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_altq.c | 8 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_qstats.c | 8 |
6 files changed, 15 insertions, 15 deletions
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile index 937f403..de3b7ec 100644 --- a/sbin/pfctl/Makefile +++ b/sbin/pfctl/Makefile @@ -28,7 +28,6 @@ CFLAGS+= -DWITH_INET YFLAGS= -LDADD+= -lm -lmd -DPADD+= ${LIBM} ${LIBMD} +LIBADD= m md .include <bsd.prog.mk> diff --git a/sbin/pfctl/Makefile.depend b/sbin/pfctl/Makefile.depend index 3114c66..4ce935d 100644 --- a/sbin/pfctl/Makefile.depend +++ b/sbin/pfctl/Makefile.depend @@ -13,6 +13,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libmd \ lib/msun \ + usr.bin/yacc.host \ .include <dirdeps.mk> diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 99c26c0..aebf8a7 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -44,10 +44,10 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp6.h> #include <net/pfvar.h> #include <arpa/inet.h> -#include <altq/altq.h> -#include <altq/altq_cbq.h> -#include <altq/altq_priq.h> -#include <altq/altq_hfsc.h> +#include <net/altq/altq.h> +#include <net/altq/altq_cbq.h> +#include <net/altq/altq_priq.h> +#include <net/altq/altq_hfsc.h> #include <stdio.h> #include <unistd.h> diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f90fd70..c1ba12f 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <net/pfvar.h> #include <arpa/inet.h> -#include <altq/altq.h> +#include <net/altq/altq.h> #include <sys/sysctl.h> #include <err.h> diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c index ae566f8..64f474c 100644 --- a/sbin/pfctl/pfctl_altq.c +++ b/sbin/pfctl/pfctl_altq.c @@ -38,10 +38,10 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include <altq/altq.h> -#include <altq/altq_cbq.h> -#include <altq/altq_priq.h> -#include <altq/altq_hfsc.h> +#include <net/altq/altq.h> +#include <net/altq/altq_cbq.h> +#include <net/altq/altq_priq.h> +#include <net/altq/altq_hfsc.h> #include "pfctl_parser.h" #include "pfctl.h" diff --git a/sbin/pfctl/pfctl_qstats.c b/sbin/pfctl/pfctl_qstats.c index 95371e4..0921d47 100644 --- a/sbin/pfctl/pfctl_qstats.c +++ b/sbin/pfctl/pfctl_qstats.c @@ -34,10 +34,10 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include <altq/altq.h> -#include <altq/altq_cbq.h> -#include <altq/altq_priq.h> -#include <altq/altq_hfsc.h> +#include <net/altq/altq.h> +#include <net/altq/altq_cbq.h> +#include <net/altq/altq_priq.h> +#include <net/altq/altq_hfsc.h> #include "pfctl.h" #include "pfctl_parser.h" |
