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

Collapse All | Expand All

(-)security/acme-client/Makefile (-15 / +21 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	acme-client
4
PORTNAME=	acme-client
5
PORTVERSION=	0.1.11
5
PORTVERSION=	0.1.11
6
PORTREVISION=	1
6
PORTREVISION=	2
7
DISTVERSIONPREFIX=	portable-
7
DISTVERSIONPREFIX=	portable-
8
CATEGORIES=	security
8
CATEGORIES=	security
9
MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
9
MASTER_SITES=	https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
Lines 14-28 COMMENT= Native C client for Let's Encrypt, design Link Here
14
14
15
LICENSE=	ISCL
15
LICENSE=	ISCL
16
16
17
USES=		gmake tar:tgz
17
USES=		gmake ssl tar:tgz
18
18
19
OPTIONS_DEFINE=	STATIC_ACMECLIENT
20
STATIC_ACMECLIENT_DESC=	Link statically with security/libressl
21
22
STATIC_ACMECLIENT_USES_OFF=	ssl
23
STATIC_ACMECLIENT_BUILD_DEPENDS=	${LOCALBASE}/lib/libtls.a:security/libressl
24
STATIC_ACMECLIENT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-GNUmakefile
25
26
MAKEFILE=	GNUmakefile
19
MAKEFILE=	GNUmakefile
27
MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
20
MAKE_ENV=	PREFIX=${STAGEDIR}/${PREFIX}
28
21
Lines 54-64 post-install: Link Here
54
47
55
.include <bsd.port.pre.mk>
48
.include <bsd.port.pre.mk>
56
49
57
.if ${PORT_OPTIONS:MSTATIC_ACMECLIENT} == "" && empty(SSL_DEFAULT:M*libressl*)
50
.if ! ${SSL_DEFAULT:Mlibressl*}
58
IGNORE=	needs LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl \
51
BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
59
	and rebuild all ports that depend on openssl
52
CPPFLAGS+=		-I${WRKDIR}/libressl/include
60
.else
53
LDFLAGS+=		-L${WRKDIR}/libressl/lib
61
WARNING=	"Remember to deinstall libressl after building acme-client"
54
. ifnmake describe
62
.endif
55
STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
56
. endif
57
# security/libressl ignores implicit SSP_UNSAFE, see Mk/bsd.ssp.mk
58
. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 && ${ARCH} == i386
59
SSP_CFLAGS?=	-fstack-protector
60
CFLAGS+=	${SSP_CFLAGS}
61
LDFLAGS+=	-fstack-protector
62
LIBS+=		-lssp_nonshared
63
. endif
63
64
65
pre-configure:
66
	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
67
		. ${WRKDIR}/libressl "! -name *.so*")
68
.endif # SSL_DEFAULT
69
64
.include <bsd.port.post.mk>
70
.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 213695