aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2017-03-25 05:26:51 +0800
committercy <cy@FreeBSD.org>2017-03-25 05:26:51 +0800
commit18ca8482e5ac46630f8b8f45f23b25dccf443c09 (patch)
tree2174a98a58dfd9b9f20ba4af6bfe872ce839643d
parent6e61b3b4a41ae832ef614e7b2db91e809b614ca6 (diff)
downloadfreebsd-ports-gnome-18ca8482e5ac46630f8b8f45f23b25dccf443c09.tar.gz
freebsd-ports-gnome-18ca8482e5ac46630f8b8f45f23b25dccf443c09.tar.zst
freebsd-ports-gnome-18ca8482e5ac46630f8b8f45f23b25dccf443c09.zip
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@
-rw-r--r--net/ntp-devel/Makefile4
-rw-r--r--net/ntp/Makefile2
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 6a90678a07e4..50d13e3ec134 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -68,9 +68,7 @@ IGNORE= detected LibreSSL (undefined references to MD5 symbols)
.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.
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 5f58ed417d5a..583df2ea0109 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -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>