Index: security/acme-client/Makefile =================================================================== --- security/acme-client/Makefile (revision 475177) +++ security/acme-client/Makefile (working copy) @@ -56,17 +56,20 @@ .include -.if ! ${SSL_DEFAULT:Mlibressl*} -. ifnmake describe -STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl -. endif -BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage -CPPFLAGS+= -I${STAGEDIR_libressl}${LOCALBASE}/include -LDFLAGS+= ${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a \ - ${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a \ - ${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a -post-configure: - ${REINPLACE_CMD} 's/-l[a-z]*//g' ${WRKSRC}/GNUmakefile +# Requires libtls from LibreSSL +.if ${SSL_DEFAULT:Mlibressl*} +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +.else # SSL_DEFAULT +BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage +CPPFLAGS+= -I${WRKDIR}/libressl/include +LDFLAGS+= -lpthread -L${WRKDIR}/libressl/lib + +# Don't use COPYTREE_SHARE here as it hard links files, and the original files +# are owned by root, which creates problems of its own. +pre-configure: + @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ + && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 .endif # SSL_DEFAULT .include Index: security/acme-client/files/extra-patch-GNUmakefile =================================================================== --- security/acme-client/files/extra-patch-GNUmakefile (revision 475177) +++ security/acme-client/files/extra-patch-GNUmakefile (nonexistent) @@ -1,11 +0,0 @@ ---- 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: Property changes on: security/acme-client/files/extra-patch-GNUmakefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property