From nobody Wed Mar 13 10:58:02 2024 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 4TvnY66GVZz5Ccvs; Wed, 13 Mar 2024 10:58:02 +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 4TvnY64DH0z4pS4; Wed, 13 Mar 2024 10:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710327482; 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=HvL57slEgfyEU+5m5isf7kiuvrUKYO5dNRpi86o8Utk=; b=M1SC8t1UtMI7bRChmiDrQWa3s14/efxOhIz2V6X6uibfTiEwGnmABX9LL0pF9XVnkTaKwM xPyJPOa8b+mixcJCY4l9wniudcOYMXyJjohqxA4KKqEUy3HrFwjXCZ7EB7feSvUq8cljGq ybIBNyOCtJqMwsynQpL2oGbykNHIKSy7oSkq8KAcJuWMnJht3IZx/0TB/ZYGd13RanWHxF totSMXwbN/BaGo3FxsDXFrHXSQKcs0g/eBqzb3TxnQzRki2CrXRnxw6nhZZGDaAEYgLJgV J6iIqO3fMuaezLEqGpUAVRiV83gRn1fH0FwNutlJ/p0Ktjn29wejzkXwgAE62g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710327482; a=rsa-sha256; cv=none; b=aNbLUc5JyWiRXe9yyWu4HsVGIFPCD+80va64CwehlXbGPwg8r2OWHtkYLrWkeCtAWyAmuX g/ucErMZ8CEmjcOroxzU8z6rcaaFc/mMSJucKP8XiTBT/G6LNx+ftHMyZ/eGMM2/UniWz9 JXtqqZG8tjJ8X4OGjuhmCYpCFAWAVcw3aLR1Sc5lYypE3OtlDcyd6ju1U5T9ESKc3fhcsK Wh2mZfbAZvT66+l8CfeZL73pQ698djJT3FWcfBgJcpXliCTBd8YM1k2s1LrCrN3o3fAG/I yTIxGSjOkFLstsc+gFtLY6J2B4tRq1G3o5C3qZZonSXRT29IiaLWWxuLaaevKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710327482; 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=HvL57slEgfyEU+5m5isf7kiuvrUKYO5dNRpi86o8Utk=; b=wNbcA3wEoUZ7h5qVnN8miMYJo+nrSrGhYzI9BWROBYsWQeCR5pTKUL5T4an+mSwY0q0My6 wBpWlFDRDC/83ojX5FsFrH2AZrYt1w+1sikMmcrn1XgJSrYyiQnYhtORNqcv5P1NG3Z4v5 l/jSvoxd8vxaz4Pv1j0LKcs4XRui7OHAHm8aEp9HMOaPmCImQ5zWiMGJ3KTGOxoT1qsDVJ Lc9l6KZriV0wIpjacGYh2CHpDF07lM8XwYGNSnjKWjPpoiZDajVCy9c9owzBZuLs0AyB4s kffzpypuSGf4KAhLAF2/+fBLccV374lD3GiutrSmcICZw7wYtBwdEfzIg0Tv9Q== 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 4TvnY63qbFzgbL; Wed, 13 Mar 2024 10:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42DAw2vK027024; Wed, 13 Mar 2024 10:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DAw2sr027021; Wed, 13 Mar 2024 10:58:02 GMT (envelope-from git) Date: Wed, 13 Mar 2024 10:58:02 GMT Message-Id: <202403131058.42DAw2sr027021@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 473cf29a8f51 - main - databases/ldb25: drop hardcoded path, pet portlint (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 473cf29a8f51a5fdb042ae81d711c08116bc68d0 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=473cf29a8f51a5fdb042ae81d711c08116bc68d0 commit 473cf29a8f51a5fdb042ae81d711c08116bc68d0 Author: Dima Panov AuthorDate: 2024-03-13 10:55:36 +0000 Commit: Dima Panov CommitDate: 2024-03-13 10:57:54 +0000 databases/ldb25: drop hardcoded path, pet portlint (+) * replace /usr/local/libdata/pkgconfig with %%PKGCONFIGDIR%% macro in patch * switch to USES+= localbase:ldflags Approved by: portmgr blanket --- databases/ldb25/Makefile | 5 +---- databases/ldb25/files/patch-wscript | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/databases/ldb25/Makefile b/databases/ldb25/Makefile index 69df3c7b72cf..0729907ac55d 100644 --- a/databases/ldb25/Makefile +++ b/databases/ldb25/Makefile @@ -22,7 +22,7 @@ TEST_DEPENDS= ${LDB_DEPENDS} \ cmocka>=1.1.3:sysutils/cmocka RUN_DEPENDS= ${LDB_DEPENDS} -USES= compiler ldap pkgconfig waf +USES= compiler ldap localbase:ldflags pkgconfig waf CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h @@ -79,9 +79,6 @@ PLIST_FILES= ${LDB_BINS} \ .include -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - # Some symbols in ldb's linker version scripts are not defined, but since the # scripts are generated dynamically, suppress errors with lld >= 17 due to these # undefined symbols. diff --git a/databases/ldb25/files/patch-wscript b/databases/ldb25/files/patch-wscript index ff413e81afff..81600dc38d83 100644 --- a/databases/ldb25/files/patch-wscript +++ b/databases/ldb25/files/patch-wscript @@ -5,7 +5,7 @@ if not 'PACKAGE_VERSION' in bld.env: bld.env.PACKAGE_VERSION = VERSION - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ bld.env.PKGCONFIGDIR = '/usr/local/libdata/pkgconfig' ++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' private_library = False else: private_library = True