svn commit: r476218 - in head/security/acme-client: . files

[Tobias Kortkamp]

Author: tobik
Date: Thu Aug  2 05:33:16 2018
New Revision: 476218
URL: https://svnweb.freebsd.org/changeset/ports/476218

Log:
  security/acme-client: Fix runtime when SSL_DEFAULT != libressl
  
  - Make sure we link with libthr as well to prevent runtime errors
    like "tls_init: No error: 0" [1].
  
  - Adopt the nicer approach for linking with libtls taken by
    net/openntpd; it doesn't require patching of build files [2].
  
  - Remove unused patch
  
  PR:		228438
  Submitted by:	madpilot, tobik [1], leres [2]
  Reported by:	dch
  Approved by:	brnrd (maintainer timeout, 2 weeks)

Deleted:
  head/security/acme-client/files/extra-patch-GNUmakefile
Modified:
  head/security/acme-client/Makefile

Modified: head/security/acme-client/Makefile
==============================================================================
--- head/security/acme-client/Makefile	Thu Aug  2 05:30:17 2018	(r476217)
+++ head/security/acme-client/Makefile	Thu Aug  2 05:33:16 2018	(r476218)
@@ -3,7 +3,7 @@
 
 PORTNAME=	acme-client
 PORTVERSION=	0.1.16
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	portable-
 CATEGORIES=	security
 MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
@@ -56,17 +56,20 @@ post-install:
 
 .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>