--- Mk/bsd.default-versions.mk	(revision 431258)
+++ Mk/bsd.default-versions.mk	(working copy)
@@ -41,7 +41,7 @@ FPC_DEFAULT?=		3.0.0
 GCC_DEFAULT?=		4.9
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
-.if defined(ARCH) && ${ARCH} == amd64
+.if ${ARCH} == amd64
 # Possible values: c6, c6_64, c7, c7_64
 LINUX_DEFAULT?=		c6_64
 .else
--- Mk/bsd.port.mk	(revision 431243)
+++ Mk/bsd.port.mk	(working copy)
@@ -1234,8 +1234,6 @@ GROUPS_BLACKLIST=	_dhcp _pflogd _ypldap 
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32
 
-.endif
-
 # At least KDE needs TMPDIR for the package building,
 # so we're setting it to the known default value.
 .if defined(PACKAGE_BUILDING)
@@ -1248,8 +1246,12 @@ WITH_DEBUG=	yes
 .endif
 .endif
 
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .include "${PORTSDIR}/Mk/bsd.options.mk"
 
+.endif
+# End of options section.
+
 # Start of pre-makefile section.
 .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
 
@@ -1259,8 +1261,6 @@ WITH_DEBUG=	yes
 
 _PREMKINCLUDED=	yes
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(PORTVERSION)
 .if ${PORTVERSION:M*[-_,]*}x != x
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
--- ftp/curl/Makefile	(revision 431243)
+++ ftp/curl/Makefile	(working copy)
@@ -21,6 +21,7 @@ OPTIONS_RADIO_RESOLV=	CARES THREADED_RES
 OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=	CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
+OPTIONS_DEFAULT+=	GSSAPI_${"${SSL_DEFAULT}" == "base":?BASE:NONE}
 CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 CA_BUNDLE_IMPLIES=	OPENSSL
 COOKIES_DESC=		Cookies support
@@ -33,14 +34,6 @@ SMB_DESC=		SMB/CIFS support
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
 
-.include <${.CURDIR}/../../Mk/bsd.default-versions.mk>
-
-.if ${SSL_DEFAULT} != base
-OPTIONS_DEFAULT+=	GSSAPI_NONE
-.else
-OPTIONS_DEFAULT+=	GSSAPI_BASE
-.endif
-
 CONFIGURE_ARGS=	--disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
 		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \