Module Name: src
Committed By: kardel
Date: Sun Aug 29 18:55:51 UTC 2010
Modified Files:
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/include: config.h
Log Message:
support to follow NetBSD build options for
MKCRYPTO
MKMDNS
MKINET6
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.2 src/external/bsd/ntp/Makefile.inc:1.3
--- src/external/bsd/ntp/Makefile.inc:1.2 Mon Dec 14 02:09:39 2009
+++ src/external/bsd/ntp/Makefile.inc Sun Aug 29 18:55:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/12/14 02:09:39 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2010/08/29 18:55:50 kardel Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -10,10 +10,6 @@
.include <bsd.own.mk>
-.if ${MKCRYPTO} == "no"
-NTP_USE_OPENSSL?=no
-.endif
-
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
NTP_HTMLDIR= /usr/share/doc/html/ntp
@@ -42,6 +38,11 @@
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.endif
+.if ("${MKMDNS}" != "no")
+CPPFLAGS+=-DHAVE_DNSREGISTRATION=1
+LDADD+=-ldns_sd
+.endif
+
SRCS+= version.c
CLEANFILES+=version.c version.o
@@ -51,6 +52,14 @@
.endif # defined(PROG)
+.if (${MKCRYPTO} != "no")
+CPPFLAGS+=-DOPENSSL
+.endif
+
+.if ("${MKINET6}" != "no")
+CPPFLAGS+=-DWANT_IPV6
+.endif
+
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
.endif
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.5 src/external/bsd/ntp/bin/ntpd/Makefile:1.6
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.5 Sun Aug 29 11:15:32 2010
+++ src/external/bsd/ntp/bin/ntpd/Makefile Sun Aug 29 18:55:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/08/29 11:15:32 kardel Exp $
+# $NetBSD: Makefile,v 1.6 2010/08/29 18:55:50 kardel Exp $
NOGCCERROR=yes
@@ -83,11 +83,6 @@
CPPFLAGS+=-I${IDIST}/include -I${IDIST}/libopts
-.if ("${MKMDNS}" != "no")
-CPPFLAGS+=-DUSE_MDNS
-LDADD+=-ldns_sd
-.endif
-
.PATH: ${DIST}
ntpd.8: ntpd.1
Index: src/external/bsd/ntp/include/config.h
diff -u src/external/bsd/ntp/include/config.h:1.2 src/external/bsd/ntp/include/config.h:1.3
--- src/external/bsd/ntp/include/config.h:1.2 Sun Aug 29 10:13:07 2010
+++ src/external/bsd/ntp/include/config.h Sun Aug 29 18:55:51 2010
@@ -332,12 +332,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
+/* NetBSD: set by build process */
/* Use Rendezvous/DNS-SD registration */
-#ifdef USE_MDNS
-#define HAVE_DNSREGISTRATION 1
-#else
-#undef HAVE_DNSREGISTRATION
-#endif
+/* #define HAVE_DNSREGISTRATION 1 */
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
/* #undef HAVE_DOPRNT */
@@ -1063,7 +1060,7 @@
#define ISC_PLATFORM_HAVEIN6PKTINFO /**/
/* have IPv6? */
-#define ISC_PLATFORM_HAVEIPV6 /**/
+#define ISC_PLATFORM_HAVEIPV6
/* struct sockaddr has sa_len? */
#define ISC_PLATFORM_HAVESALEN /**/
@@ -1156,7 +1153,7 @@
/* #undef NO_PARENB_IGNPAR */
/* Default location of crypto key info */
-#define NTP_KEYSDIR "/tmp/ntp-4.2.6/etc"
+#define NTP_KEYSDIR "/etc/ntp"
/* Path to sign daemon rendezvous socket */
/* #undef NTP_SIGND_PATH */
@@ -1170,8 +1167,9 @@
/* Do we have support for SHMEM_STATUS? */
#define ONCORE_SHMEM_STATUS 1
+/* NetBSD: set by build process */
/* Use OpenSSL? */
-#define OPENSSL /**/
+/* #define OPENSSL */
/* Should we open the broadcast socket? */
#define OPEN_BCAST_SOCKET 1
@@ -1244,13 +1242,21 @@
/* #undef SCO5_CLOCK */
/* The size of `char*', as computed by sizeof. */
+#ifndef _LP64
#define SIZEOF_CHARP 4
+#else
+#define SIZEOF_CHARP 8
+#endif
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
+#ifndef _LP64
#define SIZEOF_LONG 4
+#else
+#define SIZEOF_LONG 8
+#endif
/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
@@ -1277,7 +1283,7 @@
/* #undef STEP_SLEW */
/* canonical system (cpu-vendor-os) of where we should run */
-#define STR_SYSTEM "i386-unknown-netbsdelf5.99.20"
+#define STR_SYSTEM "i386-unknown-netbsdelf"
/* Buggy syscall() (Solaris2.4)? */
/* #undef SYSCALL_BUG */
@@ -1349,8 +1355,9 @@
/* Version number of package */
#define VERSION "4.2.6"
+/* NetBSD: set by build process */
/* configure --enable-ipv6 */
-#define WANT_IPV6 /**/
+/* #define WANT_IPV6 */
/* Define this if a working libregex can be found */
#define WITH_LIBREGEX 1
