--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -25,1 +25,1 @@ 
-CONFLICTS=	bind9*-9.[45679].* bind9-sdb-* host-* bind-tools-9.*
---
+CONFLICTS=	bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.*
@@ -29,0 +29,1 @@ 
+			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \
@@ -34,0 +35,1 @@ 
+SSL_DESC=		Building without OpenSSL removes DNSSEC
@@ -39,0 +41,4 @@ 
+IPV6_DESC=		IPv6 Support (autodetected by default)
+FIXED_RRSET_DESC=	Enable fixed rrset ordering
+RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
+RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
@@ -53,3 +59,0 @@ 
-# Just in case
-USE_OPENSSL=	yes
-
@@ -58,0 +61,1 @@ 
+USE_OPENSSL=	yes
@@ -77,1 +81,1 @@ 
-.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:MBASE)
---
+.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
@@ -95,0 +99,18 @@ 
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=	--enable-threads
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
+.if ${PORT_OPTIONS:MFIXED_RRSET}
+CONFIGURE_ARGS+=	--enable-fixed-rrset
+.endif
+
+.if ${PORT_OPTIONS:MRPZ_NSIP}
+CONFIGURE_ARGS+=	--enable-rpz-nsip
+.endif
+
+.if ${PORT_OPTIONS:MRPZ_NSDNAME}
+CONFIGURE_ARGS+=	--enable-rpz-nsdname
+.endif
+
@@ -103,0 +125,4 @@ 
+.if ${PORT_OPTIONS:MTHREADS}
+	@${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS"
+	@${FALSE}
+.endif
@@ -123,6 +149,0 @@ 
-.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL)
-CONFIGURE_ARGS+=	--enable-threads
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
-
@@ -219,1 +239,1 @@ 
-.if ${PORT_OPTIONS:MLINKS} && empty($PORTOPTIONS:MREPLACE_BASE)
---
+.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)