From owner-svn-ports-head@freebsd.org Sat Oct 8 15:15:32 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB620C053E3; Sat, 8 Oct 2016 15:15:32 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DCD5A18; Sat, 8 Oct 2016 15:15:32 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98FFVxJ026529; Sat, 8 Oct 2016 15:15:31 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98FFVka026527; Sat, 8 Oct 2016 15:15:31 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610081515.u98FFVka026527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 8 Oct 2016 15:15:31 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 15:15:32 -0000 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 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 -.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 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: