Index: head/security/acme-client/Makefile
===================================================================
--- head/security/acme-client/Makefile	(revision 476217)
+++ head/security/acme-client/Makefile	(revision 476218)
@@ -1,72 +1,75 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	acme-client
 PORTVERSION=	0.1.16
-PORTREVISION=	3
+PORTREVISION=	4
 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
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		gmake tar:tgz ssl
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
 
 CFLAGS+=	-DNOBODY_USER=\\\"${ACME_USER}\\\"
 
 WWWDIR=		${PREFIX}/www/acme
 
 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
 
 ACME_USER?=	_acme
 
 USERS=		${ACME_USER}
 GROUPS=		${ACME_USER}
 
 post-patch:
 	${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 		-e "s|/var/www/acme|${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/acme etc/ssl/acme/private \
 		etc/acme www/acme
 		${MKDIR} ${STAGEDIR}${PREFIX}/${d}
 .	endfor
 .	for d in ${SAMPLE_FILES}
 		${INSTALL_SCRIPT} ${WRKDIR}/${d} ${STAGEDIR}${PREFIX}/etc/acme/${d}
 .	endfor
 
 .include <bsd.port.pre.mk>
 
-.if ! ${SSL_DEFAULT:Mlibressl*}
-. ifnmake describe
-STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
-. endif
-BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
-CPPFLAGS+=	-I${STAGEDIR_libressl}${LOCALBASE}/include
-LDFLAGS+=	${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a \
-		${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a \
-		${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a
-post-configure:
-	${REINPLACE_CMD} 's/-l[a-z]*//g' ${WRKSRC}/GNUmakefile 
+# Requires libtls from LibreSSL
+.if ${SSL_DEFAULT:Mlibressl*}
+CPPFLAGS+=		-I${OPENSSLINC}
+LDFLAGS+=		-L${OPENSSLLIB}
+.else # SSL_DEFAULT
+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
+CPPFLAGS+=		-I${WRKDIR}/libressl/include
+LDFLAGS+=		-lpthread -L${WRKDIR}/libressl/lib
+
+# Don't use COPYTREE_SHARE here as it hard links files, and the original files
+# are owned by root, which creates problems of its own.
+pre-configure:
+	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \
+	    && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
 .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 476217)
+++ 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