From owner-svn-ports-head@freebsd.org Sat May 18 23:38:11 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D9E5159ACB6; Sat, 18 May 2019 23:38:11 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D0FC66E1A5; Sat, 18 May 2019 23:38:10 +0000 (UTC) (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C285026B86; Sat, 18 May 2019 23:38:10 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4INcAKv030068; Sat, 18 May 2019 23:38:10 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4INcAGq030067; Sat, 18 May 2019 23:38:10 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201905182338.x4INcAGq030067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 18 May 2019 23:38:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501994 - in head/misc: . hashdb X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc: . hashdb X-SVN-Commit-Revision: 501994 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D0FC66E1A5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 18 May 2019 23:38:11 -0000 Author: yuri Date: Sat May 18 23:38:10 2019 New Revision: 501994 URL: https://svnweb.freebsd.org/changeset/ports/501994 Log: Re-add misc/hashdb configure script is broken because it looks for the SSL_library_init function when it is a macro in some OpenSSL versions. Thanks to tobik@ for the suggested fix. Added: head/misc/hashdb/ - copied from r501983, head/misc/hashdb/ Modified: head/misc/Makefile head/misc/hashdb/Makefile Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Sat May 18 23:21:52 2019 (r501993) +++ head/misc/Makefile Sat May 18 23:38:10 2019 (r501994) @@ -176,6 +176,7 @@ SUBDIR += granulate SUBDIR += grc SUBDIR += gwhich + SUBDIR += hashdb SUBDIR += hb SUBDIR += hello SUBDIR += help2man Modified: head/misc/hashdb/Makefile ============================================================================== --- head/misc/hashdb/Makefile Sat May 18 21:44:34 2019 (r501983) +++ head/misc/hashdb/Makefile Sat May 18 23:38:10 2019 (r501994) @@ -12,16 +12,15 @@ COMMENT= Block hash database tool and API LICENSE= PD LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= swig3.0:devel/swig30 \ - openssl>0:security/openssl +BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libewf.so:devel/libewf -RUN_DEPENDS= openssl>0:security/openssl -USES= autoreconf gmake libtool localbase:ldflags python ssl # USES=ssl fails without openssl added to BUILD_DEPENDS/RUN_DEPENDS/LDFLAGS: see bug#237974 +USES= autoreconf gmake libtool localbase:ldflags python ssl GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= NPS-DEEP -CONFIGURE_ARGS= --disable-static --enable-shared # this fails: https://github.com/NPS-DEEP/hashdb/issues/9 +CONFIGURE_ARGS= ac_cv_lib_ssl_SSL_library_init=yes \ + --disable-static --enable-shared # enable-shared fails: https://github.com/NPS-DEEP/hashdb/issues/9 INSTALL_TARGET= install-strip @@ -30,7 +29,6 @@ BINARY_ALIAS= swig=${LOCALBASE}/bin/swig3.0 CFLAGS+= -fPIC CXXFLAGS+= -fPIC -LDFLAGS+= ${LOCALBASE}/lib/libssl.so ${LOCALBASE}/lib/libcrypto.so PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}