diff -urN src/usr.sbin/ntp/Makefile src.ntp/usr.sbin/ntp/Makefile --- src/usr.sbin/ntp/Makefile 2009-12-15 15:59:58.000000000 +0100 +++ src.ntp/usr.sbin/ntp/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,7 +1,7 @@ # Makefile for ntpd. # $FreeBSD: src/usr.sbin/ntp/Makefile,v 1.14 2009/12/15 14:59:58 roberto Exp $ -SUBDIR= libopts libntp libparse ntpd ntpdc ntpq ntpdate \ +SUBDIR= libopts libntp libparse ntpd ntpdate ntpdc ntpq \ ntptime ntp-keygen sntp SUBDIR+= doc diff -urN src/usr.sbin/ntp/config.h src.ntp/usr.sbin/ntp/config.h --- src/usr.sbin/ntp/config.h 2009-12-26 19:32:35.000000000 +0100 +++ src.ntp/usr.sbin/ntp/config.h 2010-07-22 01:08:30.000000000 +0200 @@ -1,6 +1,8 @@ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/usr.sbin/ntp/config.h,v 1.17 2009/12/26 18:32:35 ed Exp $ */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ /* Is adjtime() accurate? */ /* #undef ADJTIME_IS_ACCURATE */ @@ -161,7 +163,7 @@ /* Zyfer GPStarplus */ /* #undef CLOCK_ZYFER */ -/* Enable debugging? */ +/* Enable ntpd debugging code? */ /* #undef DEBUG */ /* Enable processing time debugging? */ @@ -266,6 +268,12 @@ /* What is the fallback value for HZ? */ #define DEFAULT_HZ 100 +/* Directory separator character, usually / or \\ */ +#define DIR_SEP '/' + +/* use old autokey session key behavior? */ +/* #undef DISABLE_BUG1243_FIX */ + /* synch TODR hourly? */ /* #undef DOSYNCTODR */ @@ -278,6 +286,9 @@ /* fopen(3) accepts a 't' in the mode flag */ #define FOPEN_TEXT_FLAG "t" +/* Force deferred DNS lookups? */ +/* #undef FORCE_DEFER_DNS */ + /* force ntpdate to step the clock if !defined(STEP_SLEW) ? */ /* #undef FORCE_NTPDATE_STEP */ @@ -291,7 +302,7 @@ #define HAVE_ARPA_NAMESER_H 1 /* Do we have audio support? */ -#define HAVE_AUDIO 1 +#define HAVE_AUDIO /**/ /* Define to 1 if you have the header file. */ /* #undef HAVE_BSTRING_H */ @@ -333,18 +344,15 @@ /* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1 -/* Define to 1 if you have the `EVP_md2' function. */ -/* #undef HAVE_EVP_MD2 */ - -/* Define to 1 if you have the `EVP_mdc2' function. */ -/* #undef HAVE_EVP_MDC2 */ - /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `finite' function. */ /* #undef HAVE_FINITE */ +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + /* Define to 1 if you have the `getbootfile' function. */ #define HAVE_GETBOOTFILE 1 @@ -357,12 +365,21 @@ /* Define to 1 if you have the `getifaddrs' function. */ #define HAVE_GETIFADDRS 1 +/* Define to 1 if you have the `getpassphrase' function. */ +/* #undef HAVE_GETPASSPHRASE */ + /* Define to 1 if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 +/* Define to 1 if you have the header file. */ +#define HAVE_HISTEDIT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_HISTORY_H */ + /* Define to 1 if you have the `hstrerror' function. */ #define HAVE_HSTRERROR 1 @@ -372,9 +389,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_IEEEFP_H 1 -/* ISC: Use iflist_sysctl? */ +/* have iflist_sysctl? */ #define HAVE_IFLIST_SYSCTL 1 +/* inline keyword or macro available */ +#define HAVE_INLINE 1 + /* Define to 1 if the system has the type `int16_t'. */ #define HAVE_INT16_T 1 @@ -390,24 +410,21 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Do we have IPTOS support? */ +#define HAVE_IPTOS_SUPPORT 1 + /* Define to 1 if you have the `isfinite' function. */ #define HAVE_ISFINITE 1 +/* Define to 1 if you have the header file. */ +#define HAVE_KVM_H 1 + /* Define to 1 if you have the `kvm_open' function. */ #define HAVE_KVM_OPEN 1 -/* Define to 1 if you have the `K_open' function. */ -/* #undef HAVE_K_OPEN */ - /* Define to 1 if you have the `advapi32' library (-ladvapi32). */ /* #undef HAVE_LIBADVAPI32 */ -/* Do we have the curses library? */ -/* #undef HAVE_LIBCURSES */ - -/* Do we have the edit library? */ -/* #undef HAVE_LIBEDIT */ - /* Define to 1 if you have the `elf' library (-lelf). */ #define HAVE_LIBELF 1 @@ -423,35 +440,23 @@ /* Define to 1 if you have the `ld' library (-lld). */ /* #undef HAVE_LIBLD */ -/* Define to 1 if you have the `md' library (-lmd). */ -#define HAVE_LIBMD 1 - -/* Define to 1 if you have the `md5' library (-lmd5). */ -/* #undef HAVE_LIBMD5 */ - /* Define to 1 if you have the `mld' library (-lmld). */ /* #undef HAVE_LIBMLD */ -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ +/* Define to 1 if you have the `netsnmp' library (-lnetsnmp). */ +/* #undef HAVE_LIBNETSNMP */ /* Define to 1 if you have the `posix4' library (-lposix4). */ /* #undef HAVE_LIBPOSIX4 */ -/* Define to 1 if you have the `readline' library (-lreadline). */ -/* #undef HAVE_LIBREADLINE */ +/* Define to 1 if you have the `resolv' library (-lresolv). */ +/* #undef HAVE_LIBRESOLV */ /* Define to 1 if you have the `rt' library (-lrt). */ #define HAVE_LIBRT 1 -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - -/* Define to 1 if you have the `syslog' library (-lsyslog). */ -/* #undef HAVE_LIBSYSLOG */ - -/* Define to 1 if you have the `xnet' library (-lxnet). */ -/* #undef HAVE_LIBXNET */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBSCF_H */ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 @@ -496,9 +501,7 @@ #define HAVE_MKTIME 1 /* Define to 1 if you have the `mlockall' function. */ -#if __FreeBSD_version >= 500102 #define HAVE_MLOCKALL 1 -#endif /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 @@ -548,9 +551,15 @@ /* Define to 1 if you have the `ntp_gettime' function. */ #define HAVE_NTP_GETTIME 1 +/* Do we want support for Samba's signing daemon? */ +/* #undef HAVE_NTP_SIGND */ + /* Define this if pathfind(3) works */ /* #undef HAVE_PATHFIND */ +/* Define to 1 if the system has the type `pid_t'. */ +#define HAVE_PID_T 1 + /* Define to 1 if you have the `plock' function. */ /* #undef HAVE_PLOCK */ @@ -560,20 +569,23 @@ /* Do we have the PPS API per the Draft RFC? */ #define HAVE_PPSAPI 1 -/* Are function prototypes OK? */ -#define HAVE_PROTOTYPES 1 - /* Define to 1 if you have the `pututline' function. */ /* #undef HAVE_PUTUTLINE */ /* Define to 1 if you have the `pututxline' function. */ -/* #undef HAVE_PUTUTXLINE */ +#define HAVE_PUTUTXLINE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_READLINE_H */ + +/* Define if your readline library has \`add_history' */ +/* #undef HAVE_READLINE_HISTORY */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_READLINE_HISTORY_H */ +#define HAVE_READLINE_HISTORY_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_READLINE_READLINE_H */ +#define HAVE_READLINE_READLINE_H 1 /* Define to 1 if you have the `readlink' function. */ #define HAVE_READLINK 1 @@ -587,20 +599,26 @@ /* Define to 1 if you have the header file. */ #define HAVE_RESOLV_H 1 +/* Define to 1 if you have the `res_init' function. */ +#define HAVE_RES_INIT 1 + +/* Do we have Linux routing socket? */ +/* #undef HAVE_RTNETLINK */ + /* Define to 1 if you have the `rtprio' function. */ #define HAVE_RTPRIO 1 -/* Should be obvious... */ -#define HAVE_SA_LEN_IN_STRUCT_SOCKADDR 1 +/* Define to 1 if you have the header file. */ +#define HAVE_RUNETYPE_H 1 /* Obvious... */ #define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ +#define HAVE_SCHED_H 1 /* Define to 1 if you have the `sched_setscheduler' function. */ -/* #undef HAVE_SCHED_SETSCHEDULER */ +#define HAVE_SCHED_SETSCHEDULER 1 /* Define to 1 if you have the header file. */ #define HAVE_SETJMP_H 1 @@ -639,7 +657,7 @@ /* #undef HAVE_SIGNALED_IO */ /* Define to 1 if you have the `sigset' function. */ -/* #undef HAVE_SIGSET */ +#define HAVE_SIGSET 1 /* Define to 1 if you have the `sigsuspend' function. */ #define HAVE_SIGSUSPEND 1 @@ -647,14 +665,14 @@ /* Define to 1 if you have the `sigvec' function. */ #define HAVE_SIGVEC 1 +/* Define to 1 if the system has the type `size_t'. */ +#define HAVE_SIZE_T 1 + /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 -/* Does struct sockaddr_storage have ss_family? */ -#define HAVE_SS_FAMILY_IN_SS 1 - -/* Does struct sockaddr_storage have ss_len? */ -#define HAVE_SS_LEN_IN_SS 1 +/* Are Solaris privileges available? */ +/* #undef HAVE_SOLARIS_PRIVS */ /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 @@ -689,13 +707,16 @@ /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 +/* Define to 1 if you have the `strsignal' function. */ +#define HAVE_STRSIGNAL 1 + /* Define to 1 if you have the `strstr' function. */ #define HAVE_STRSTR 1 /* Do we have struct ntptimeval? */ #define HAVE_STRUCT_NTPTIMEVAL 1 -/* Define to 1 if `time.tv_nsec' is member of `struct ntptimeval'. */ +/* Define to 1 if `time.tv_nsec' is a member of `struct ntptimeval'. */ #define HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC 1 /* Does a system header define struct ppsclockev? */ @@ -704,9 +725,6 @@ /* Do we have struct snd_size? */ #define HAVE_STRUCT_SND_SIZE 1 -/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */ -#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1 - /* Does a system header define struct sockaddr_storage? */ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 @@ -757,7 +775,7 @@ /* #undef HAVE_SYS_LIMITS_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_LOCK_H */ +#define HAVE_SYS_LOCK_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_MMAN_H 1 @@ -943,10 +961,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_UTIME_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +/* Define HAVE_UTMPX_H to 1 if you have the header file. */ +#define HAVE_UTMPX_H 1 -/* Define to 1 if you have the header file. */ +/* Define HAVE_UTMP_H to 1 if you have the header file */ /* #undef HAVE_UTMP_H */ /* Define to 1 if you have the header file. */ @@ -955,6 +973,12 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_VARARGS_H */ +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 @@ -964,6 +988,21 @@ /* Define to 1 if you have the `vsprintf' function. */ #define HAVE_VSPRINTF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if the system has the type `wchar_t'. */ +#define HAVE_WCHAR_T 1 + +/* Define to 1 if the system has the type `wint_t'. */ +#define HAVE_WINT_T 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE__SYS_SYNC_QUEUE_H */ @@ -976,12 +1015,34 @@ /* Define to 1 if you have the `__ntp_gettime' function. */ /* #undef HAVE___NTP_GETTIME */ +/* Define to 1 if you have the `__res_init' function. */ +#define HAVE___RES_INIT 1 + /* Does struct sockaddr_storage have __ss_family? */ /* #undef HAVE___SS_FAMILY_IN_SS */ + + /* Handle sockaddr_storage.__ss_family */ + #ifdef HAVE___SS_FAMILY_IN_SS + # define ss_family __ss_family + #endif /* HAVE___SS_FAMILY_IN_SS */ + + + /* Does struct sockaddr_storage have __ss_len? */ /* #undef HAVE___SS_LEN_IN_SS */ + + /* Handle sockaddr_storage.__ss_len */ + #ifdef HAVE___SS_LEN_IN_SS + # define ss_len __ss_len + #endif /* HAVE___SS_LEN_IN_SS */ + + + +/* [Retry queries on _any_ DNS error?] */ +/* #undef IGNORE_DNS_ERRORS */ + /* Should we use the IRIG sawtooth filter? */ /* #undef IRIG_SUCKS */ @@ -991,34 +1052,34 @@ /* ISC: do we have if_nametoindex()? */ #define ISC_PLATFORM_HAVEIFNAMETOINDEX 1 -/* ISC: have struct if_laddrconf? */ +/* have struct if_laddrconf? */ /* #undef ISC_PLATFORM_HAVEIF_LADDRCONF */ -/* ISC: have struct if_laddrreq? */ +/* have struct if_laddrreq? */ /* #undef ISC_PLATFORM_HAVEIF_LADDRREQ */ -/* ISC: Have struct in6_pktinfo? */ -#define ISC_PLATFORM_HAVEIN6PKTINFO - -/* ISC: Have IPv6? */ -#define ISC_PLATFORM_HAVEIPV6 +/* have struct in6_pktinfo? */ +#define ISC_PLATFORM_HAVEIN6PKTINFO /**/ -/* ISC: struct sockaddr as sa_len? */ -#define ISC_PLATFORM_HAVESALEN +/* have IPv6? */ +#define ISC_PLATFORM_HAVEIPV6 /**/ -/* ISC: Have sin6_scope_id? */ -#define ISC_PLATFORM_HAVESCOPEID +/* struct sockaddr has sa_len? */ +#define ISC_PLATFORM_HAVESALEN /**/ -/* ISC: provide inet_aton() */ -/* #undef ISC_PLATFORM_NEEDATON */ +/* have sin6_scope_id? */ +#define ISC_PLATFORM_HAVESCOPEID /**/ -/* ISC: Need in6addr_any? */ +/* missing in6addr_any? */ /* #undef ISC_PLATFORM_NEEDIN6ADDRANY */ +/* Do we need netinet6/in6.h? */ +/* #undef ISC_PLATFORM_NEEDNETINET6IN6H */ + /* ISC: provide inet_ntop() */ /* #undef ISC_PLATFORM_NEEDNTOP */ -/* Do we need our own in_port_t? */ +/* Declare in_port_t? */ /* #undef ISC_PLATFORM_NEEDPORTT */ /* ISC: provide inet_pton() */ @@ -1045,7 +1106,7 @@ /* Should we align with the NIST lockclock scheme? */ /* #undef LOCKCLOCK */ -/* Does the kernel support multicasting IP? */ +/* Does the target support multicast IP? */ #define MCAST 1 /* Should we recommend a minimum value for tickadj? */ @@ -1057,6 +1118,9 @@ /* Do we want the HPUX FindConfig()? */ /* #undef NEED_HPUX_FINDCONFIG */ +/* We need to provide netsnmp_daemonize() */ +/* #undef NEED_NETSNMP_DAEMONIZE */ + /* Do we need the qnx adjtime call? */ /* #undef NEED_QNX_ADJTIME */ @@ -1088,11 +1152,14 @@ /* #undef NO_OPTION_NAME_WARNINGS */ /* Is there a problem using PARENB and IGNPAR (IRIX)? */ -#define NO_PARENB_IGNPAR 1 +/* #undef NO_PARENB_IGNPAR */ /* Default location of crypto key info */ #define NTP_KEYSDIR "/etc/ntp" +/* Path to sign daemon rendezvous socket */ +/* #undef NTP_SIGND_PATH */ + /* Do we have ntp_{adj,get}time in libc? */ #define NTP_SYSCALLS_LIBC 1 @@ -1103,6 +1170,7 @@ #define ONCORE_SHMEM_STATUS 1 /* Use OpenSSL? */ +/* This is picked up from the command line in case we want OpenSSL */ /* #undef OPENSSL */ /* Should we open the broadcast socket? */ @@ -1122,26 +1190,26 @@ #define PACKAGE "ntp" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "roberto@FreeBSD.org" +#define PACKAGE_BUGREPORT "niclas.zeising@gmail.com" /* Define to the full name of this package. */ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.4p5" +#define PACKAGE_STRING "ntp 4.2.6p2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.4p5" +#define PACKAGE_VERSION "4.2.6p2" /* Do we have the ppsclock streams module? */ /* #undef PPS */ -/* PPS auxiliary interface for ATOM? */ -#define PPS_SAMPLE 1 - /* PARSE kernel PLL PPS support */ /* #undef PPS_SYNC */ @@ -1151,9 +1219,6 @@ /* Preset a value for 'tickadj'? */ #define PRESET_TICKADJ 500/hz -/* Define to 1 if the C compiler supports function prototypes. */ -#define PROTOTYPES 1 - /* Does qsort expect to work on "void *" stuff? */ #define QSORT_USES_VOID_P 1 @@ -1172,33 +1237,36 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void +/* saveconfig mechanism */ +#define SAVECONFIG 1 + /* Do we want the SCO clock hacks? */ /* #undef SCO5_CLOCK */ -/* The size of a `char*', as computed by sizeof. */ +/* The size of `char*', as computed by sizeof. */ #if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_CHARP 8 #else #define SIZEOF_CHARP 4 #endif -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 #endif -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -/* The size of a `signed char', as computed by sizeof. */ +/* The size of `signed char', as computed by sizeof. */ #define SIZEOF_SIGNED_CHAR 1 -/* The size of a `time_t', as computed by sizeof. */ +/* The size of `time_t', as computed by sizeof */ #if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_TIME_T 8 #else @@ -1223,14 +1291,16 @@ /* canonical system (cpu-vendor-os) of where we should run */ #if defined(__alpha__) #define STR_SYSTEM "alpha-undermydesk-freebsd" -#elif defined(__sparc64__) -#define STR_SYSTEM "sparc64-undermydesk-freebsd" #elif defined(__amd64__) #define STR_SYSTEM "amd64-undermydesk-freebsd" #elif defined(__ia64__) #define STR_SYSTEM "ia64-undermydesk-freebsd" -#else +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__i386__) #define STR_SYSTEM "i386-undermydesk-freebsd" +#else +#define STR_SYSTEM "unknown-undermydesk-freebsd" #endif /* Buggy syscall() (Solaris2.4)? */ @@ -1269,12 +1339,31 @@ /* Do we set process groups with -pid? */ /* #undef UDP_BACKWARDS_SETOWN */ -/* How do we create unsigned long constants? */ -#define ULONG_CONST(a) a ## UL - /* Must we have a CTTY for fsetown? */ #define USE_FSETOWNCTTY 1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + /* Can we use SIGPOLL for tty IO? */ /* #undef USE_TTY_SIGPOLL */ @@ -1282,35 +1371,18 @@ /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.4p5" +#define VERSION "4.2.6p2" -/* ISC: Want IPv6? */ -#define WANT_IPV6 1 +/* configure --enable-ipv6 */ +#define WANT_IPV6 /**/ /* Define this if a working libregex can be found */ #define WITH_LIBREGEX 1 -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined(__sparc64__) -#define WORDS_BIGENDIAN 1 -#endif - -/* Handle ss_family */ -#if !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE___SS_FAMILY_IN_SS) -# define ss_family __ss_family -#endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */ - -/* Handle ss_len */ -#if !defined(HAVE_SS_LEN_IN_SS) && defined(HAVE___SS_LEN_IN_SS) -# define ss_len __ss_len -#endif /* !defined(HAVE_SS_LEN_IN_SS) && defined(HAVE_SA_LEN_IN_SS) */ - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* # undef _ALL_SOURCE */ +#define WORDS_BIGENDIAN 1 #endif /* Define to 1 if on MINIX. */ @@ -1328,9 +1400,6 @@ /* # undef __CHAR_UNSIGNED__ */ #endif -/* Define like PROTOTYPES; this can be used by system headers. */ -#define __PROTOTYPES 1 - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -1343,10 +1412,13 @@ /* #undef inline */ #endif -/* Define to `long' if does not define. */ +/* Define to `long int' if does not define. */ /* #undef off_t */ -/* Define to `unsigned' if does not define. */ +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ /* Define to `long' if does not define. */ @@ -1355,8 +1427,8 @@ /* Define to `int' if doesn't define. */ /* #undef uid_t */ -/* Alternate uintptr_t for systems without it. */ -/* #undef uintptr_t */ +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ /* Does the compiler like "volatile"? */ /* #undef volatile */ diff -urN src/usr.sbin/ntp/config.mk src.ntp/usr.sbin/ntp/config.mk --- src/usr.sbin/ntp/config.mk 1970-01-01 01:00:00.000000000 +0100 +++ src.ntp/usr.sbin/ntp/config.mk 2010-07-22 01:09:28.000000000 +0200 @@ -0,0 +1,13 @@ +# $FreeBSD $ + +.include + +# Use the right version of the atomic.h file from lib/isc +# This is shamelessly stolen from src/lib/bind/config.mk +.if ${MACHINE_ARCH} == amd64 +ISC_ATOMIC_ARCH= x86_64 +.elif ${MACHINE_ARCH} == i386 +ISC_ATOMIC_ARCH= x86_32 +.else +ISC_ATOMIC_ARCH= ${MACHINE_CPUARCH} +.endif diff -urN src/usr.sbin/ntp/doc/Makefile src.ntp/usr.sbin/ntp/doc/Makefile --- src/usr.sbin/ntp/doc/Makefile 2010-01-03 23:29:06.000000000 +0100 +++ src.ntp/usr.sbin/ntp/doc/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -2,32 +2,7 @@ .include -FILESDIR= ${SHAREDIR}/doc/ntp - -.if ${MK_HTML} != "no" -FILES= accopt.html assoc.html audio.html authopt.html build.html \ - clockopt.html \ - config.html confopt.html copyright.html debug.html driver1.html \ - driver10.html driver11.html driver12.html driver16.html driver18.html \ - driver19.html driver2.html driver20.html driver22.html \ - driver26.html driver27.html driver28.html driver29.html \ - driver3.html driver30.html driver32.html driver33.html driver34.html \ - driver35.html driver36.html driver37.html \ - driver4.html driver5.html driver6.html driver7.html driver8.html \ - driver9.html extern.html hints.html \ - howto.html index.html kern.html \ - ldisc.html measure.html miscopt.html monopt.html mx4200data.html \ - notes.html ntpd.html ntpdate.html ntpdc.html ntpq.html ntptime.html \ - ntptrace.html parsedata.html parsenew.html patches.html porting.html \ - pps.html prefer.html quick.html rdebug.html refclock.html \ - release.html tickadj.html -.endif - MAN= ntp.conf.5 ntp.keys.5 MAN+= ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 -.PATH: ${.CURDIR}/../../../contrib/ntp/html \ - ${.CURDIR}/../../../contrib/ntp/html/build \ - ${.CURDIR}/../../../contrib/ntp/html/drivers - .include diff -urN src/usr.sbin/ntp/libntp/Makefile src.ntp/usr.sbin/ntp/libntp/Makefile --- src/usr.sbin/ntp/libntp/Makefile 2008-08-25 01:28:56.000000000 +0200 +++ src.ntp/usr.sbin/ntp/libntp/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,37 +1,57 @@ # $FreeBSD: src/usr.sbin/ntp/libntp/Makefile,v 1.12 2008/08/24 23:28:56 roberto Exp $ +# -.PATH: ${.CURDIR}/../../../contrib/ntp/libntp \ - ${.CURDIR}/../../../contrib/ntp/libisc +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/libntp -LIB= ntp +LIB= ntp INTERNALLIB= +SRCS= -NTP_SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ - atouint.c audio.c authkeys.c \ - authreadkeys.c authusekey.c \ - buftvtots.c caljulian.c caltontp.c \ - calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ - dofptoa.c dolfptoa.c emalloc.c findconfig.c \ - fptoa.c fptoms.c getopt.c \ - hextoint.c hextolfp.c humandate.c icom.c \ - inttoa.c iosignal.c lib_strbuf.c \ - machines.c md5c.c memmove.c \ - mfptoa.c mfptoms.c mktime.c modetoa.c \ - mstolfp.c ntp_random.c \ - msutotsf.c msyslog.c netof.c ntp_rfc2553.c \ - numtoa.c numtohost.c octtoint.c prettydate.c \ - recvbuff.c refnumtoa.c snprintf.c socktoa.c \ - socktohost.c strstr.c systime.c statestr.c \ - strerror.c syssignal.c tsftomsu.c tstotv.c \ - tvtoa.c tvtots.c uglydate.c uinttoa.c \ - utvtoa.c ymd2yd.c - -ISC_SRCS= assertions.c error.c inet_ntop.c inet_pton.c interfaceiter.c \ - isc_strerror.c lib.c mem.c msgcat.c net.c netscope.c netaddr.c \ - sockaddr.c +.include "${.CURDIR}/../config.mk" -SRCS= ${NTP_SRCS} ${ISC_SRCS} - -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +.PATH: ${SRC_DIR} +SRCS+= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ + atouint.c audio.c authkeys.c authreadkeys.c \ + authusekey.c bsd_strerror.c buftvtots.c caljulian.c \ + caltontp.c calyearstart.c clocktime.c clocktypes.c \ + decodenetnum.c dofptoa.c dolfptoa.c emalloc.c \ + findconfig.c fptoa.c fptoms.c getopt.c \ + hextoint.c hextolfp.c humandate.c icom.c \ + inttoa.c iosignal.c lib_strbuf.c machines.c \ + memmove.c mfptoa.c mfptoms.c mktime.c \ + modetoa.c mstolfp.c msutotsf.c msyslog.c \ + netof.c ntp_lineedit.c ntp_random.c ntp_rfc2553.c \ + numtoa.c numtohost.c octtoint.c prettydate.c \ + recvbuff.c refnumtoa.c snprintf.c socktoa.c \ + socktohost.c ssl_init.c statestr.c strdup.c \ + strstr.c systime.c syssignal.c tsftomsu.c \ + tstotv.c tvtots.c uglydate.c uinttoa.c \ + ymd2yd.c + +.PATH: ${NTP_DIR}/lib/isc +SRCS+= assertions.c buffer.c error.c event.c \ + inet_ntop.c inet_pton.c lib.c log.c \ + md5.c netaddr.c netscope.c ondestroy.c \ + random.c result.c task.c sockaddr.c + +.PATH: ${NTP_DIR}/lib/isc/nls +SRCS+= msgcat.c + +.PATH: ${NTP_DIR}/lib/isc/nothreads +SRCS+= condition.c thread.c + +.PATH: ${NTP_DIR}/lib/isc/unix +SRCS+= dir.c errno2result.c file.c \ + interfaceiter.c net.c stdio.c stdtime.c \ + strerror.c time.c + + +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATMOIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ .include diff -urN src/usr.sbin/ntp/libopts/Makefile src.ntp/usr.sbin/ntp/libopts/Makefile --- src/usr.sbin/ntp/libopts/Makefile 2008-08-22 22:04:35.000000000 +0200 +++ src.ntp/usr.sbin/ntp/libopts/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,13 +1,16 @@ # $FreeBSD: src/usr.sbin/ntp/libopts/Makefile,v 1.1 2008/08/22 20:04:35 roberto Exp $ -.PATH: ${.CURDIR}/../../../contrib/ntp/libopts +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/libopts LIB= opts INTERNALLIB= +.PATH: ${SRC_DIR} SRCS= libopts.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -I${.CURDIR}/../../../contrib/ntp/libopts +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${.CURDIR}/../ .include diff -urN src/usr.sbin/ntp/libparse/Makefile src.ntp/usr.sbin/ntp/libparse/Makefile --- src/usr.sbin/ntp/libparse/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/libparse/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,16 +1,25 @@ # $FreeBSD: src/usr.sbin/ntp/libparse/Makefile,v 1.8 2008/08/22 16:00:48 roberto Exp $ -.PATH: ${.CURDIR}/../../../contrib/ntp/libparse +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/libparse LIB= parse INTERNALLIB= -SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ - clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ - clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ - info_trimble.c parse.c parse_conf.c trim_info.c \ - binio.c gpstolfp.c +.include "${.CURDIR}/../config.mk" -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +.PATH: ${SRC_DIR} +SRCS= binio.c clk_computime.c clk_dcf7000.c clk_hopf6021.c \ + clk_meinberg.c clk_rawdcf.c clk_rcc8000.c clk_schmid.c \ + clk_trimtaip.c clk_trimtsip.c clk_varitext.c clk_wharton.c \ + data_mbg.c gpstolfp.c ieee754io.c info_trimble.c\ + mfp_mul.c parse.c parse_conf.c trim_info.c + +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/kernel +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ .include diff -urN src/usr.sbin/ntp/ntp-keygen/Makefile src.ntp/usr.sbin/ntp/ntp-keygen/Makefile --- src/usr.sbin/ntp/ntp-keygen/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/ntp-keygen/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -4,14 +4,23 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/util \ - ${.CURDIR}/../../../contrib/ntp/ntpd +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/util + +.include "${.CURDIR}/../config.mk" + +.PATH: ${SRC_DIR} PROG= ntp-keygen SRCS= ntp-keygen.c ntp-keygen-opts.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -I${.CURDIR}/../../../contrib/ntp/libopts +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothread/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ DPADD= ${LIBNTP} ${LIBOPTS} LDADD= ${LIBNTP} ${LIBOPTS} diff -urN src/usr.sbin/ntp/ntpd/Makefile src.ntp/usr.sbin/ntp/ntpd/Makefile --- src/usr.sbin/ntp/ntpd/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/ntpd/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -4,33 +4,42 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/ntpd + +.include "${.CURDIR}/../config.mk" PROG= ntpd -SRCS= cmd_args.c ntp_config.c \ - ntp_control.c ntp_crypto.c ntp_filegen.c \ - ntp_intres.c ntp_io.c ntp_loopfilter.c \ - ntp_monitor.c ntp_peer.c ntp_proto.c \ - ntp_refclock.c ntp_request.c \ - ntp_restrict.c ntp_timer.c ntp_util.c \ - ntpd.c refclock_acts.c refclock_arbiter.c \ - refclock_arc.c refclock_as2201.c refclock_atom.c \ - refclock_bancomm.c refclock_chronolog.c refclock_chu.c \ - refclock_conf.c refclock_datum.c refclock_dumbclock.c \ - refclock_fg.c refclock_gpsvme.c refclock_heath.c \ - refclock_hopfpci.c refclock_hopfser.c refclock_hpgps.c \ - refclock_irig.c refclock_jupiter.c refclock_leitch.c \ - refclock_local.c refclock_msfees.c refclock_mx4200.c \ - refclock_neoclock4x.c refclock_nmea.c refclock_oncore.c \ - refclock_palisade.c refclock_parse.c refclock_pcf.c \ - refclock_pst.c refclock_ripencc.c \ - refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \ - refclock_ulink.c refclock_wwv.c \ - refclock_wwvb.c ntpd-opts.c \ - version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -I${.CURDIR}/../../../contrib/ntp/libopts -I${.CURDIR} +.PATH: ${SRC_DIR} +SRCS= cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c \ + ntp_data_structures.c ntp_filegen.c ntp_intres.c \ + ntp_io.c ntp_loopfilter.c ntp_monitor.c \ + ntp_parser.c ntp_peer.c ntp_proto.c ntp_refclock.c \ + ntp_request.c ntp_restrict.c ntp_scanner.c ntp_signd.c \ + ntp_timer.c ntp_util.c ntpd.c ntpd-opts.c \ + refclock_acts.c refclock_arbiter.c refclock_arc.c \ + refclock_as2201.c refclock_atom.c refclock_bancomm.c \ + refclock_chronolog.c refclock_chu.c refclock_conf.c \ + refclock_datum.c refclock_dumbclock.c refclock_fg.c \ + refclock_gpsvme.c refclock_heath.c refclock_hopfser.c \ + refclock_hpgps.c refclock_irig.c refclock_jjy.c \ + refclock_jupiter.c refclock_leitch.c refclock_local.c \ + refclock_mx4200.c refclock_neoclock4x.c refclock_nmea.c \ + refclock_oncore.c refclock_palisade.c refclock_parse.c \ + refclock_pcf.c refclock_pst.c refclock_ripencc.c \ + refclock_shm.c refclock_tpro.c refclock_true.c \ + refclock_tt560.c refclock_ulink.c refclock_wwv.c \ + refclock_wwvb.c refclock_zyfer.c version.c + +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ +CFLAGS+= -I${.CURDIR} DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS} LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS} diff -urN src/usr.sbin/ntp/ntpdate/Makefile src.ntp/usr.sbin/ntp/ntpdate/Makefile --- src/usr.sbin/ntp/ntpdate/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/ntpdate/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,16 +1,32 @@ # $FreeBSD: src/usr.sbin/ntp/ntpdate/Makefile,v 1.7 2008/08/22 16:00:48 roberto Exp $ -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate +NO_MAN= + +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/ntpdate + +.include "${.CURDIR}/../config.mk" PROG= ntpdate -NO_MAN= + +.PATH: ${SRC_DIR} SRCS= ntpdate.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} LDADD= ${LIBNTP} -lm -lmd -lrt +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto +.endif + CLEANFILES+= .version version.c version.c: diff -urN src/usr.sbin/ntp/ntpdc/Makefile src.ntp/usr.sbin/ntp/ntpdc/Makefile --- src/usr.sbin/ntp/ntpdc/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/ntpdc/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -4,22 +4,38 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc +NTP_DIR= ${.CURDIR}/../../../contrib/ntp/ +SRC_DIR= ${NTP_DIR}/ntpdc + +.include "${.CURDIR}/../config.mk" PROG= ntpdc + +.PATH: ${SRC_DIR} SRCS= ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -I${.CURDIR}/../../../contrib/ntp/libopts +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothread/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} +DPADD= ${LIBNTP} ${LIBEDIT} ${LIBM} ${LIBMD} ${LIBOPTS} +LDADD= ${LIBNTP} -ledit -lm -lmd ${LIBOPTS} -.if ${MK_GNU_SUPPORT} != "no" -DPADD+= ${LIBREADLINE} ${LIBTERMCAP} -LDADD+= -lreadline -ltermcap CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ -DHAVE_READLINE_READLINE_H + +.if ${MK_GNU_SUPPORT} != "no" +DPADD+= ${LIBTERMCAP} +LDADD+= -ltermcap +.endif + +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto .endif CLEANFILES+= .version version.c diff -urN src/usr.sbin/ntp/ntpq/Makefile src.ntp/usr.sbin/ntp/ntpq/Makefile --- src/usr.sbin/ntp/ntpq/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/ntpq/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -4,24 +4,39 @@ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/ntpq + +.include "${.CURDIR}/../config.mk" BINDIR= /usr/bin PROG= ntpq -SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c +.PATH: ${SRC_DIR} -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -I${.CURDIR}/../../../contrib/ntp/libopts +SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ -.if ${MK_GNU_SUPPORT} != "no" -DPADD+= ${LIBREADLINE} ${LIBTERMCAP} -LDADD+= -lreadline -ltermcap +DPADD= ${LIBNTP} ${LIBEDIT} ${LIBM} ${LIBMD} ${LIBOPTS} +LDADD= ${LIBNTP} -ledit -lm -lmd ${LIBOPTS} CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ -DHAVE_READLINE_READLINE_H + +.if ${MK_GNU_SUPPORT} != "no" +DPADD+= ${LIBTERMCAP} +LDADD+= -ltermcap +.endif + +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto .endif CLEANFILES+= .version version.c diff -urN src/usr.sbin/ntp/ntptime/Makefile src.ntp/usr.sbin/ntp/ntptime/Makefile --- src/usr.sbin/ntp/ntptime/Makefile 2005-01-28 17:08:11.000000000 +0100 +++ src.ntp/usr.sbin/ntp/ntptime/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,11 +1,22 @@ # $FreeBSD: src/usr.sbin/ntp/ntptime/Makefile,v 1.6 2005/01/28 16:08:11 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/ntp/util +NO_MAN= + +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/util + +.include "${.CURDIR}/../config.mk" + +.PATH: ${SRC_DIR} PROG= ntptime -NO_MAN= -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${.CURDIR}/../ DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff -urN src/usr.sbin/ntp/scripts/mkver src.ntp/usr.sbin/ntp/scripts/mkver --- src/usr.sbin/ntp/scripts/mkver 2009-08-12 13:55:26.000000000 +0200 +++ src.ntp/usr.sbin/ntp/scripts/mkver 2010-07-22 01:08:30.000000000 +0200 @@ -6,7 +6,7 @@ ConfStr="$PROG" -ConfStr="$ConfStr 4.2.4p5" +ConfStr="$ConfStr 4.2.6p2" case "$CSET" in '') ;; diff -urN src/usr.sbin/ntp/sntp/Makefile src.ntp/usr.sbin/ntp/sntp/Makefile --- src/usr.sbin/ntp/sntp/Makefile 2008-08-22 18:00:48.000000000 +0200 +++ src.ntp/usr.sbin/ntp/sntp/Makefile 2010-07-22 01:08:30.000000000 +0200 @@ -1,16 +1,34 @@ # $FreeBSD: src/usr.sbin/ntp/sntp/Makefile,v 1.4 2008/08/22 16:00:48 roberto Exp $ -.PATH: ${.CURDIR}/../../../contrib/ntp/sntp +NO_MAN= + +NTP_DIR= ${.CURDIR}/../../../contrib/ntp +SRC_DIR= ${NTP_DIR}/sntp + +.include "${.CURDIR}/../config.mk" PROG= sntp -NO_MAN= -SRCS= internet.c main.c socket.c timing.c unix.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ - -DPACKAGE=\"sntp\" -DVERSION=\"1.6\" \ - -I${.CURDIR}/../../../contrib/ntp/libopts +.PATH: ${SRC_DIR} +SRCS= crypto.c kod_management.c log.c main.c \ + networking.c sntp-opts.c utilities.c + +CFLAGS+= -I${NTP_DIR}/include +CFLAGS+= -I${NTP_DIR}/lib/isc/include +CFLAGS+= -I${NTP_DIR}/lib/isc/nothreads/include +CFLAGS+= -I${NTP_DIR}/lib/isc/unix/include +CFLAGS+= -I${NTP_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +CFLAGS+= -I${NTP_DIR}/libopts +CFLAGS+= -I${SRC_DIR} +CFLAGS+= -I${.CURDIR}/../ +CFLAGS+= -DPACKAGE=\"sntp\" -DVERSION=\"1.6\" \ + +DPADD= ${LIBNTP} ${LIBM} ${LIBOPTS} +LDADD= ${LIBNTP} -lm ${LIBOPTS} -DPADD= ${LIBM} ${LIBOPTS} -LDADD= -lm ${LIBOPTS} +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto +.endif .include