Index: contrib/ntp/FREEBSD-upgrade
===================================================================
--- contrib/ntp/FREEBSD-upgrade	(revision 286827)
+++ contrib/ntp/FREEBSD-upgrade	(working copy)
@@ -27,9 +27,10 @@
 Updating usr.sbin/ntp
 ---------------------
 
-./configure --disable-all-clocks --enable-NMEA --enable-ONCORE
---enable-RAWDCF --with-crypto --disable-debugging
---enable-LOCAL-CLOCK --with-sntp --with-arlib --prefix=/usr
+./configure --disable-all-clocks --enable-ATOM --enable-DUMBCLOCK
+--enable-LOCAL-CLOCK --enable-MEINBERG --enable-NMEA --enable-ONCORE
+--enable-RAWDCF --enable-SHM --with-crypto --disable-debugging
+--with-sntp --with-arlib --prefix=/usr
 
 config.h was generated by running configure and excluding almost all clock
 drivers (what is included is DCF77 -- what I use --, NMEA, Motorola OnCORE
Index: usr.sbin/ntp/config.h
===================================================================
--- usr.sbin/ntp/config.h	(revision 286827)
+++ usr.sbin/ntp/config.h	(working copy)
@@ -15,16 +15,16 @@
 /* #undef CALL_PTHREAD_SETCONCURRENCY */
 
 /* ACTS modem service */
-#define CLOCK_ACTS 1
+/* #undef CLOCK_ACTS */
 
 /* Arbiter 1088A/B GPS receiver */
-#define CLOCK_ARBITER 1
+/* #undef CLOCK_ARBITER */
 
 /* ARCRON support? */
-#define CLOCK_ARCRON_MSF 1
+/* #undef CLOCK_ARCRON_MSF */
 
 /* Austron 2200A/2201A GPS receiver? */
-#define CLOCK_AS2201 1
+/* #undef CLOCK_AS2201 */
 
 /* PPS interface? */
 #define CLOCK_ATOM 1
@@ -33,16 +33,16 @@
 /* #undef CLOCK_BANC */
 
 /* Chronolog K-series WWVB receiver? */
-#define CLOCK_CHRONOLOG 1
+/* #undef CLOCK_CHRONOLOG */
 
 /* CHU modem/decoder */
-#define CLOCK_CHU 1
+/* #undef CLOCK_CHU */
 
 /* Diems Computime Radio Clock? */
 /* #undef CLOCK_COMPUTIME */
 
 /* Datum Programmable Time System? */
-#define CLOCK_DATUM 1
+/* #undef CLOCK_DATUM */
 
 /* ELV/DCF7000 clock? */
 /* #undef CLOCK_DCF7000 */
@@ -51,40 +51,40 @@
 #define CLOCK_DUMBCLOCK 1
 
 /* Forum Graphic GPS datating station driver? */
-#define CLOCK_FG 1
+/* #undef CLOCK_FG */
 
 /* GPSD JSON receiver */
-#define CLOCK_GPSDJSON 1
+/* #undef CLOCK_GPSDJSON */
 
 /* TrueTime GPS receiver/VME interface? */
 /* #undef CLOCK_GPSVME */
 
 /* Heath GC-1000 WWV/WWVH receiver? */
-#define CLOCK_HEATH 1
+/* #undef CLOCK_HEATH */
 
 /* HOPF 6021 clock? */
 /* #undef CLOCK_HOPF6021 */
 
 /* HOPF PCI clock device? */
-#define CLOCK_HOPF_PCI 1
+/* #undef CLOCK_HOPF_PCI */
 
 /* HOPF serial clock device? */
-#define CLOCK_HOPF_SERIAL 1
+/* #undef CLOCK_HOPF_SERIAL */
 
 /* HP 58503A GPS receiver? */
-#define CLOCK_HPGPS 1
+/* #undef CLOCK_HPGPS */
 
 /* IRIG audio decoder? */
-#define CLOCK_IRIG 1
+/* #undef CLOCK_IRIG */
 
 /* JJY receiver? */
-#define CLOCK_JJY 1
+/* #undef CLOCK_JJY */
 
 /* Rockwell Jupiter GPS clock? */
-#define CLOCK_JUPITER 1
+/* #undef CLOCK_JUPITER */
 
 /* Leitch CSD 5300 Master Clock System Driver? */
-#define CLOCK_LEITCH 1
+/* #undef CLOCK_LEITCH */
 
 /* local clock reference? */
 #define CLOCK_LOCAL 1
@@ -96,7 +96,7 @@
 /* #undef CLOCK_MX4200 */
 
 /* NeoClock4X */
-#define CLOCK_NEOCLOCK4X 1
+/* #undef CLOCK_NEOCLOCK4X */
 
 /* NMEA GPS receiver */
 #define CLOCK_NMEA 1
@@ -105,22 +105,22 @@
 #define CLOCK_ONCORE 1
 
 /* Palisade clock */
-#define CLOCK_PALISADE 1
+/* #undef CLOCK_PALISADE */
 
 /* PARSE driver interface */
 #define CLOCK_PARSE 1
 
 /* Conrad parallel port radio clock */
-#define CLOCK_PCF 1
+/* #undef CLOCK_PCF */
 
 /* PCL 720 clock support */
 /* #undef CLOCK_PPS720 */
 
 /* PST/Traconex 1020 WWV/WWVH receiver */
-#define CLOCK_PST 1
+/* #undef CLOCK_PST */
 
 /* DCF77 raw time code */
-/* #undef CLOCK_RAWDCF */
+#define CLOCK_RAWDCF 1
 
 /* RCC 8000 clock */
 /* #undef CLOCK_RCC8000 */
@@ -138,7 +138,7 @@
 #define CLOCK_SHM 1
 
 /* Spectracom 8170/Netclock/2 WWVB receiver */
-#define CLOCK_SPECTRACOM 1
+/* #undef CLOCK_SPECTRACOM */
 
 /* KSI/Odetics TPRO/S GPS receiver/IRIG interface */
 /* #undef CLOCK_TPRO */
@@ -150,7 +150,7 @@
 /* #undef CLOCK_TRIMTSIP */
 
 /* Kinemetrics/TrueTime receivers */
-#define CLOCK_TRUETIME 1
+/* #undef CLOCK_TRUETIME */
 
 /* Spectracom TSYNC timing board */
 /* #undef CLOCK_TSYNCPCI */
@@ -159,7 +159,7 @@
 /* #undef CLOCK_TT560 */
 
 /* Ultralink M320 WWVB receiver? */
-#define CLOCK_ULINK 1
+/* #undef CLOCK_ULINK */
 
 /* VARITEXT clock */
 /* #undef CLOCK_VARITEXT */
@@ -168,10 +168,10 @@
 /* #undef CLOCK_WHARTON_400A */
 
 /* WWV audio driver */
-#define CLOCK_WWV 1
+/* #undef CLOCK_WWV */
 
 /* Zyfer GPStarplus */
-#define CLOCK_ZYFER 1
+/* #undef CLOCK_ZYFER */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.