Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 436886) +++ head/net/ntp/Makefile (revision 436887) @@ -1,85 +1,86 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.2.8p10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/} MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution -LIB_DEPENDS= libevent.so:devel/libevent \ - libmd5.so:www/libwww +LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= ntp-devel-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS OPTIONS_DEFAULT+= THREADS OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debugging IPV6_CONFIGURE_ENABLE= ipv6 NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no NLS_USES= gettext-runtime NTP_SIGND_CONFIGURE_ENABLE= ntp-signd NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd PERL_UTILS_USES= perl5 SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} SSL_CONFIGURE_OFF= --without-crypto SSL_USES= ssl -SSL_BROKEN_OFF= Includes OpenSSL when deselected DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads + +MD5_LIB_DEPENDS= libmd5.so:www/libwww +MD5_IMPLIES= SSL .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ENABLE= ${D} .endfor .include # XXX Temporary hack. Remember to remove this next commit. post-extract: @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .include Index: head/net/ntp/Makefile.inc =================================================================== --- head/net/ntp/Makefile.inc (revision 436886) +++ head/net/ntp/Makefile.inc (revision 436887) @@ -1,168 +1,155 @@ # $FreeBSD$ OPTIONS_DEFINE= NTPSNMPD \ SSL \ IPV6 \ DEBUG \ NTP_SIGND \ - BANCOMM \ - GPSVME \ - ACTS \ - ARBITER \ - ARCRON_MSF \ - AS2201 \ - ATOM \ - CHRONOLOG \ - CHU \ - AUDIO_CHU \ - DATUM \ - DUMBCLOCK \ - FG \ - HEATH \ - HOPFSERIAL \ - HOPFPCI \ - HPGPS \ - IRIG \ - JJY \ - JUPITER \ - LEITCH \ - LOCAL_CLOCK \ - MX4200 \ - NEOCLOCK4X \ - NMEA \ - ONCORE \ - PALISADE \ - PCF \ PERL_UTILS \ - PST \ - RIPENCC \ - SHM \ - SPECTRACOM \ - TRUETIME \ - ULINK \ - WWV \ - ZYFER \ - COMPUTIME \ - DCF7000 \ - HOPF6021 \ - MEINBERG \ - RAWDCF \ - RCC8000 \ - SCHMID \ - SEL240X \ - TRIMTAIP \ - TRIMTSIP \ - WHARTON \ - VARITEXT \ DOCS \ - EXAMPLES + EXAMPLES \ + MD5 \ + ${NTP_DRIVERS} OPTIONS_DEFAULT= SSL \ - ATOM \ PERL_UTILS \ - NMEA + ${NTP_DRIVERS_DEFAULT} NTPSNMPD_DESC= Build and install ntpsnmpd NTP_SIGND_DESC= Enable signed NTP BANCOMM_DESC= Enable Datum/Bancomm bc635/VME interface GPSVME_DESC= Enable TrueTime GPS receiver/VME interface ACTS_DESC= Enable ACTS modem service ARBITER_DESC= Enable Arbiter 1088A/B GPS receiver ARCRON_MSF_DESC= Enable Arcron MSF receiver AS2201_DESC= Enable Austron 2200A/2201A GPS receiver ATOM_DESC= Enable ATOM PPS interface CHRONOLOG_DESC= Enable Chrono-log K-series WWVB receiver CHU_DESC= Enable CHU modem/decoder AUDIO_CHU_DESC= Enable CHU audio/decoder DATUM_DESC= Enable Datum Programmable Time System DUMBCLOCK_DESC= Enable Dumb generic hh:mm:ss local clock FG_DESC= Enable Forum Graphic GPS HEATH_DESC= Enable Heath GC-1000 WWV/WWVH receiver HOPFSERIAL_DESC= Enable hopf serial clock device HOPFPCI_DESC= Enable hopf 6039 PCI board HPGPS_DESC= Enable HP 58503A GPS receiver IRIG_DESC= Enable IRIG audio decoder JJY_DESC= Enable JJY receiver JUPITER_DESC= Enable Rockwell Jupiter GPS receiver LEITCH_DESC= Enable Leitch CSD 5300 Master Clock LOCAL_CLOCK_DESC= Enable local clock reference MX4200_DESC= Enable Magnavox MX4200 GPS receiver NEOCLOCK4X_DESC= Enable NeoClock4X DCF77 / TDF receiver NMEA_DESC= Enable NMEA GPS receiver ONCORE_DESC= Enable Motorola VP/UT Oncore GPS receiver PALISADE_DESC= Enable Palisade clock PCF_DESC= Enable Conrad parallel port radio clock PERL_UTILS_DESC= Install ntp-wait and ntptrace utilities PST_DESC= Enable PST/Traconex 1020 WWV/WWVH receiver RIPENCC_DESC= Enable RIPENCC specific Trimble driver SHM_DESC= Enable SHM clock attached thru shared memory SPECTRACOM_DESC= Enable Spectracom 8170/Netclock/2 WWVB TRUETIME_DESC= Enable Kinemetrics/TrueTime receivers ULINK_DESC= Enable Ultralink WWVB receiver WWV_DESC= Enable WWV Audio receiver ZYFER_DESC= Enable Zyfer GPStarplus receiver COMPUTIME_DESC= Enable Diem Computime Radio Clock DCF7000_DESC= Enable ELV/DCF7000 clock HOPF6021_DESC= Enable HOPF 6021 clock MEINBERG_DESC= Enable Meinberg clocks RAWDCF_DESC= Enable DCF77 raw time code RCC8000_DESC= Enable RCC 8000 clock SCHMID_DESC= Enable Schmid DCF77 clock SEL240X_DESC= Enable SEL 240X clocks TRIMTAIP_DESC= Enable Trimble GPS receiver/TAIP protocol TRIMTSIP_DESC= Enable Trimble GPS receiver/TSIP protocol WHARTON_DESC= Enable WHARTON 400A Series clock VARITEXT_DESC= Enable VARITEXT clock +MD5_DESC= Add libwww md5 dependency for sntp (implies SSL) # Not supported by FreeBSD: TPRO Enable KSI/Odetics TPRO/S GPS receiver/IRIG # XXX Broken under FreeBSD: TT560 Enable TrueTime 560 IRIG-B decoder NTP_DRIVERS= \ BANCOMM \ GPSVME \ ACTS \ ARBITER \ ARCRON_MSF \ AS2201 \ ATOM \ CHRONOLOG \ CHU \ AUDIO_CHU \ DATUM \ DUMBCLOCK \ FG \ HEATH \ HOPFSERIAL \ HOPFPCI \ HPGPS \ IRIG \ JJY \ JUPITER \ LEITCH \ LOCAL_CLOCK \ MX4200 \ NEOCLOCK4X \ NMEA \ ONCORE \ PALISADE \ PCF \ PST \ RIPENCC \ SHM \ SPECTRACOM \ TRUETIME \ ULINK \ WWV \ ZYFER \ COMPUTIME \ DCF7000 \ HOPF6021 \ MEINBERG \ RAWDCF \ RCC8000 \ SCHMID \ SEL240X \ TRIMTAIP \ TRIMTSIP \ WHARTON \ VARITEXT + +NTP_DRIVERS_DEFAULT= \ + ACTS \ + ARBITER \ + ARCRON_MSF \ + AS2201 \ + ATOM \ + CHRONOLOG \ + CHU \ + DATUM \ + DUMBCLOCK \ + FG \ + HEATH \ + HOPFPCI \ + HOPFSERIAL \ + HPGPS \ + IRIG \ + JJY \ + JUPITER \ + LEITCH \ + LOCAL_CLOCK \ + NEOCLOCK4X \ + NMEA \ + ONCORE \ + PALISADE \ + PCF \ + PST \ + SHM \ + SPECTRACOM \ + TRUETIME \ + ULINK \ + WWV \ + ZYFER