Index: head/security/acme-client/Makefile
===================================================================
--- head/security/acme-client/Makefile	(revision 424940)
+++ head/security/acme-client/Makefile	(revision 424941)
@@ -1,64 +1,70 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	acme-client
 PORTVERSION=	0.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	portable-
 CATEGORIES=	security
 MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
 		LOCAL/brnrd
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Native C client for Let's Encrypt, designed for security
 
 LICENSE=	ISCL
 
-USES=		gmake tar:tgz
+USES=		gmake ssl tar:tgz
 
-OPTIONS_DEFINE=	STATIC_ACMECLIENT
-STATIC_ACMECLIENT_DESC=	Link statically with security/libressl
-
-STATIC_ACMECLIENT_USES_OFF=	ssl
-STATIC_ACMECLIENT_BUILD_DEPENDS=	${LOCALBASE}/lib/libtls.a:security/libressl
-STATIC_ACMECLIENT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-GNUmakefile
-
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
 
 WWWDIR=		${PREFIX}/www/letsencrypt
 
 SAMPLE_FILES=	acme-client.sh.sample deploy.sh.sample
 SUB_FILES=	000.acme-client.sh pkg-message ${SAMPLE_FILES}
 SUB_LIST=	PORTNAME=${PORTNAME}
 
 PERIODIC_DIRS=	etc/periodic/weekly
 PERIODIC_FILES=	000.acme-client.sh
 
 post-patch:
 	${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 		-e "s|/var/www/letsencrypt|${WWWDIR}|" \
 		${WRKSRC}/main.c ${WRKSRC}/acme-client.1
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/acme-client
 .	for d in etc/ssl/letsencrypt etc/ssl/letsencrypt/private \
 		etc/letsencrypt www/letsencrypt
 		${MKDIR} ${STAGEDIR}${PREFIX}/${d}
 .	endfor
 .	for d in ${SAMPLE_FILES}
 		${INSTALL_SCRIPT} ${WRKDIR}/${d} ${STAGEDIR}${PREFIX}/etc/letsencrypt/${d}
 .	endfor
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MSTATIC_ACMECLIENT} == "" && empty(SSL_DEFAULT:M*libressl*)
-IGNORE=	needs LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl \
-	and rebuild all ports that depend on openssl
-.else
-WARNING=	"Remember to deinstall libressl after building acme-client"
-.endif
+.if ! ${SSL_DEFAULT:Mlibressl*}
+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
+CPPFLAGS+=		-I${WRKDIR}/libressl/include
+LDFLAGS+=		-L${WRKDIR}/libressl/lib
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
+SSP_CFLAGS?=	-fstack-protector
+CFLAGS+=	${SSP_CFLAGS}
+LDFLAGS+=	-fstack-protector
+LIBS+=		-lssp_nonshared
+. endif
+
+pre-configure:
+	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
+		. ${WRKDIR}/libressl "! -name *.so*")
+.endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>
Index: head/security/acme-client/files/extra-patch-GNUmakefile
===================================================================
--- head/security/acme-client/files/extra-patch-GNUmakefile	(revision 424940)
+++ head/security/acme-client/files/extra-patch-GNUmakefile	(nonexistent)
@@ -1,11 +0,0 @@
---- GNUmakefile.orig	2016-09-01 05:48:04 UTC
-+++ GNUmakefile
-@@ -71,7 +71,7 @@ endif
- all: acme-client
- 
- acme-client: $(OBJS)
--	$(CC) -o $@ $(OBJS) $(LDFLAGS) -ltls -lssl -lcrypto $(LIBBSD)
-+	$(CC) -o $@ $(OBJS) $(LDFLAGS) ${PREFIX}/lib/libtls.a ${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a $(LIBBSD)
- 
- # This is for synchronising from -portable to the master.
- rmerge:

Property changes on: head/security/acme-client/files/extra-patch-GNUmakefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property