svn commit: r424955 - in head/security/acme-client: . files
Bernard Spil
brnrd at FreeBSD.org
Sun Oct 30 16:44:09 UTC 2016
Author: brnrd
Date: Sun Oct 30 16:44:08 2016
New Revision: 424955
URL: https://svnweb.freebsd.org/changeset/ports/424955
Log:
security/acme-client: Roll back to STATIC option
- Too many issues with the LibreSSL BUILD_DEPENDS
PR: 213695
Added:
head/security/acme-client/files/extra-patch-GNUmakefile
- copied unchanged from r423517, 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 Sun Oct 30 16:19:26 2016 (r424954)
+++ head/security/acme-client/Makefile Sun Oct 30 16:44:08 2016 (r424955)
@@ -3,7 +3,7 @@
PORTNAME= acme-client
PORTVERSION= 0.1.11
-PORTREVISION= 2
+PORTREVISION= 1
DISTVERSIONPREFIX= portable-
CATEGORIES= security
MASTER_SITES= https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \
@@ -16,6 +16,13 @@ LICENSE= ISCL
USES= gmake 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}
@@ -47,26 +54,11 @@ post-install:
.include <bsd.port.pre.mk>
-.if ${SSL_DEFAULT:Mlibressl*}
-USES+= ssl
+.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
-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
+WARNING= "Remember to deinstall libressl after building acme-client"
+.endif
.include <bsd.port.post.mk>
Copied: head/security/acme-client/files/extra-patch-GNUmakefile (from r423517, head/security/acme-client/files/extra-patch-GNUmakefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/acme-client/files/extra-patch-GNUmakefile Sun Oct 30 16:44:08 2016 (r424955, copy of r423517, head/security/acme-client/files/extra-patch-GNUmakefile)
@@ -0,0 +1,11 @@
+--- 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:
More information about the svn-ports-all
mailing list