From nobody Fri Nov 05 18:04:29 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 E6CFE184A1F6; Fri, 5 Nov 2021 18:04:29 +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 4Hm7gd69dJz4tND; Fri, 5 Nov 2021 18:04:29 +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 B41341C3F4; Fri, 5 Nov 2021 18:04:29 +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 1A5I4TCI089875; Fri, 5 Nov 2021 18:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A5I4T7B089874; Fri, 5 Nov 2021 18:04:29 GMT (envelope-from git) Date: Fri, 5 Nov 2021 18:04:29 GMT Message-Id: <202111051804.1A5I4T7B089874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 3b29bf80e140 - main - databases/pgbouncer: Fix config file 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b29bf80e1405bd318e0bc2f402de428e53d9ee3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b29bf80e1405bd318e0bc2f402de428e53d9ee3 commit 3b29bf80e1405bd318e0bc2f402de428e53d9ee3 Author: Muhammad Moinur Rahman AuthorDate: 2021-11-05 18:00:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-11-05 18:04:18 +0000 databases/pgbouncer: Fix config file - No need to replace pgbouncer.log as the config mentions the absolute path /var/log/pgbouncer/pgbouncer.log now - No need to replace pgbouncer.pid as the config mentions the absolute path /var/run/pgbouncer/pgbouncer.log now - References to other files in /etc/ is changed with ${PREFIX}/etc specially pgbouncer.users which had a reference to /etc directory - No longer requires gsed so removed the BUILD_DEPENDS - There was a pkg-message.in file which was not called using SUB_FILES; added accordingly PR: 259474 Approved by: m.tsatsenko@gmail.com (maintainer) Sponsored by: Bounce Experts --- databases/pgbouncer/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index 430486806c35..46fb6eccbf26 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -2,6 +2,7 @@ PORTNAME= pgbouncer PORTVERSION= 1.16.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \ http://pgbouncer.github.io/downloads/files/${PORTVERSION}/ @@ -12,7 +13,6 @@ COMMENT= Lightweight connection pooler for PostgreSQL LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:devel/libevent -BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed USES= cpe gmake ssl pkgconfig @@ -42,13 +42,13 @@ PLIST_SUB+= PGBOUNCER_USER="${USERS}" \ PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \ PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" +SUB_FILES= pkg-message post-patch: - @${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \ - -e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \ + @${REINPLACE_CMD} -e "s|= /etc/pgbouncer/userlist.txt|= ${PREFIX}/etc/pgbouncer.users|g" \ + -e "s|= /etc/pgbouncer/resolv.conf|= ${PREFIX}/etc/pgbouncer-resolv.conf|g" \ + -e "s|include /etc/pgbouncer/pgbouncer-other.ini|include ${PREFIX}/etc/pgbouncer-other.ini|g" \ ${WRKSRC}/etc/pgbouncer.ini - @${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \ - ${WRKSRC}/lib/find_modules.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/