svn commit: r436859 - in head/net: ntp ntp-devel

[Cy Schubert]

Author: cy
Date: Fri Mar 24 21:26:51 2017
New Revision: 436859
URL: https://svnweb.freebsd.org/changeset/ports/436859

Log:
  Use CONFIGURE_ENABLE instead of CONFIGURE_ON.
  
  The current use of CONFIGURE_ON to handle refclock options allows
  adding a refclock that is off by default, but doesn't allow a user
  to eliminate refclocks that ntpd includes by default.
  
  Using CONFIGURE_ENABLE instead of CONFIGURE_ON will add the proper
  --disable-REFCLOCKNAME to the args when the user disables default-on
  options.
  
  PR:		218078
  Submitted by:	ian@

Modified:
  head/net/ntp-devel/Makefile
  head/net/ntp/Makefile

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Fri Mar 24 21:12:59 2017	(r436858)
+++ head/net/ntp-devel/Makefile	Fri Mar 24 21:26:51 2017	(r436859)
@@ -68,9 +68,7 @@ IGNORE=         detected LibreSSL (undef
 .endif
 
 .for D in ${NTP_DRIVERS}
-.if ${PORT_OPTIONS:M${D}}
-CONFIGURE_ARGS+=	--enable-${D}
-.endif
+${D}_CONFIGURE_ENABLE=	${D}
 .endfor
 
 # XXX Temporary hack. Remember to remove this next commit.

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Fri Mar 24 21:12:59 2017	(r436858)
+++ head/net/ntp/Makefile	Fri Mar 24 21:26:51 2017	(r436859)
@@ -64,7 +64,7 @@ THREADS_CONFIGURE_ENABLE=	thread-support
 THREADS_CONFIGURE_WITH=		threads
 
 .for D in ${NTP_DRIVERS}
-${D}_CONFIGURE_ON=	--enable-${D}
+${D}_CONFIGURE_ENABLE=	${D}
 .endfor
 
 .include <bsd.port.pre.mk>