From owner-svn-ports-head@freebsd.org  Fri Mar 24 21:26:53 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FB6DD18145;
 Fri, 24 Mar 2017 21:26:53 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D0E976A0;
 Fri, 24 Mar 2017 21:26:52 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OLQpCn008644;
 Fri, 24 Mar 2017 21:26:51 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OLQpjk008642;
 Fri, 24 Mar 2017 21:26:51 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201703242126.v2OLQpjk008642@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 24 Mar 2017 21:26:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r436859 - in head/net: ntp ntp-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Mar 2017 21:26:53 -0000

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>