Index: head/archivers/libarchive/Makefile
===================================================================
--- head/archivers/libarchive/Makefile	(revision 436249)
+++ head/archivers/libarchive/Makefile	(revision 436250)
@@ -1,114 +1,114 @@
 # $FreeBSD$
 
 PORTNAME=	libarchive
 PORTVERSION=	3.2.2
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://libarchive.org/downloads/
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	LZ4 LZO NETTLE
 OPTIONS_DEFAULT=LZ4 LZO
 
 LZ4_DESC=	Support lz4 compression via liblz4
 LZO_DESC=	Support lzo compression via liblzo2
 NETTLE_DESC=	Use Nettle instead of OpenSSL
 
 USES=		cpe iconv libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--without-xml2
 
 PLIST_FILES=	bin/bsdcat \
 		bin/bsdcpio \
 		bin/bsdtar \
 		include/archive.h \
 		include/archive_entry.h \
 		lib/libarchive.a \
 		lib/libarchive.so \
 		lib/libarchive.so.13 \
 		lib/libarchive.so.13.2.2 \
 		libdata/pkgconfig/libarchive.pc \
 		man/man1/bsdcat.1.gz \
 		man/man1/bsdcpio.1.gz \
 		man/man1/bsdtar.1.gz \
 		man/man3/archive_entry.3.gz \
 		man/man3/archive_entry_acl.3.gz \
 		man/man3/archive_entry_linkify.3.gz \
 		man/man3/archive_entry_paths.3.gz \
 		man/man3/archive_entry_perms.3.gz \
 		man/man3/archive_entry_stat.3.gz \
 		man/man3/archive_entry_time.3.gz \
 		man/man3/archive_read.3.gz \
 		man/man3/archive_read_add_passphrase.3.gz \
 		man/man3/archive_read_data.3.gz \
 		man/man3/archive_read_disk.3.gz \
 		man/man3/archive_read_extract.3.gz \
 		man/man3/archive_read_filter.3.gz \
 		man/man3/archive_read_format.3.gz \
 		man/man3/archive_read_free.3.gz \
 		man/man3/archive_read_header.3.gz \
 		man/man3/archive_read_new.3.gz \
 		man/man3/archive_read_open.3.gz \
 		man/man3/archive_read_set_options.3.gz \
 		man/man3/archive_util.3.gz \
 		man/man3/archive_write.3.gz \
 		man/man3/archive_write_blocksize.3.gz \
 		man/man3/archive_write_data.3.gz \
 		man/man3/archive_write_disk.3.gz \
 		man/man3/archive_write_filter.3.gz \
 		man/man3/archive_write_finish_entry.3.gz \
 		man/man3/archive_write_format.3.gz \
 		man/man3/archive_write_free.3.gz \
 		man/man3/archive_write_header.3.gz \
 		man/man3/archive_write_new.3.gz \
 		man/man3/archive_write_open.3.gz \
 		man/man3/archive_write_set_options.3.gz \
 		man/man3/archive_write_set_passphrase.3.gz \
 		man/man3/libarchive.3.gz \
 		man/man3/libarchive_changes.3.gz \
 		man/man3/libarchive_internals.3.gz \
 		man/man5/cpio.5.gz \
 		man/man5/libarchive-formats.5.gz \
 		man/man5/mtree.5.gz \
 		man/man5/tar.5.gz
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_WITH=	lzo2
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_CONFIGURE_WITH=	lz4
 
 NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NETTLE_CONFIGURE_WITH=	nettle
 NETTLE_CONFIGURE_ON=	--without-openssl
-NETTLE_USE_OFF=		OPENSSL=yes
+NETTLE_USES_OFF=	ssl
 NETTLE_CONFIGURE_OFF=	--with-openssl
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .if empty(ICONV_LIB)
 CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_func_locale_charset=no \
 		ac_cv_lib_charset_locale_charset=no
 .endif
 
 check:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
 
 .include <bsd.port.post.mk>
Index: head/security/libssh2/Makefile
===================================================================
--- head/security/libssh2/Makefile	(revision 436249)
+++ head/security/libssh2/Makefile	(revision 436250)
@@ -1,52 +1,52 @@
 # Created by: Alexander Leidinger <netchild@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libssh2
 PORTVERSION=	1.8.0
 PORTEPOCH=	3
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh2.org/download/ \
 		LOCAL/sbz
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	GCRYPT TRACE ZLIB
 OPTIONS_DEFAULT=	ZLIB
 
 TRACE_DESC=	Enable debug packet traces
 
 TRACE_CONFIGURE_ENABLE=	debug
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ON=	--with-libgcrypt
 GCRYPT_CONFIGURE_OFF=	--with-openssl
 GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
 GCRYPT_LIBS=		-L${LOCALBASE}/lib
-GCRYPT_USE_OFF=	openssl=yes
+GCRYPT_USES_OFF=	ssl
 ZLIB_CONFIGURE_WITH=	libz
 
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MGCRYPT) && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
 .if ! ${PORT_OPTIONS:MGCRYPT}
 .  if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \
 		${WRKSRC}/configure
 .  endif
 .endif
 
 .include <bsd.port.post.mk>