From nobody Sun Apr 2 18:37:27 2023 X-Original-To: dev-commits-ports-all@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 4PqN6v3vYKz441v8; Sun, 2 Apr 2023 18:37:27 +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 4PqN6v3VlLz4GHY; Sun, 2 Apr 2023 18:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680460647; 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=3WHEjd/4nRpl93Y2YGajBWvNH5XsUZPIe7ynXS+hlH4=; b=PaaJvO1d1QMUCsP2eGNN/O4REpTHLy0GMw9465RaygLjXbJYVF3jfFYlFSdCVWSj+/Wp38 qE+yFCQxfDlXroQiFB/wSN6jBKGMh9+ZHKlQVAZn9rKySKuY0OTg3q3pbp/sV74uzXV3g8 UPhuMA6pnaSn2gkcRa9HdBx3+Ifth71qFSfdFot5OwNraNJKdzrs27jRCNCwKNMW88ubMZ FVwSgDTWvI/yeUe3ECMVBhSZs6s4A1pooc1tXWOIkc5rEnGTXG61iuZuDdg5ymWbnDyVrc PQsX9hkUKoC6Jp0sRyv8wkrjO7dYlCAs2NceL8I2XN7vRrWnCTE3lcIwV2IXuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680460647; 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=3WHEjd/4nRpl93Y2YGajBWvNH5XsUZPIe7ynXS+hlH4=; b=T3AM3j4yX3nMTaHeFAenSUJBlvYeIVQlgmniu7NOjdI9k0MyLA8lsa8d6XWQ4Ms3BjY/oH awKW6c3sU/8+goOKkvTvgiWr4V6TGy/mGrQ6ExCfHwRH67FwOScsoplfb4aEXE14aUKPKA 1P1SUw2+1NDmsmD8py/AVS4qtHiniz7vkkD21sMBj1ZyA+MOF99QvD6rPEQGyRK1DbfY39 K9LefWme7LfpPnc3v2YY9OZ10xsSN9+NXuaQ54hoOo6+Ej87cVBImOBSnIsBUqyTgBOltr wWPZYKfayhDwCFCNIsSAHPsjU4gCIazNO+kFMV0gKoTz5eDdSX8lewjQVcF9HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680460647; a=rsa-sha256; cv=none; b=M7TjXL6SDZDYd5JLE9jNtNtC+eGxVuV72SkKndsJHDasTYruN+GGsrLQsU6gYoiszskTBa 8UPQSRftocYEFdx1HoIVzUuklJ2Tqkllxp19KgTCEv6C+FR2h/pHqc6ay1NP9u+x6wkRna SSrKJE11Bd5LzePbdZqAAvD8Ekb6P8HgZpdRnmcogYeQw2ilbwtbyger5RNTFt3FkDXsli z7SdN3sEMn4+if+5SMUgIs3VjvHqDJobd4JV5Xl7QMq4T8Kh3+hmFlE8fokWYDDFqvMePb vTC6k6r4NIa3BW1MOLOpczihuFehZ+mhGH+8Vp3AqXggLYnszf8LR2VVXVPGHw== 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 4PqN6v2ZJtzSS7; Sun, 2 Apr 2023 18:37:27 +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 332IbR20078670; Sun, 2 Apr 2023 18:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332IbRai078669; Sun, 2 Apr 2023 18:37:27 GMT (envelope-from git) Date: Sun, 2 Apr 2023 18:37:27 GMT Message-Id: <202304021837.332IbRai078669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: c3471a56d231 - main - devel/apr1: Update BDB support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3471a56d23194c594c5dcf30ce3e8cebf127a2c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3471a56d23194c594c5dcf30ce3e8cebf127a2c commit c3471a56d23194c594c5dcf30ce3e8cebf127a2c Author: Bernard Spil AuthorDate: 2023-04-02 18:34:41 +0000 Commit: Bernard Spil CommitDate: 2023-04-02 18:34:41 +0000 devel/apr1: Update BDB support * Allow no BDB * Correct license with BDB 18 * Spelling PR: 269857 Submitted by: John Hein --- devel/apr1/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 0665d9648f41..35f77f80c553 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -1,5 +1,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -29,14 +30,15 @@ OPTIONS_SUB= yes OPTIONS_GROUP= APU OPTIONS_DEFINE= IPV6 OPTIONS_GROUP_APU= GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE -OPTIONS_RADIO= BERKLEYDB CRYPTO -OPTIONS_RADIO_BERKLEYDB=BDB BDB5 +OPTIONS_RADIO= BERKELEYDB CRYPTO +OPTIONS_RADIO_BERKELEYDB= BDB BDB5 OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= BDB GDBM SSL APU_DESC= Database support +BDB_DESC= Berkeley DB support (AGPLv3) BDB5_DESC= Berkeley DB v5 support (deprecated) -BERKLEYDB_DESC= Berkley DB provider +BERKELEYDB_DESC= Berkeley DB provider CRYPTO_DESC= Cryptography provider NDBM_DESC= NDBM support NSS_DESC= NSS crypto driver @@ -83,8 +85,9 @@ IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6 # to avoid failures if previous apr_version.h is present APU_CPPFLAGS= -I${APR_WRKDIR}/include -BDB_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -BDB_VARS_OFF= APU_CONF_ARGS+=--without-berkeley-db +BDB_VARS= ${BDB5_VARS} \ + LICENSE_COMB=dual LICENSE+=AGPLv3 +BDB5_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} \ GDBM_VARS= APU_CONF_ARGS+=--with-gdbm=${LOCALBASE} LDAP_VARS= APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap" @@ -115,6 +118,10 @@ APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${AP .include +.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB5} +APU_CONF_ARGS+= --without-berkeley-db +.endif + .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} APU_CONF_ARGS+= --with-crypto .else