From nobody Mon Jul 18 16:58:25 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lmp7j5l6cz4Wcny; Mon, 18 Jul 2022 16:58:25 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lmp7j5Fx4z3Q7L; Mon, 18 Jul 2022 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658163505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHKWWmSPqH7xuDw1Eg+U/8UDSb0KD7L3WuXWJSs9SCQ=; b=uLNuXUe2EsyqwLkAq3cmECWplqNqLcGLOKkmWWjq+1BQeX84KWoTdWxAMHajZhbNlTRI/w tQxb3RkRoTwZWBZuJZAkWKx0Ea20rD1M3FZY5OHspzrgnV9piqHrOBASL9RUBJcQT103ZF SsmwhX87iQld0nz/tScLI4+3DMv7aWVN4KNrI6ogX9T7djesYNKCErIb/K4zZuiom5/eF6 OCzv7MFoJm+sBTTQErb44cDaNMJVYdHVQqdnCevv8ogBBnqGO3Oom1yAIOMhU6NlMmxoYQ S8wkUjA+mpizx2dxsxZHLYjj4UB67sc6tBXRaBBkwEyzXFPKMiAeh+3oxlgcVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lmp7j4KWNzmd3; Mon, 18 Jul 2022 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26IGwP69023257; Mon, 18 Jul 2022 16:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IGwPup023256; Mon, 18 Jul 2022 16:58:25 GMT (envelope-from git) Date: Mon, 18 Jul 2022 16:58:25 GMT Message-Id: <202207181658.26IGwPup023256@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 07a6a3f0630c - 2022Q3 - databases/db18: Fix linking problem about OpenSSL List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 07a6a3f0630c7d74b5f305badee9118614437c0a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658163505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHKWWmSPqH7xuDw1Eg+U/8UDSb0KD7L3WuXWJSs9SCQ=; b=EDN1JLpkGfM6Kf7BKrzePtB8fldZtan+TrExuYwqCihuQwoL1+Wdb0301RtCA+twnm1grV EyjbejNgVK8qovPcUjI1oGhVXghORDkZdqLAEDb6Qie2t0u/1V2V7v3EkyL236KwNjvnkc mBDsMheINjtC6hl7e7ik1VxQSc1Zi9ft6PiqXo02EFaJ5S4EmDXmmagdwli71nEpcJ+p/x xsc7V4ydD6tIILfzeIsJZGyj5eV+82ivcz2o/HKOEOaZjK12hJ3qQM4lcn0W8qeARbIokU r1mkMf5TLiCizPuLsa6punAy1OIIneWUUotrkIf5hblMytxp1xUyvljFTx1rgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658163505; a=rsa-sha256; cv=none; b=jAEZs9buxMsSKqayiq1e6rA53djYTqgsWrIc3w8onfLt7y+/CCdj6Wc7fb0qSg+Fepb5cq FWAoMkzjw3EV9J5yvjtrT4gy7ZJaBI0Fb0b5E9coQvJ3Il2iooUZdxPUHeYIMBFPyqTO0x +yftEVYGeSJy6wRG6rYxMYu4JXAt1fZuBL9DhXzrd372RqdKvOplzgnVDA5trOg6e+JbFG drApEtgjDcBUCPKXhK70JeYbUASejMmw8ICwQcJ9JkCM7V9uR/zxMg1yNy4rgiHZ+c3EUD cbjxUguv6IuZ2zh8A4CPMre6MAODksrpIVR50EXjxWuLT5cIJqz9rfkiLiA0WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=07a6a3f0630c7d74b5f305badee9118614437c0a commit 07a6a3f0630c7d74b5f305badee9118614437c0a Author: Toshimichi Masubuchi AuthorDate: 2022-07-18 16:36:12 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-07-18 16:57:52 +0000 databases/db18: Fix linking problem about OpenSSL Fix the problem that OpenSSL in base system is linked even if 'DEFAULT_VERSIONS=ssl=openssl' is specified in make.conf. While I'm here, * Pet portlint and portclippy. * Tidy up Makefile with portfmt. PR: 264520 MFH: 2022Q3 (cherry picked from commit 043c4ce17d47717559aeb567b04d1913ec0626b6) --- databases/db18/Makefile | 70 ++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/databases/db18/Makefile b/databases/db18/Makefile index 92d297c91fb3..0dc62eb51d5b 100644 --- a/databases/db18/Makefile +++ b/databases/db18/Makefile @@ -16,52 +16,68 @@ COMMENT= Oracle Berkeley DB, Release ${BDBVER} LICENSE= AGPLv3 BSD3CLAUSE UPL10 LICENSE_COMB= multi LICENSE_NAME_UPL10= The Universal Permissive License (UPL), Version 1.0 -LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_FILE_UPL10= ${WRKSRC}/../EXAMPLES-LICENSE +LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_PERMS_UPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_mips64= no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared -BDBVER= ${PORTVERSION:R} -BDBMAJ= ${BDBVER:R} -CONFIGURE_ARGS= --enable-cxx --enable-stl --enable-dbm \ - --enable-compat185 --enable-dump185 \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -CONFIGURE_SCRIPT= ../dist/configure -GNU_CONFIGURE= yes USES= gmake libtool ssl -INSTALL_TARGET= install_include install_lib install_utilities -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes -PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} + +GNU_CONFIGURE= yes +CONFIGURE_SCRIPT= ../dist/configure +CONFIGURE_ARGS= --bindir=${PREFIX}/bin/${PORTNAME} \ + --enable-compat185 \ + --enable-cxx \ + --enable-dbm \ + --enable-dump185 \ + --enable-stl \ + --includedir=${PREFIX}/include/${PORTNAME} \ + --libdir=${PREFIX}/lib/${PORTNAME} + MAKE_ARGS+= docdir=${DOCSDIR} +INSTALL_TARGET= install_include install_lib install_utilities -OPTIONS_DEFINE= CRYPTO DEBUG L10N JAVA TCL DOCS -OPTIONS_DEFAULT=CRYPTO -OPTIONS_SUB= yes -CRYPTO_DESC= Cryptography support -L10N_DESC= Localization support (EXPERIMENTAL) +CFLAGS+= -I${OPENSSLINC} +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} + +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +PLIST_SUB= BDBMAJ=${BDBMAJ} \ + BDBVER=${BDBVER} PORTDOCS= * -DBLIBS= libdb libdb_cxx libdb_stl +OPTIONS_DEFINE= CRYPTO DEBUG DOCS JAVA L10N TCL +OPTIONS_DEFAULT= CRYPTO +OPTIONS_SUB= yes + +CRYPTO_DESC= Cryptography support +L10N_DESC= Localization support (EXPERIMENTAL) -DEBUG_CONFIGURE_ENABLE= debug umrw CRYPTO_CONFIGURE_WITH= cryptography=yes -L10N_CONFIGURE_ENABLE= localization +DEBUG_CONFIGURE_ENABLE= debug umrw +DOCS_INSTALL_TARGET= install_docs JAVA_USE= java -JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="7+" JAVA_CONFIGURE_ENABLE= java +JAVA_CONFIGURE_ENV= JAR="${JAR}" \ + JAVA="${JAVA}" \ + JAVAC="${JAVAC}" JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" -JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" -TCL_CONFIGURE_ENABLE= tcl +JAVA_VARS= DBLIBS+=libdb_java \ + JAVA_VERSION="7+" +L10N_CONFIGURE_ENABLE= localization TCL_USES= tcl +TCL_CONFIGURE_ENABLE= tcl TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} -TCL_VARS= DBLIBS+=libdb_tcl -DOCS_INSTALL_TARGET= install_docs +TCL_VARS= DBLIBS+=libdb_tcl + +BDBVER= ${PORTVERSION:R} +BDBMAJ= ${BDBVER:R} + +DBLIBS= libdb libdb_cxx libdb_stl .include