head	1.22;
access;
symbols
	RELENG_8_4:1.22.0.2
	RELENG_9_1_0_RELEASE:1.20.16.2.2.2
	RELENG_9_1:1.20.16.2.0.2
	RELENG_9_1_BP:1.20.16.2
	RELENG_8_3_0_RELEASE:1.20.10.1.8.1
	RELENG_8_3:1.20.10.1.0.8
	RELENG_8_3_BP:1.20.10.1
	RELENG_9_0_0_RELEASE:1.20.16.1.2.1
	RELENG_9_0:1.20.16.1.0.2
	RELENG_9_0_BP:1.20.16.1
	RELENG_9:1.20.0.16
	RELENG_9_BP:1.20
	RELENG_7_4_0_RELEASE:1.20.14.1
	RELENG_8_2_0_RELEASE:1.20.10.1.6.1
	RELENG_7_4:1.20.0.14
	RELENG_7_4_BP:1.20
	RELENG_8_2:1.20.10.1.0.6
	RELENG_8_2_BP:1.20.10.1
	RELENG_8_1_0_RELEASE:1.20.10.1.4.1
	RELENG_8_1:1.20.10.1.0.4
	RELENG_8_1_BP:1.20.10.1
	RELENG_7_3_0_RELEASE:1.20.12.1
	RELENG_7_3:1.20.0.12
	RELENG_7_3_BP:1.20
	RELENG_8_0_0_RELEASE:1.20.10.1.2.1
	RELENG_8_0:1.20.10.1.0.2
	RELENG_8_0_BP:1.20.10.1
	RELENG_8:1.20.0.10
	RELENG_8_BP:1.20
	RELENG_7_2_0_RELEASE:1.20.8.1
	RELENG_7_2:1.20.0.8
	RELENG_7_2_BP:1.20
	RELENG_7_1_0_RELEASE:1.20.6.1
	RELENG_6_4_0_RELEASE:1.18.2.1.8.1
	RELENG_7_1:1.20.0.6
	RELENG_7_1_BP:1.20
	RELENG_6_4:1.18.2.1.0.8
	RELENG_6_4_BP:1.18.2.1
	RELENG_7_0_0_RELEASE:1.20
	RELENG_6_3_0_RELEASE:1.18.2.1
	RELENG_7_0:1.20.0.4
	RELENG_7_0_BP:1.20
	RELENG_6_3:1.18.2.1.0.6
	RELENG_6_3_BP:1.18.2.1
	RELENG_7:1.20.0.2
	RELENG_7_BP:1.20
	RELENG_6_2_0_RELEASE:1.18.2.1
	RELENG_6_2:1.18.2.1.0.4
	RELENG_6_2_BP:1.18.2.1
	RELENG_5_5_0_RELEASE:1.14.2.1
	RELENG_5_5:1.14.2.1.0.4
	RELENG_5_5_BP:1.14.2.1
	RELENG_6_1_0_RELEASE:1.18.2.1
	RELENG_6_1:1.18.2.1.0.2
	RELENG_6_1_BP:1.18.2.1
	RELENG_6_0_0_RELEASE:1.18
	RELENG_6_0:1.18.0.4
	RELENG_6_0_BP:1.18
	RELENG_6:1.18.0.2
	RELENG_6_BP:1.18
	RELENG_5_4_0_RELEASE:1.14.2.1
	RELENG_5_4:1.14.2.1.0.2
	RELENG_5_4_BP:1.14.2.1
	RELENG_4_11_0_RELEASE:1.2.2.3
	RELENG_4_11:1.2.2.3.0.2
	RELENG_4_11_BP:1.2.2.3
	RELENG_5_3_0_RELEASE:1.14
	RELENG_5_3:1.14.0.4
	RELENG_5_3_BP:1.14
	RELENG_5:1.14.0.2
	RELENG_5_BP:1.14
	RELENG_4_10_0_RELEASE:1.2.2.2
	RELENG_4_10:1.2.2.2.0.14
	RELENG_4_10_BP:1.2.2.2
	RELENG_5_2_1_RELEASE:1.12
	RELENG_5_2_0_RELEASE:1.12
	RELENG_5_2:1.12.0.2
	RELENG_5_2_BP:1.12
	RELENG_4_9_0_RELEASE:1.2.2.2
	RELENG_4_9:1.2.2.2.0.12
	RELENG_4_9_BP:1.2.2.2
	RELENG_5_1_0_RELEASE:1.11
	RELENG_5_1:1.11.0.4
	RELENG_5_1_BP:1.11
	RELENG_4_8_0_RELEASE:1.2.2.2
	RELENG_4_8:1.2.2.2.0.10
	RELENG_4_8_BP:1.2.2.2
	RELENG_5_0_0_RELEASE:1.11
	RELENG_5_0:1.11.0.2
	RELENG_5_0_BP:1.11
	RELENG_4_7_0_RELEASE:1.2.2.2
	RELENG_4_7:1.2.2.2.0.8
	RELENG_4_7_BP:1.2.2.2
	RELENG_4_6_2_RELEASE:1.2.2.2
	RELENG_4_6_1_RELEASE:1.2.2.2
	RELENG_4_6_0_RELEASE:1.2.2.2
	RELENG_4_6:1.2.2.2.0.6
	RELENG_4_6_BP:1.2.2.2
	RELENG_4_5_0_RELEASE:1.2.2.2
	RELENG_4_5:1.2.2.2.0.4
	RELENG_4_5_BP:1.2.2.2
	RELENG_4_4_0_RELEASE:1.2.2.2
	RELENG_4_4:1.2.2.2.0.2
	RELENG_4_4_BP:1.2.2.2
	KSE_MILESTONE_2:1.10
	KSE_PRE_MILESTONE_2:1.10
	RELENG_4_3_0_RELEASE:1.2.2.1
	RELENG_4_3:1.2.2.1.0.2
	RELENG_4_3_BP:1.2.2.1
	RELENG_4_2_0_RELEASE:1.2.2.1
	RELENG_4_1_1_RELEASE:1.2.2.1
	PRE_SMPNG:1.8
	RELENG_4_1_0_RELEASE:1.2
	RELENG_4_0_0_RELEASE:1.2
	RELENG_4:1.2.0.2
	RELENG_4_BP:1.2;
locks; strict;
comment	@# @;


1.22
date	2012.11.17.01.52.56;	author svnexp;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2011.12.30.13.16.59;	author dim;	state Exp;
branches;
next	1.20;

1.20
date	2006.03.17.18.54.37;	author ru;	state Exp;
branches
	1.20.2.1
	1.20.6.1
	1.20.8.1
	1.20.10.1
	1.20.12.1
	1.20.14.1
	1.20.16.1;
next	1.19;

1.19
date	2005.10.14.23.30.12;	author yar;	state Exp;
branches;
next	1.18;

1.18
date	2005.06.03.15.31.10;	author ru;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2005.04.25.18.46.00;	author darrenr;	state Exp;
branches;
next	1.16;

1.16
date	2004.12.25.00.23.36;	author scottl;	state Exp;
branches;
next	1.15;

1.15
date	2004.12.21.10.49.27;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2004.06.08.23.52.22;	author darrenr;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2004.04.20.14.06.42;	author darrenr;	state Exp;
branches;
next	1.12;

1.12
date	2003.09.23.17.55.04;	author sam;	state Exp;
branches;
next	1.11;

1.11
date	2002.01.11.15.48.49;	author ru;	state Exp;
branches;
next	1.10;

1.10
date	2001.06.07.04.06.20;	author jlemon;	state Exp;
branches;
next	1.9;

1.9
date	2001.01.06.13.59.52;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	2000.09.04.03.59.41;	author gshapiro;	state Exp;
branches;
next	1.7;

1.7
date	2000.08.01.00.44.42;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	2000.08.01.00.10.08;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	2000.07.31.23.58.38;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	2000.05.27.01.13.50;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	2000.05.04.12.07.32;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	99.12.06.20.33.37;	author guido;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	99.11.23.22.18.17;	author guido;	state Exp;
branches;
next	;

1.22.2.1
date	2012.11.17.01.52.56;	author svnexp;	state dead;
branches;
next	1.22.2.2;

1.22.2.2
date	2013.03.28.13.05.20;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	2012.11.17.08.06.49;	author svnexp;	state Exp;
branches;
next	;

1.20.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.20.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.20.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.20.10.1.2.1
	1.20.10.1.4.1
	1.20.10.1.6.1
	1.20.10.1.8.1;
next	1.20.10.2;

1.20.10.2
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

1.20.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.20.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.20.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.20.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.20.10.1.8.2;

1.20.10.1.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.20.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.20.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.20.14.2;

1.20.14.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.20.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.20.16.1.2.1;
next	1.20.16.2;

1.20.16.2
date	2012.01.06.21.23.00;	author dim;	state Exp;
branches
	1.20.16.2.2.1;
next	1.20.16.3;

1.20.16.3
date	2012.11.17.11.37.17;	author svnexp;	state Exp;
branches;
next	1.20.16.4;

1.20.16.4
date	2014.03.20.22.02.35;	author svnexp;	state Exp;
branches;
next	;

1.20.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.20.16.1.2.2;

1.20.16.1.2.2
date	2012.11.17.08.37.13;	author svnexp;	state Exp;
branches;
next	;

1.20.16.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.20.16.2.2.2;

1.20.16.2.2.2
date	2012.11.17.08.48.04;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1
date	2006.02.10.00.38.03;	author yar;	state Exp;
branches
	1.18.2.1.8.1;
next	1.18.2.2;

1.18.2.2
date	2012.11.17.07.44.20;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.14.2.1
date	2005.03.13.19.07.37;	author rwatson;	state Exp;
branches;
next	;

1.2.2.1
date	2000.09.04.04.00.13;	author gshapiro;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2001.06.07.05.11.44;	author jlemon;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2004.07.05.16.23.17;	author darrenr;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2012.11.17.07.26.31;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.22
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/ipfilter/Makefile 228994 2011-12-30 13:16:59Z dim $ 

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet

KMOD=	ipl
SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
	ip_log.c ip_fil_freebsd.c fil.c ip_lookup.c ip_pool.c ip_htable.c \
	ip_sync.c
SRCS+=	opt_bpf.h opt_inet6.h

.if !defined(KERNBUILDDIR)
opt_bpf.h:
	echo "#define DEV_BPF 1" > ${.TARGET}

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif
.endif
CFLAGS+=  -I${.CURDIR}/../../contrib/ipfilter
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP
#
# If you don't want log functionality remove -DIPFILTER_LOG
#

.include <bsd.kmod.mk>

CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.22.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:20 +0000
@
text
@d1 33
@


1.22.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 28
# $FreeBSD: releng/8.4/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet

KMOD=	ipl
SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
	ip_log.c ip_fil_freebsd.c fil.c ip_lookup.c ip_pool.c ip_htable.c \
	ip_sync.c
SRCS+=	opt_bpf.h opt_inet6.h

.if !defined(KERNBUILDDIR)
opt_bpf.h:
	echo "#define DEV_BPF 1" > ${.TARGET}

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif
.endif
CFLAGS+=  -I${.CURDIR}/../../contrib/ipfilter
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP
#
# If you don't want log functionality remove -DIPFILTER_LOG
#

.include <bsd.kmod.mk>
@


1.21
log
@SVN rev 228994 on 2011-12-30 13:16:59Z by dim

Disable several instances instances of clang's -Wself-assign warning.
All of these are harmless, and are in fact used to shut up warnings from
lint.

While here, remove -Wno-missing-prototypes from the xfs module
Makefile, as I could not reproduce those warnings either with gcc or
clang.

MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$ 
@


1.20
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d29 5
@


1.20.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 
@


1.20.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.20.16.2
log
@SVN rev 229734 on 2012-01-06 21:23:00Z by dim

MFC r228994:

Disable several instances instances of clang's -Wself-assign warning.
All of these are harmless, and are in fact used to shut up warnings from
lint.

While here, remove -Wno-missing-prototypes from the xfs module
Makefile, as I could not reproduce those warnings either with gcc or
clang.
@
text
@a28 5

CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.20.16.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/ipfilter/Makefile 229734 2012-01-06 21:23:00Z dim $ 
@


1.20.16.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263450
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/ipfilter/Makefile 263450 2014-03-20 21:49:24Z dim $ 
d30 3
a32 11
CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN} -Wno-unused
CWARNFLAGS.ip_auth.c=		-Wno-unused
CWARNFLAGS.ip_fil_freebsd.c=	-Wno-unused
CWARNFLAGS.ip_frag.c=		-Wno-unused
CWARNFLAGS.ip_htable.c=		-Wno-unused
CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN} -Wno-unused
CWARNFLAGS.ip_nat.c=		-Wno-unused
CWARNFLAGS.ip_pool.c=		-Wno-unused
CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN} -Wno-unused
CWARNFLAGS.ip_state.c=		-Wno-unused
CWARNFLAGS.ip_sync.c=		-Wno-unused
@


1.20.16.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.20.16.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/ipfilter/Makefile 229734 2012-01-06 21:23:00Z dim $ 
@


1.20.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.20.16.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 
@


1.20.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.20.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 
@


1.20.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.20.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.20.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 
@


1.20.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.20.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/ipfilter/Makefile 156813 2006-03-17 18:54:44Z ru $ 
@


1.20.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.20.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.20.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.20.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.20.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.19
log
@Let modules use the kernel's opt_*.h files if built along with
the kernel by wrapping all targets for fake opt_*.h files in
.if defined(KERNBUILDDIR).  Thus, such fake files won't be
created at all if modules are built with the kernel.

Some modules undergo cleanup like removing unused or unneeded
options or .h files, without which they wouldn't build this way
or the other.

Reviewed by:	ru
Tested by:	no binary changes in modules built alone
Tested on:	i386 sparc64 amd64
@
text
@d3 2
d17 1
a17 1
.if !defined(NO_INET6)
@


1.18
log
@Fix standalone module build.

Reported by:	Boris Samorodov <bsam@@ipt.ru>
@
text
@d11 1
a15 1
CFLAGS+= -DUSE_INET6
d19 1
@


1.18.2.1
log
@MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
@
text
@a10 1
.if !defined(KERNBUILDDIR)
d15 1
a18 1
.endif
@


1.18.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/ipfilter/Makefile 155500 2006-02-10 00:38:08Z yar $ 
@


1.18.2.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.17
log
@new files and compile defines to build new ipfilter
@
text
@d9 4
d16 2
@


1.16
log
@Don't define PFIL_HOOKS.  It's no longer required in RELENG_5 or HEAD.
@
text
@d7 2
a8 1
	ip_log.c ip_fil.c fil.c
d14 1
a14 1
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
@


1.15
log
@NOINET6 -> NO_INET6
@
text
@d13 1
a13 1
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS
@


1.14
log
@Recognise NOINET6 as an indication to not build IPv6 enabled source even
if FreeBSD header files, etc, support it.

Submitted by:	Sergey Mokryshev <mokr@@mokr.net>
@
text
@d9 1
a9 1
.if !defined(NOINET6)
@


1.14.2.1
log
@Merge Makefile:1.16 from HEAD to RELENG_5:

  date: 2004/12/25 00:23:36;  author: scottl;  state: Exp;  lines: +1 -1
  Don't define PFIL_HOOKS.  It's no longer required in RELENG_5 or HEAD.

Approved by:	re (kensmith)
@
text
@d13 1
a13 1
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
@


1.13
log
@IPv6 is on by default in GENERIC so enable IPv6 in IPFilter too by default.

PR:		kern/57730
Submitted by:	FUKAUMI Naoki <fukaumi@@soum.co.jp>
@
text
@d9 1
d11 1
a14 1
# If you don't want IPv6 functionality remove -DUSE_INET6
@


1.12
log
@update to reflect PFIL_HOOKS api changes

Supported by:	FreeBSD Foundation
@
text
@d9 1
d13 1
@


1.11
log
@Drop <bsd.man.mk> support from <bsd.kmod.mk>.

Not objected to by:	-current
@
text
@d10 1
a10 1
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
@


1.10
log
@Relocate IPFilter from sys/netinet to sys/contrib/ipfilter.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.9 2001/01/06 13:59:52 obrien Exp $ 
a7 1
NOMAN=
@


1.9
log
@Use a consistent style and one much closer to the rest of /usr/src
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.8 2000/09/04 03:59:41 gshapiro Exp $ 
d3 1
a3 1
.PATH: ${.CURDIR}/../../netinet
d10 1
@


1.8
log
@Fix typo
@
text
@d1 3
a3 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.7 2000/08/01 00:44:42 ache Exp $ 
a4 1
.PATH:	${.CURDIR}/../../netinet
d9 1
@


1.7
log
@Back out opt_ipfilter.h creation I add recently and add -DIPFILTER=1
to CFLAGS instead
According to other sources, opt_ipfilter.h not supposed to be included for
modules
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.6 2000/08/01 00:10:08 ache Exp $ 
d10 1
a10 1
# If you don't want long functionality remove -DIPFILTER_LOG
@


1.6
log
@Fix prev. commit: NIPFILTER -> IPFILTER
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.5 2000/07/31 23:58:38 ache Exp $ 
d6 1
a6 1
	ip_log.c ip_fil.c fil.c opt_ipfilter.h
d8 1
a8 1
CFLAGS+= -DIPFILTER_LKM -DIPFILTER_LOG
a11 3

opt_ipfilter.h:
	echo "#define IPFILTER 1" > opt_ipfilter.h
@


1.5
log
@Generate opt_ipfilter.h to fix 'make depend'
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.4 2000/05/27 01:13:50 peter Exp $ 
d14 1
a14 1
	echo "#define NIPFILTER 1" > opt_ipfilter.h
@


1.4
log
@Use .include <bsd.kmod.mk> to get to ../../*/conf/kmod.mk instead of
encoding the relative path.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.3 2000/05/04 12:07:32 peter Exp $ 
d6 1
a6 1
	ip_log.c ip_fil.c fil.c
d12 3
@


1.3
log
@Pull in sys/conf/kmod.mk, rather than /usr/share/mk/bsd.kmod.mk.
This means that the kernel can be totally self contained now and is not
dependent on the last buildworld to update /usr/share/mk.  This might
also make it easier to build 5.x kernels on 4.0 boxes etc, assuming
gensetdefs and config(8) are updated.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.2 1999/12/06 20:33:37 guido Exp $ 
d13 1
a13 1
.include "${.CURDIR}/../../conf/kmod.mk"
@


1.2
log
@Add forgotten ip_fil.c and fil.c to kld version

Remove mlfk_ipl.c from here: no sources allowed in these directories!
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.1 1999/11/23 22:18:17 guido Exp $ 
d13 1
a13 1
.include <bsd.kmod.mk>
@


1.2.2.1
log
@MFC: Typo fix
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.2 1999/12/06 20:33:37 guido Exp $ 
d10 1
a10 1
# If you don't want log functionality remove -DIPFILTER_LOG
@


1.2.2.2
log
@MFC: Relocate IPFilter.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.2.2.1 2000/09/04 04:00:13 gshapiro Exp $ 
d3 1
a3 1
.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
a8 1
CFLAGS+=  -I${.CURDIR}/../../contrib/ipfilter
@


1.2.2.3
log
@MFC: unless NOINET6 is defined, compile IPv6 code in by default.

PR: 57730
@
text
@d1 1
a1 1
# $FreeBSD$ 
a7 3
.if !defined(NOINET6)
CFLAGS+= -DUSE_INET6
.endif
@


1.2.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/modules/ipfilter/Makefile 131629 2004-07-05 16:23:17Z darrenr $ 
@


1.1
log
@Add ipfilter kld and wire it in.
@
text
@d1 1
a1 1
# $FreeBSD$ 
d6 1
a6 1
	ip_log.c
@

