View | Details | Raw Unified | Return to bug 228438 | Differences between
and this patch

Collapse All | Expand All

(-)security/acme-client/Makefile (-11 / +14 lines)
Lines 56-72 Link Here
56
56
57
.include <bsd.port.pre.mk>
57
.include <bsd.port.pre.mk>
58
58
59
.if ! ${SSL_DEFAULT:Mlibressl*}
59
# Requires libtls from LibreSSL
60
. ifnmake describe
60
.if ${SSL_DEFAULT:Mlibressl*}
61
STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
61
CPPFLAGS+=		-I${OPENSSLINC}
62
. endif
62
LDFLAGS+=		-L${OPENSSLLIB}
63
BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
63
.else # SSL_DEFAULT
64
CPPFLAGS+=	-I${STAGEDIR_libressl}${LOCALBASE}/include
64
BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
65
LDFLAGS+=	${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a \
65
CPPFLAGS+=		-I${WRKDIR}/libressl/include
66
		${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a \
66
LDFLAGS+=		-lpthread -L${WRKDIR}/libressl/lib
67
		${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a
67
68
post-configure:
68
# Don't use COPYTREE_SHARE here as it hard links files, and the original files
69
	${REINPLACE_CMD} 's/-l[a-z]*//g' ${WRKSRC}/GNUmakefile 
69
# are owned by root, which creates problems of its own.
70
pre-configure:
71
	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \
72
	    && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
70
.endif # SSL_DEFAULT
73
.endif # SSL_DEFAULT
71
74
72
.include <bsd.port.post.mk>
75
.include <bsd.port.post.mk>
(-)security/acme-client/files/extra-patch-GNUmakefile (-11 lines)
Lines 1-11 Link Here
1
--- GNUmakefile.orig	2016-09-01 05:48:04 UTC
2
+++ GNUmakefile
3
@@ -71,7 +71,7 @@ endif
4
 all: acme-client
5
 
6
 acme-client: $(OBJS)
7
-	$(CC) -o $@ $(OBJS) $(LDFLAGS) -ltls -lssl -lcrypto $(LIBBSD)
8
+	$(CC) -o $@ $(OBJS) $(LDFLAGS) ${PREFIX}/lib/libtls.a ${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a $(LIBBSD)
9
 
10
 # This is for synchronising from -portable to the master.
11
 rmerge:

Return to bug 228438