head	1.9;
access;
symbols
	RELENG_8_4:1.9.0.2
	RELENG_9_1_0_RELEASE:1.8.4.1.4.2
	RELENG_9_1:1.8.4.1.0.4
	RELENG_9_1_BP:1.8.4.1
	RELENG_8_3_0_RELEASE:1.8.2.1.8.1
	RELENG_8_3:1.8.2.1.0.8
	RELENG_8_3_BP:1.8.2.1
	RELENG_9_0_0_RELEASE:1.8.4.1.2.1
	RELENG_9_0:1.8.4.1.0.2
	RELENG_9_0_BP:1.8.4.1
	RELENG_9:1.8.0.4
	RELENG_9_BP:1.8
	RELENG_7_4_0_RELEASE:1.7.2.1.8.1
	RELENG_8_2_0_RELEASE:1.8.2.1.6.1
	RELENG_7_4:1.7.2.1.0.8
	RELENG_7_4_BP:1.7.2.1
	RELENG_8_2:1.8.2.1.0.6
	RELENG_8_2_BP:1.8.2.1
	RELENG_8_1_0_RELEASE:1.8.2.1.4.1
	RELENG_8_1:1.8.2.1.0.4
	RELENG_8_1_BP:1.8.2.1
	RELENG_7_3_0_RELEASE:1.7.2.1.6.1
	RELENG_7_3:1.7.2.1.0.6
	RELENG_7_3_BP:1.7.2.1
	RELENG_8_0_0_RELEASE:1.8.2.1.2.1
	RELENG_8_0:1.8.2.1.0.2
	RELENG_8_0_BP:1.8.2.1
	RELENG_8:1.8.0.2
	RELENG_8_BP:1.8
	RELENG_7_2_0_RELEASE:1.7.2.1.4.1
	RELENG_7_2:1.7.2.1.0.4
	RELENG_7_2_BP:1.7.2.1
	RELENG_7_1_0_RELEASE:1.7.2.1.2.1
	RELENG_6_4_0_RELEASE:1.6.2.1.2.1
	RELENG_7_1:1.7.2.1.0.2
	RELENG_7_1_BP:1.7.2.1
	RELENG_6_4:1.6.2.1.0.2
	RELENG_6_4_BP:1.6.2.1
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.6
	RELENG_7_0:1.7.0.4
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.6.0.10
	RELENG_6_3_BP:1.6
	RELENG_7:1.7.0.2
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.6
	RELENG_6_2:1.6.0.8
	RELENG_6_2_BP:1.6
	RELENG_5_5_0_RELEASE:1.2.2.1
	RELENG_5_5:1.2.2.1.0.4
	RELENG_5_5_BP:1.2.2.1
	RELENG_6_1_0_RELEASE:1.6
	RELENG_6_1:1.6.0.6
	RELENG_6_1_BP:1.6
	RELENG_6_0_0_RELEASE:1.6
	RELENG_6_0:1.6.0.4
	RELENG_6_0_BP:1.6
	RELENG_6:1.6.0.2
	RELENG_6_BP:1.6
	RELENG_5_4_0_RELEASE:1.2.2.1
	RELENG_5_4:1.2.2.1.0.2
	RELENG_5_4_BP:1.2.2.1
	RELENG_5_3_0_RELEASE:1.2
	RELENG_5_3:1.2.0.4
	RELENG_5_3_BP:1.2
	RELENG_5:1.2.0.2
	RELENG_5_BP:1.2;
locks; strict;
comment	@# @;


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

1.8
date	2008.08.22.16.00.48;	author roberto;	state Exp;
branches
	1.8.2.1
	1.8.4.1;
next	1.7;

1.7
date	2006.03.17.18.54.41;	author ru;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2005.01.28.16.08.10;	author ru;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2004.12.21.10.16.03;	author ru;	state Exp;
branches;
next	1.4;

1.4
date	2004.12.21.08.47.33;	author ru;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.24.15.33.04;	author ru;	state Exp;
branches;
next	1.2;

1.2
date	2004.07.22.09.10.52;	author roberto;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2004.07.20.15.44.31;	author roberto;	state Exp;
branches;
next	;

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

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

1.8.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.8.2.1.2.1
	1.8.2.1.4.1
	1.8.2.1.6.1
	1.8.2.1.8.1;
next	1.8.2.2;

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

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

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

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

1.8.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.8.2.1.8.2;

1.8.2.1.8.2
date	2012.11.17.08.25.56;	author svnexp;	state Exp;
branches;
next	;

1.8.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.8.4.1.2.1
	1.8.4.1.4.1;
next	1.8.4.2;

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

1.8.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.8.4.1.2.2;

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

1.8.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.8.4.1.4.2;

1.8.4.1.4.2
date	2012.11.17.08.48.34;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2008.09.03.08.49.07;	author roberto;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1
	1.7.2.1.6.1
	1.7.2.1.8.1;
next	1.7.2.2;

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

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

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

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

1.7.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.2.1.8.2;

1.7.2.1.8.2
date	2012.11.17.08.17.49;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2008.09.04.12.49.54;	author roberto;	state Exp;
branches
	1.6.2.1.2.1;
next	1.6.2.2;

1.6.2.2
date	2012.11.17.07.46.28;	author svnexp;	state Exp;
branches;
next	;

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

1.2.2.1
date	2005.02.13.07.23.43;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $

NO_MAN=

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../../contrib/ntp/util \
       ${.CURDIR}/../../../contrib/ntp/ntpd

PROG=	ntp-keygen
SRCS=	ntp-keygen.c ntp-keygen-opts.c

CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
	-I${.CURDIR}/../../../contrib/ntp/libopts

DPADD=	${LIBNTP} ${LIBOPTS}
LDADD=	${LIBNTP} ${LIBOPTS}

.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
DPADD+=	${LIBMD} ${LIBCRYPTO}
LDADD+=	-lmd -lcrypto
.endif

.include <bsd.prog.mk>
@


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


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 24
# $FreeBSD: releng/8.4/usr.sbin/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $

NO_MAN=

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../../contrib/ntp/util \
       ${.CURDIR}/../../../contrib/ntp/ntpd

PROG=	ntp-keygen
SRCS=	ntp-keygen.c ntp-keygen-opts.c

CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
	-I${.CURDIR}/../../../contrib/ntp/libopts

DPADD=	${LIBNTP} ${LIBOPTS}
LDADD=	${LIBNTP} ${LIBOPTS}

.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
DPADD+=	${LIBMD} ${LIBCRYPTO}
LDADD+=	-lmd -lcrypto
.endif

.include <bsd.prog.mk>
@


1.8
log
@SVN rev 182008 on 2008-08-22 16:00:48Z by roberto

Update the various files to sync with vendor import of 4.2.4p5.
sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy.  It is an internal library, not
installed.

MFC after:	2 weeks
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8.4.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.4.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/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $
@


1.8.4.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.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $
@


1.8.4.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.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $
@


1.8.2.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.8.2.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/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $
@


1.8.2.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.8.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/ntp/ntp-keygen/Makefile 182008 2008-08-22 16:00:48Z roberto $
@


1.8.2.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.8.2.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.8.2.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.7
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
@d11 1
d13 2
a14 1
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
d16 2
a17 2
DPADD=	${LIBNTP}
LDADD=	${LIBNTP}
@


1.7.2.1
log
@SVN rev 182716 on 2008-09-03 08:49:07Z by roberto

MFH ntpd 4.2.4p5.

Approved by:	re (kensmith)
@
text
@a10 1
SRCS=	ntp-keygen.c ntp-keygen-opts.c
d12 1
a12 2
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
	-I${.CURDIR}/../../../contrib/ntp/libopts
d14 2
a15 2
DPADD=	${LIBNTP} ${LIBOPTS}
LDADD=	${LIBNTP} ${LIBOPTS}
@


1.7.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/ntp/ntp-keygen/Makefile 182716 2008-09-03 08:49:07Z roberto $
@


1.7.2.1.8.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.7.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/ntp/ntp-keygen/Makefile 182716 2008-09-03 08:49:07Z roberto $
@


1.7.2.1.6.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.7.2.1.4.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.7.2.1.2.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.6
log
@Let bsd.prog.mk set SRCS and MAN to their default values.
@
text
@d3 4
a10 1
NO_MAN=
d17 1
a17 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.6.2.1
log
@SVN rev 182752 on 2008-09-04 12:49:54Z by roberto

MFH ntpd 4.2.4p5.

Main difference with the stable/7 merge is that 6.x does not support -lrt and
the corresponding *timer functions.

Approved by:	re (kensmith)
@
text
@a2 4
NO_MAN=

.include <bsd.own.mk>

d7 1
a7 1
SRCS=	ntp-keygen.c ntp-keygen-opts.c
d9 1
a9 2
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
	-I${.CURDIR}/../../../contrib/ntp/libopts
d11 2
a12 2
DPADD=	${LIBNTP} ${LIBOPTS}
LDADD=	${LIBNTP} ${LIBOPTS}
@


1.6.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/ntp/ntp-keygen/Makefile 182752 2008-09-04 12:49:54Z roberto $
@


1.6.2.1.2.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.5
log
@NOCRYPT -> NO_CRYPT
@
text
@a7 1
SRCS=	ntp-keygen.c
@


1.4
log
@Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by:	core
@
text
@d15 1
a15 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.3
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d7 1
a7 1
NOMAN=
@


1.2
log
@Include support for NOCRYPT & NO_OPENSSL world.

It does survive  make release .

Uses an upcoming patch from the vendor branch (ntp-stable) of ntp-keygen.

Submitted by:	Marius Strobl <marius@@alchemy.franken.de>
@
text
@d7 1
a7 1
NOMAN=	yes
@


1.2.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d7 1
a7 1
NOMAN=
@


1.1
log
@Update our ntpd to the long awaited 4.2.0 version.

This bring us several things:
- updated drivers
- IPv6 support at last
- ntp-genkeys is replaced by ntp-keygen
- ntptrace is now a script (courtesy of John Hay)
- lots of renamed files from .htm to .html (while I prefer .html, I
  find the change a bit gratuitous)
- still no manpages :(

Please test and report.

Commit very much helped by: GNU arch (http://gnuarch.org/)
@
text
@d12 7
a18 2
DPADD=	${LIBNTP} ${LIBMD} ${LIBCRYPTO}
LDADD=	${LIBNTP} -lmd -lcrypto
@

