From nobody Wed Nov 24 06:18:01 2021 X-Original-To: dev-commits-ports-main@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 D70D6189E9FC; Wed, 24 Nov 2021 06:18:01 +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 4HzW5j3FxPz4d0P; Wed, 24 Nov 2021 06:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4FB7324EA1; Wed, 24 Nov 2021 06:18:01 +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 1AO6I1WY097546; Wed, 24 Nov 2021 06:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO6I13k097545; Wed, 24 Nov 2021 06:18:01 GMT (envelope-from git) Date: Wed, 24 Nov 2021 06:18:01 GMT Message-Id: <202111240618.1AO6I13k097545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 245421553605 - main - net/openldap25-server: Make mdb, relay and syncrepl built-in. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2454215536053fc775c17e8655f308de4721683f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637734681; 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=mZrOl5fgbAV1/OBhVY//ENXBdz56DPMkJGdu4t2asU0=; b=cNvPo7q/Kw2QTbLAEjnZOmsszC1lAXPOeCvXxttKv3y7eVH2YbUtt8iRJVnWRUZnqas4QH ag9aPKBORQrcaL5RYCpLU6WP/gzSOPfC+2Tp+gAO4dLZ7NF34Z0KpEJzU/CGGuYVqLHGCX I5q2rqJALja8247IFVEi10D+4bifWTJqjdL/9lea6LZNLQGMrt8U3sZnQi3DkT3fUAWD7h DcIUGi/Mi55LiTMBquMH3iyDQprCruG2ERrLM/Ro4HqOvT6CGQuMjYt/2gHzJQt52beag0 dlB/YSXh2JK4IQGFqe49PJmk9arlFYrLZFNUuYatEPqsnKpzqNK2cH2XItDiEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637734681; a=rsa-sha256; cv=none; b=DF9aBk64+vx1uKlM5lk+GEmuNnuZKPbnl0bGzVmSI0bxSnNCYDEeg3gcHwUAo29grpPzMb vml83trCzrLb3VGfQSG9/pZxvrKxVDlZTPLziLf8vhTWDo8Lk5o5KorIep5mwIWnihI9cO eEMQRJZbUmr6ggzz+WTZOVi/3yVvy0sbxwSDl2v2vjOlzerypNamkk4nOB+JHWRiditStU 5H3WcjjYTuS5Q3A+VHe+j3ETfoNhEkKrqmxn6pYcyCEanZUjcaL6xEgEEU1kN7H6SaYLQU 5k+1VUFU5QEDiQwvXpdVDzojFlGuUP+WjiJWO6ZnXvrS67oGh/cG5TpFPaQG0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=2454215536053fc775c17e8655f308de4721683f commit 2454215536053fc775c17e8655f308de4721683f Author: Xin LI AuthorDate: 2021-11-24 06:14:26 +0000 Commit: Xin LI CommitDate: 2021-11-24 06:17:27 +0000 net/openldap25-server: Make mdb, relay and syncrepl built-in. The upstream builds the mdb backend and relay, syncrepl built-ins. Following the upstream would avoid confusion with examples as they sometimes do not include the required load directives. --- net/openldap25-server/Makefile | 8 ++++---- net/openldap25-server/pkg-plist | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 68ed4f0c1c4c..c554842cf117 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-* GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 0 OPENLDAP_SHLIB_MINOR= 1.4 OPENLDAP_MAJOR= ${DISTVERSION:R} @@ -195,7 +195,7 @@ DYNLIST_CONFIGURE_ENABLE= dynlist=mod HOMEDIR_CONFIGURE_ENABLE= homedir=mod LLOADD_CONFIGURE_ENABLE= balancer=mod LLOADD_LIB_DEPENDS= libevent.so:devel/libevent -MDB_CONFIGURE_ENABLE= mdb=mod +MDB_CONFIGURE_ENABLE= mdb=yes MEMBEROF_CONFIGURE_ENABLE= memberof=mod OTP_CONFIGURE_ENABLE= otp=mod PASSWD_CONFIGURE_ENABLE= passwd=mod @@ -205,7 +205,7 @@ PERL_USES= perl5 PPOLICY_CONFIGURE_ENABLE= ppolicy=mod PROXYCACHE_CONFIGURE_ENABLE= proxycache=mod REFINT_CONFIGURE_ENABLE= refint=mod -RELAY_CONFIGURE_ENABLE= relay=mod +RELAY_CONFIGURE_ENABLE= relay=yes REMOTEAUTH_CONFIGURE_ENABLE= remoteauth=mod RETCODE_CONFIGURE_ENABLE= retcode=mod RLOOKUPS_CONFIGURE_ENABLE= rlookups @@ -220,7 +220,7 @@ SQL_CONFIGURE_ENABLE= sql=mod SQL_LDFLAGS= -L${LOCALBASE}/lib SQL_LIB_DEPENDS= libodbc.so:databases/unixODBC SSSVLV_CONFIGURE_ENABLE= sssvlv=mod -SYNCPROV_CONFIGURE_ENABLE= syncprov=mod +SYNCPROV_CONFIGURE_ENABLE= syncprov=yes TRANSLUCENT_CONFIGURE_ENABLE= translucent=mod UNIQUE_CONFIGURE_ENABLE= unique=mod VALSORT_CONFIGURE_ENABLE= valsort=mod diff --git a/net/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist index 818928f2a447..4bdf2cce7dc1 100644 --- a/net/openldap25-server/pkg-plist +++ b/net/openldap25-server/pkg-plist @@ -119,10 +119,6 @@ %%LLOADD%%libexec/%%PORTNAME%%/lloadd-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%% %%LLOADD%%libexec/%%PORTNAME%%/lloadd.la %%LLOADD%%libexec/%%PORTNAME%%/lloadd.so -%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%MDB%%libexec/openldap/back_mdb.la -%%MDB%%libexec/openldap/back_mdb.so %%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% %%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%MEMBEROF%%libexec/openldap/memberof.la @@ -161,10 +157,6 @@ %%REFINT%%libexec/openldap/refint-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%REFINT%%libexec/openldap/refint.la %%REFINT%%libexec/openldap/refint.so -%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%RELAY%%libexec/openldap/back_relay.la -%%RELAY%%libexec/openldap/back_relay.so %%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0 %%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%% %%REMOTEAUTH%%libexec/openldap/remoteauth.la @@ -208,10 +200,6 @@ %%SSSVLV%%libexec/openldap/sssvlv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%SSSVLV%%libexec/openldap/sssvlv.la %%SSSVLV%%libexec/openldap/sssvlv.so -%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%SYNCPROV%%libexec/openldap/syncprov.la -%%SYNCPROV%%libexec/openldap/syncprov.so %%TRACE%%libexec/openldap/trace.la %%TRACE%%libexec/openldap/trace.so %%TRACE%%libexec/openldap/trace.so.0