diff -ruN dns/bind916.orig/Makefile dns/bind916/Makefile
--- dns/bind916.orig/Makefile	2020-02-22 08:35:46.000000000 +0000
+++ dns/bind916/Makefile	2020-02-25 11:17:26.251546000 +0000
@@ -74,8 +74,8 @@
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB PYTHON \
-			SIGCHASE TCP_FASTOPEN
+OPTIONS_DEFAULT=	DLZ_FILESYSTEM GEOIP GSSAPI_NONE IDN JSON LARGE_FILE \
+			LMDB PYTHON SIGCHASE TCP_FASTOPEN TUNING_LARGE
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE SIGCHASE \
 			START_LATE TCP_FASTOPEN TUNING_LARGE
@@ -91,9 +91,9 @@
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	${OPTIONS_GROUP_DLZ} DNSTAP DOCS GEOIP LMDB \
+OPTIONS_EXCLUDE=	${OPTIONS_GROUP_DLZ} DNSTAP DOCS LMDB \
 			OVERRIDECACHE PORTREVISION QUERYTRACE START_LATE \
-			TCP_FASTOPEN TUNING_LARGE
+			TCP_FASTOPEN
 .else
 OPTIONS_EXCLUDE=	PYTHON
 .endif	# BIND_TOOLS_SLAVE
@@ -124,7 +124,7 @@
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
-TUNING_LARGE_DESC=	Tune named for large systems (**READ HELP**)
+TUNING_LARGE_DESC=	Tune named for large systems
 
 DLZ_BDB_CONFIGURE_ON=	--with-dlz-bdb=yes
 DLZ_BDB_USES=		bdb
@@ -148,9 +148,9 @@
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
-GEOIP_CONFIGURE_ENABLE=	geoip
-GEOIP_CONFIGURE_WITH=	maxminddb
-GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
+GEOIP_CONFIGURE_OFF=		--disable-geoip
+GEOIP_CONFIGURE_WITH=		maxminddb
+GEOIP_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} \
 				KRB5CONFIG="${KRB5CONFIG}"
@@ -176,7 +176,7 @@
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
-LARGE_FILE_CONFIGURE_ENABLE=	largefile
+LARGE_FILE_CONFIGURE_OFF=	--disable-largefile
 
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
@@ -201,8 +201,8 @@
 
 TCP_FASTOPEN_CONFIGURE_ENABLE=	tcp-fastopen
 
-TUNING_LARGE_CONFIGURE_ON=	--with-tuning=large
-TUNING_LARGE_CONFIGURE_OFF=	--with-tuning=default
+TUNING_LARGE_CONFIGURE_ON=	--with-tuning=default
+TUNING_LARGE_CONFIGURE_OFF=	--with-tuning=small
 
 .include <bsd.port.options.mk>