Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 May 2019 23:38:10 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r501994 - in head/misc: . hashdb
Message-ID:  <201905182338.x4INcAGq030067@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}/;;}
 



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