Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Oct 2016 15:15:31 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423513 - in head/security/acme-client: . files
Message-ID:  <201610081515.u98FFVka026527@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Oct  8 15:15:31 2016
New Revision: 423513
URL: https://svnweb.freebsd.org/changeset/ports/423513

Log:
  security/acme-client: Add STATIC option
  
    - Allow static linking
    - Forego SSL runtime dependency
    - Add warning about deinstall libressl after build
    - Add extra patch for static option
  
  PR:		212980
  Submitted by:	Christian Schwarz <me@cschwarz.com>

Added:
  head/security/acme-client/files/extra-patch-GNUmakefile   (contents, props changed)
Modified:
  head/security/acme-client/Makefile

Modified: head/security/acme-client/Makefile
==============================================================================
--- head/security/acme-client/Makefile	Sat Oct  8 14:54:14 2016	(r423512)
+++ head/security/acme-client/Makefile	Sat Oct  8 15:15:31 2016	(r423513)
@@ -13,7 +13,14 @@ COMMENT=	Native C client for Let's Encry
 
 LICENSE=	ISCL
 
-USES=		gmake ssl tar:tgz
+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}
@@ -46,9 +53,11 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if empty(SSL_DEFAULT:M*libressl*)
+.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
+WARNING=	"Remember to deinstall libressl after building acme-client"
 .endif
 
 .include <bsd.port.post.mk>

Added: 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	Sat Oct  8 15:15:31 2016	(r423513)
@@ -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610081515.u98FFVka026527>