Index: Makefile
===================================================================
--- Makefile	(revision 362768)
+++ Makefile	(working copy)
@@ -14,10 +14,7 @@
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit \
-		libidn.so:${PORTSDIR}/dns/libidn \
 		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libtspi.so:${PORTSDIR}/security/trousers
 
 USES=		gmake iconv libtool makeinfo pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
@@ -29,16 +26,31 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 
-OPTIONS_DEFINE=	EXAMPLES LIBDANE NLS
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB
+OPTIONS_DEFAULT=	CRYWRAP P11KIT TPM ZLIB
+OPTIONS_SUB=		yes
 
-LIBDANE_DESC=		DNSSEC support for DANE (danetool --check)
-LIBDANE_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+CRYWRAP_DESC=			Enable Crywrap TLS proxy service
+CRYWRAP_LIB_DEPENDS=		libidn.so:${PORTSDIR}/dns/libidn
+CRYWRAP_CONFIGURE_ENABLE=	crywrap
+
+LIBDANE_DESC=			DNSSEC support for DANE (danetool --check)
+LIBDANE_LIB_DEPENDS=		libunbound.so:${PORTSDIR}/dns/unbound
 LIBDANE_CONFIGURE_ENABLE=	libdane
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
+P11KIT_DESC=		PKCS\#11 and p11-kit support
+P11KIT_CONFIGURE_WITH=	p11-kit
+P11KIT_LIB_DEPENDS=	libp11-kit.so:${PORTSDIR}/security/p11-kit
+
+TPM_DESC=		TPM (trousers) support
+TPM_CONFIGURE_WITH=	tpm
+TPM_LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+
+ZLIB_CONFIGURE_WITH=	zlib
+
 INFO=		gnutls gnutls-guile
 
 post-patch:
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 362768)
+++ pkg-plist	(working copy)
@@ -4,10 +4,10 @@
 bin/gnutls-cli-debug
 bin/gnutls-serv
 bin/ocsptool
-bin/p11tool
+%%P11KIT%%bin/p11tool
 bin/psktool
 bin/srptool
-bin/tpmtool
+%%TPM%%bin/tpmtool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h