--- bind97/Makefile.orig	2012-10-25 19:08:35.000000000 -0700
+++ bind97/Makefile	2012-10-25 18:53:44.000000000 -0700
@@ -23,10 +23,11 @@
 		--disable-symtable \
 		--with-randomdev=/dev/random
 
-CONFLICTS=	bind9*-9.[45689].* bind9-sdb-* host-*
+CONFLICTS=	bind9*-9.[45789].* bind9*-sdb-9.[45789].*
 
 OPTIONS_DEFAULT=	IPV6 SSL LINKS XML THREADS
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE SIGCHASE \
+			FIXED_RRSET \
 			IPV6 THREADS
 .if !defined(BIND_TOOLS_SLAVE)
 OPTIONS_DEFINE+=	LINKS XML DLZ
@@ -34,11 +35,15 @@
 OPTIONS_SINGLE_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
 
+SSL_DESC=		Building without OpenSSL removes DNSSEC
 LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 XML_DESC=		Support for xml statistics output
 REPLACE_BASE_DESC=	Replace base BIND with this version
 LARGE_FILE_DESC=	64-bit file support
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
+IPV6_DESC=		IPv6 Support (autodetected by default)
+THREADS_DESC=		Compile with thread support
+FIXED_RRSET_DESC=	Enable fixed rrset ordering
 DLZ_DESC=		Dynamically Loadable Zones
 DLZ_POSTGRESQL_DESC=	DLZ Postgres driver
 DLZ_MYSQL_DESC=		DLZ MySQL driver (single-threaded BIND)
@@ -50,9 +55,6 @@
 CONFLICTS+=	bind-tools-9.*
 .endif
 
-# Just in case
-USE_OPENSSL=	yes
-
 .include <bsd.port.options.mk>
 
 .if (${ARCH} == "amd64")
@@ -61,6 +63,7 @@
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+USE_OPENSSL=	yes
 .else
 CONFIGURE_ARGS+=	--disable-openssl-version-check
 CONFIGURE_ARGS+=	--without-openssl
@@ -80,7 +83,7 @@
 CONFIGURE_ARGS+=	--without-idn
 .endif
 
-.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:M_REPLACE_BASE)
+.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
 PLIST_SUB+=	LINKS=""
 .else
 PLIST_SUB+=	LINKS="@comment "
@@ -98,6 +101,16 @@
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+.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:MDLZ_POSTGRESQL}
 CONFIGURE_ARGS+=	--with-dlz-postgres=yes
 USE_PGSQL=		yes
@@ -106,6 +119,10 @@
 .if ${PORT_OPTIONS:MDLZ_MYSQL}
 CONFIGURE_ARGS+=	--with-dlz-mysql=yes
 USE_MYSQL=		yes
+.if ${PORT_OPTIONS:MTHREADS}
+	@${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS"
+	@${FALSE}
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MDLZ_BDB}
@@ -126,12 +143,6 @@
 CONFIGURE_ARGS+=	--with-dlz-stub=yes
 .endif
 
-.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL)
-CONFIGURE_ARGS+=	--enable-threads
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
-
 .if ${PORT_OPTIONS:MREPLACE_BASE}
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
@@ -223,7 +234,7 @@
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ* \
 	    ${WRKSRC}/README ${DOCSDIR}/
 .endif
-.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE)
+.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif