Index: head/Makefile.inc1 =================================================================== --- head/Makefile.inc1 +++ head/Makefile.inc1 @@ -939,6 +939,13 @@ ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endfor +# 20181009 track migration from ntp's embedded libevent to updated one + @if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \ + egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \ + ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \ + echo "Removing stale libevent dependencies"; \ + rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \ + fi _worldtmp: .PHONY @echo Index: head/usr.sbin/ntp/libntpevent/Makefile =================================================================== --- head/usr.sbin/ntp/libntpevent/Makefile +++ head/usr.sbin/ntp/libntpevent/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent +.PATH: ${SRCTOP}/contrib/libevent LIB= ntpevent INTERNALLIB= @@ -26,7 +26,7 @@ .endif CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ - -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ + -I${SRCTOP}/contrib/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H