head	1.9;
access;
symbols
	RELENG_8_4:1.9.0.2
	RELENG_9_1_0_RELEASE:1.8.2.1.4.2
	RELENG_9_1:1.8.2.1.0.4
	RELENG_9_1_BP:1.8.2.1
	RELENG_8_3_0_RELEASE:1.6.10.1.8.1
	RELENG_8_3:1.6.10.1.0.8
	RELENG_8_3_BP:1.6.10.1
	RELENG_9_0_0_RELEASE:1.8.2.1.2.1
	RELENG_9_0:1.8.2.1.0.2
	RELENG_9_0_BP:1.8.2.1
	RELENG_9:1.8.0.2
	RELENG_9_BP:1.8
	RELENG_7_4_0_RELEASE:1.6.14.1
	RELENG_8_2_0_RELEASE:1.6.10.1.6.1
	RELENG_7_4:1.6.0.14
	RELENG_7_4_BP:1.6
	RELENG_8_2:1.6.10.1.0.6
	RELENG_8_2_BP:1.6.10.1
	RELENG_8_1_0_RELEASE:1.6.10.1.4.1
	RELENG_8_1:1.6.10.1.0.4
	RELENG_8_1_BP:1.6.10.1
	RELENG_7_3_0_RELEASE:1.6.12.1
	RELENG_7_3:1.6.0.12
	RELENG_7_3_BP:1.6
	RELENG_8_0_0_RELEASE:1.6.10.1.2.1
	RELENG_8_0:1.6.10.1.0.2
	RELENG_8_0_BP:1.6.10.1
	RELENG_8:1.6.0.10
	RELENG_8_BP:1.6
	RELENG_7_2_0_RELEASE:1.6.8.1
	RELENG_7_2:1.6.0.8
	RELENG_7_2_BP:1.6
	RELENG_7_1_0_RELEASE:1.6.6.1
	RELENG_6_4_0_RELEASE:1.4.2.1.10.1
	RELENG_7_1:1.6.0.6
	RELENG_7_1_BP:1.6
	RELENG_6_4:1.4.2.1.0.10
	RELENG_6_4_BP:1.4.2.1
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.4.2.1
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.4.2.1.0.8
	RELENG_6_3_BP:1.4.2.1
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.4.2.1
	RELENG_6_2:1.4.2.1.0.6
	RELENG_6_2_BP:1.4.2.1
	RELENG_5_5_0_RELEASE:1.3.2.3
	RELENG_5_5:1.3.2.3.0.2
	RELENG_5_5_BP:1.3.2.3
	RELENG_6_1_0_RELEASE:1.4.2.1
	RELENG_6_1:1.4.2.1.0.4
	RELENG_6_1_BP:1.4.2.1
	RELENG_6_0_0_RELEASE:1.4.2.1
	RELENG_6_0:1.4.2.1.0.2
	RELENG_6_0_BP:1.4.2.1
	RELENG_6:1.4.0.2
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.3.2.2
	RELENG_5_4:1.3.2.2.0.4
	RELENG_5_4_BP:1.3.2.2
	RELENG_5_3_0_RELEASE:1.3.2.2
	RELENG_5_3:1.3.2.2.0.2
	RELENG_5_3_BP:1.3.2.2
	RELENG_5:1.3.0.2;
locks; strict;
comment	@# @;


1.9
date	2012.11.17.01.54.50;	author svnexp;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2011.07.16.11.20.54;	author dougb;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2010.01.02.11.07.44;	author ed;	state Exp;
branches;
next	1.6;

1.6
date	2007.06.02.23.19.58;	author dougb;	state Exp;
branches
	1.6.2.1
	1.6.6.1
	1.6.8.1
	1.6.10.1
	1.6.12.1
	1.6.14.1;
next	1.5;

1.5
date	2005.07.25.14.44.11;	author des;	state Exp;
branches;
next	1.4;

1.4
date	2004.09.26.06.36.11;	author dougb;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2004.09.24.13.42.00;	author ru;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2004.09.22.12.13.57;	author des;	state Exp;
branches;
next	1.1;

1.1
date	2004.09.21.19.01.47;	author des;	state Exp;
branches;
next	;

1.9.2.1
date	2012.11.17.01.54.50;	author svnexp;	state dead;
branches;
next	1.9.2.2;

1.9.2.2
date	2013.03.28.13.06.19;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.8.2.1.2.1
	1.8.2.1.4.1;
next	1.8.2.2;

1.8.2.2
date	2012.11.17.11.37.45;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.8.2.1.2.2;

1.8.2.1.2.2
date	2012.11.17.08.37.42;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.8.2.1.4.2;

1.8.2.1.4.2
date	2012.11.17.08.48.33;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.08.09.03;	author svnexp;	state Exp;
branches;
next	;

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

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

1.6.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.6.10.1.2.1
	1.6.10.1.4.1
	1.6.10.1.6.1
	1.6.10.1.8.1;
next	1.6.10.2;

1.6.10.2
date	2012.11.17.10.37.24;	author svnexp;	state Exp;
branches;
next	1.6.10.3;

1.6.10.3
date	2013.02.11.12.33.29;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.6.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.10.1.8.2;

1.6.10.1.8.2
date	2012.11.17.08.25.55;	author svnexp;	state Exp;
branches;
next	;

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

1.6.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.14.2;

1.6.14.2
date	2012.11.17.08.17.48;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2005.07.30.07.56.28;	author des;	state Exp;
branches
	1.4.2.1.10.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.07.46.26;	author svnexp;	state Exp;
branches;
next	;

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

1.3.2.1
date	2004.09.26.03.10.18;	author des;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2004.09.30.23.36.10;	author dougb;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2005.08.06.03.48.18;	author dougb;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/named-checkconf/Makefile 224093 2011-07-16 11:20:54Z dougb $

BIND_DIR=	${.CURDIR}/../../contrib/bind9
LIB_BIND_REL=	../../lib/bind
LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
SRCDIR=		${BIND_DIR}/bin/check

.include	"${LIB_BIND_DIR}/config.mk"

PROG=		named-checkconf

.PATH: ${SRCDIR}
SRCS+=		named-checkconf.c check-tool.c

CFLAGS+=	-I${LIB_BIND_DIR}
CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include

WARNS?=		3

DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

MAN=		named-checkconf.8

MANFILTER=	sed -e "s@@/etc/named\.conf@@/etc/namedb/named.conf@@g"

.include <bsd.prog.mk>
@


1.9.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:19 +0000
@
text
@d1 27
@


1.9.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 25
# $FreeBSD: releng/8.4/usr.sbin/named-checkconf/Makefile 246656 2013-02-11 09:42:34Z delphij $

BIND_DIR=	${.CURDIR}/../../contrib/bind9
LIB_BIND_REL=	../../lib/bind
LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
SRCDIR=		${BIND_DIR}/bin/check

.include	"${LIB_BIND_DIR}/config.mk"

PROG=		named-checkconf

.PATH: ${SRCDIR}
SRCS+=		named-checkconf.c check-tool.c

CFLAGS+=	-I${LIB_BIND_DIR}
CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include

DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

MAN=		named-checkconf.8

MANFILTER=	sed -e "s@@/etc/named\.conf@@/etc/namedb/named.conf@@g"

.include <bsd.prog.mk>
@


1.8
log
@SVN rev 224093 on 2011-07-16 11:20:54Z by dougb

bmake and other updates necessary for the BIND 9.8.x upgrade.

This includes a structural change regarding atomic ops. Previously they
were enabled on all platforms unless we had knowledge that they did not
work. However both work performed by marius@@ on sparc64 and the fact that
the 9.8.x branch is fussier in this area has demonstrated that this is
not a safe approach. So I've modified a patch provided by marius to
enable them for i386, amd64, and ia64 only.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8.2.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.8.2.2
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/usr.sbin/named-checkconf/Makefile 224093 2011-07-16 11:20:54Z dougb $
@


1.8.2.1.4.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.8.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/named-checkconf/Makefile 224093 2011-07-16 11:20:54Z dougb $
@


1.8.2.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.8.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/named-checkconf/Makefile 224093 2011-07-16 11:20:54Z dougb $
@


1.7
log
@SVN rev 201390 on 2010-01-02 11:07:44Z by ed

The last big commit: let usr.sbin/ use WARNS=6 by default.
@
text
@d16 1
@


1.6
log
@Update bmake glue for the BIND 9.4.1 import.

This includes a return to building with threads, since one of the
major focuses of the 9.4.x branch is to improve thread performance.
@
text
@d17 2
@


1.6.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/named-checkconf/Makefile 170221 2007-06-02 23:19:58Z dougb $
@


1.6.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.6.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/named-checkconf/Makefile 170221 2007-06-02 23:19:58Z dougb $
@


1.6.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.6.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.6.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/usr.sbin/named-checkconf/Makefile 170221 2007-06-02 23:19:58Z dougb $
@


1.6.10.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246656
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/named-checkconf/Makefile 246656 2013-02-11 09:42:34Z delphij $
a15 1
CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
@


1.6.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.6.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/named-checkconf/Makefile 170221 2007-06-02 23:19:58Z dougb $
@


1.6.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.6.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.6.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.6.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.6.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.5
log
@Disable thread support in BIND.  It appears to reduce performance rather
than increase it, and seems to be the cause of the memory leaks which some
users have reported.

Requested by:	dougb
MFC after:	5 days
@
text
@d17 2
a18 2
DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
@


1.4
log
@Fix up the man file installation for the new BIND 9 sources:

1. Install man files and links for the lwres library.

2. Fix the path in various files to say /etc/namedb/ instead of just /etc.

3. Correctly install the conf file man pages for named and rndc.
@
text
@d17 2
a18 2
DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
@


1.4.2.1
log
@MFC: build BIND without thread support.

Approved by:	re (kensmith)
@
text
@d17 2
a18 2
DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
@


1.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/named-checkconf/Makefile 148561 2005-07-30 07:56:28Z des $
@


1.4.2.1.10.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.3
log
@Don't expose BIND libraries and their headers to the public by default,
but have a knob (WANT_BIND_LIBS) to build and install them in /usr/lib
and /usr/include.  Rumors are that this may be useful at a later point,
let's see.

What this really means is that all BIND libraries are now internal to
buildworld (by default, unless WANT_BIND_LIBS is defined), and linked
statically into various BIND executables.

While here, removed redundant -I's from CFLAGS in lib/bind makefiles.

Sponsored by:	des
OK'ed by:	dougb
@
text
@d22 2
@


1.3.2.1
log
@MFC: BIND 9 and related bits.

Approved by:	re
@
text
@@


1.3.2.2
log
@MFC the BIND 9 import and chroot-by-default work up to date.

This includes:
1. More granular NO_BIND_* make knobs.
2. WITH_BIND_LIBS make knob.
3. Run in an automatically configured chroot dir by default.
4. Edit paths in man pages, and install man pages for liblwres.
5. Improve named.conf and make it work with the new structure.
6. Install the bind9 docs.
7. A few Makefile style fixes.

Approved by:	re (scottl)
@
text
@a21 2
MANFILTER=	sed -e "s@@/etc/named\.conf@@/etc/namedb/named.conf@@g"

@


1.3.2.3
log
@MFC the removal of threading from BIND.

Original work by:	des
@
text
@d17 2
a18 2
DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
@


1.2
log
@Clean up and comment config.mk.  Centralize more stuff.  Bitch if
POSIX threads libraries are not available.  Add crypto support if
the crypto libraries are available.  Build dnssec-{keygen,signzone}
if crypto is available.

Submitted by:	(in part) dougb@@
@
text
@d4 2
a5 1
LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
@


1.1
log
@Switch from BIND 8 to BIND 9.

Submitted by:	(in part) dougb@@, trhodes@@
Reviewed by:	dougb@@, trhodes@@, re@@
MFC after:	5 days
@
text
@d16 2
a17 2
DPADD+=		${BIND_DPADD}
LDADD+=		${BIND_LDADD}
@

