From nobody Sat Aug 24 10:37:37 2024 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 4WrYKs5Bjcz5VZTm; Sat, 24 Aug 2024 10:37:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WrYKs3RsXz4w5N; Sat, 24 Aug 2024 10:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724495857; 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=vi3ASj0QdlGZNfGnzii/W5IipmZmnqXZqqV2vLxylXs=; b=QPpcOVBiFkLU+vsv2JtwbJvxHYfkYlyWI4JeKG9bPru2JBfiU0UBPp0m5pIzL9r2/38F8Q q7OoWH9Cke/GsuY2XOStD6L9b7Et0+/TMI+lzKEiwBf9NsnJy/7JJ3uvg55LqiUXSh6+4+ ZgCG3l+PLM83WcJGvL4j39ufd4Vb31TtOritVMCf8CIIpS+6Pommpi6joKrSfDNkOLza0K wfOVltvUNp6fg6Gdb683x/6sJ1P5Tne1G8E2qkeUGqMpaD0qtDqd9X+y2MdM2m4zBHS8S/ yzyouBo5xuHp0K6IKHC6MJ/T/o+gBHk9DfiKAFhA5LTInu/q5W5prmnL21E6Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724495857; a=rsa-sha256; cv=none; b=ZjvONEt8hhF7BGpG9NczTC1DrVLwhaP3ku1eFqfXMJBW8OCMCv622ZSMSaw89yp297R+ms NrLMCbDzfL1MiOX4aB/TEqX3OkkifeuwhGl0vy5t+q1yy+c5lWvWfJWro2oUbMKWehokjY lPKyoRkfzo2Yty2KUKOqewwVxzjCuXVpUpAi7F1vGIgj+UDC8nmq7N6OMhaISFRp5ujAxB 8+XYO0H0bptdYfuteucqm1gBQdVPOtALpdFstilLuOcrf0Q98ShSPvBFrBRzheRKS+ySLm wpe6a4MaVuQbUlMDSVIdFU4KPhyMur4L4lxgstdWnGqj+0kkGimKulGkJYFbsA== 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=1724495857; 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=vi3ASj0QdlGZNfGnzii/W5IipmZmnqXZqqV2vLxylXs=; b=EFe+KTy/8q/IV2fuxB9FGLiMJuKeFAj6wJB6Td7lH/fe/4+bsP3AZnrQbyC/5Oo8oD44LR 3kihUC/2MaWTlpbQ5l5tA4xIVpyzoNYWLvViOtcZQDqnHGPzCKWF1Iuac9zmuB9yZkei15 wnBZ2T+Jfb+IfNHsOCGs3nVzAoaT6QHWBGBnak+gv5gssA1CjSQYpMwkS9qkehypxskiLj scs7mBjIIrGnws9a7lyiU5nzHBojZNzvXQ5WfHYzL2ze3/SMm5SlZv4p4VheiWA9n9ZHl9 3+ID79ua1jYZcIrE11gMWOuqxIfMIM8tpa02zZzC/jpU1pllAT4UWcvx6FZYdg== 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 4WrYKs2ZwZzrXx; Sat, 24 Aug 2024 10:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47OAbb4x094560; Sat, 24 Aug 2024 10:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47OAbbXZ094557; Sat, 24 Aug 2024 10:37:37 GMT (envelope-from git) Date: Sat, 24 Aug 2024 10:37:37 GMT Message-Id: <202408241037.47OAbbXZ094557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8304729b55c5 - main - databases/postgresql-libpqxx: Convert to CMake and modernize 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8304729b55c5c307b0b6abfc737092a6004ba6ea Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8304729b55c5c307b0b6abfc737092a6004ba6ea commit 8304729b55c5c307b0b6abfc737092a6004ba6ea Author: Daniel Engberg AuthorDate: 2024-08-24 10:32:01 +0000 Commit: Daniel Engberg CommitDate: 2024-08-24 10:36:02 +0000 databases/postgresql-libpqxx: Convert to CMake and modernize * Switch to CMake as it cleans up Makefile, builds faster and adds .cmake files to port * Modernize port Makefile * Remove ancient CONFLICTS entry PR: 281022 Approved by: pgsql (girgen) --- databases/postgresql-libpqxx/Makefile | 23 ++++++++++------------- databases/postgresql-libpqxx/pkg-plist | 7 +++++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index bbaac70b416d..ca2b51e0b5ca 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -1,5 +1,6 @@ PORTNAME= libpqxx -PORTVERSION= 7.9.2 +DISTVERSION= 7.9.2 +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= postgresql- DIST_SUBDIR= postgresql @@ -9,22 +10,18 @@ COMMENT= New C++ interface for PostgreSQL WWW= http://pqxx.org/ LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= postgresql-libpqxx-[1-5].* postgresql-libpqxx3-3.* \ - postgresql-libpqxx4-4.* +USES= cmake compiler:c++17-lang pathfix pkgconfig pgsql +USE_LDCONFIG= yes -USES= compiler:c++17-lang gmake libtool pathfix pgsql python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= jtv -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -SHEBANG_FILES= ${WRKSRC}/tools/splitconfig.py -INSTALL_TARGET= install-strip -PLIST_SUB= PORTVERSION=${PORTVERSION:R} -CONFIGURE_ARGS= --enable-shared \ - --disable-documentation \ - --disable-dependency-tracking -CXXFLAGS+= -std=c++17 +PLIST_SUB= DISTVERSION=${DISTVERSION:R} + +CMAKE_OFF= BUILD_TEST +CMAKE_ON= BUILD_SHARED_LIBS \ + CMAKE_SKIP_RPATH .include diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist index 578af99171d9..b9ec279b3e0e 100644 --- a/databases/postgresql-libpqxx/pkg-plist +++ b/databases/postgresql-libpqxx/pkg-plist @@ -106,7 +106,10 @@ include/pqxx/version include/pqxx/version.hxx include/pqxx/zview include/pqxx/zview.hxx -lib/libpqxx-%%PORTVERSION%%.so -lib/libpqxx.a +lib/cmake/libpqxx/libpqxx-config-version.cmake +lib/cmake/libpqxx/libpqxx-config.cmake +lib/cmake/libpqxx/libpqxx-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libpqxx/libpqxx-targets.cmake +lib/libpqxx-%%DISTVERSION%%.so lib/libpqxx.so libdata/pkgconfig/libpqxx.pc