From nobody Sat Mar 23 14:58:07 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 4V22PW668Jz5F803; Sat, 23 Mar 2024 14:58:07 +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 4V22PW3N3Qz58YB; Sat, 23 Mar 2024 14:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711205887; 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=G+eUqpCso9USuxITtHoU69lnpIrUCxGf98DYaZ+yo9c=; b=K4gmvWlJe9cTaHsZkaeh79Y+MrDBzjQZuWcWc3zbmxtQeadNBoD87EVyu16Wob3PQ4ql/a dnM+pRX7IdtgtAS4dFb5ZdfMTIL/9wx7+3UvSq8gfm1yXlLAilXOPQPqXF7PEAWNouq2k8 d3FiPBRouAcPQUt8cbrZZ0IADabNWCgG2mt43BBrl+ST8nngiQn+3bLKVWqhDDq9kouxAb VowXQ9jIggCHDCgCqUotclCi3s0GgM8tsFnQwH49m4mbY7Iq8AtFwHvUqiKZvaKq48ixBn D9i/mBrU+V/bys9wPeqmPezcvLpHbFxrCmvUC/FeqzhAKUpdIQ5vfOzqU5pQRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711205887; a=rsa-sha256; cv=none; b=uHwstq5CRe+D105C2KNIKzL1TL0TqJmsPOSedoKVDAoibIdMwXcsr+uvDV3nlx3D9ZLBjv JZCZoZ3m/PsdrcfElZt/96agHQBsr39E1f+73kb6BgqCEh7KKPkbeDGJ4b3/0O6bEiwq59 fFXqR/NDn6E5oP82lYTaXPBj6R4kKslwYoT8g5y9lqP/b33vLmYKOCDifvkdyxsCj+4Lp2 3Rkh/ahWherxIDDAoKAPg38eRZqwYfIS5gxAGeLbTd8bOZeschNm9jwEf92G6oMbvf2uk8 BowwA0UCKblT5FL9oeW6PcIbFek6ciXvkGUA6k2kPM6QeB7hab/tcePXIpz+hA== 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=1711205887; 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=G+eUqpCso9USuxITtHoU69lnpIrUCxGf98DYaZ+yo9c=; b=InOUZnNeDX8DU+N3TcRuBE/Bqk2x7ruZ5GXvNCTO9k1ElgBBW7099feEAK3r5ZlWqR6l3h XF2OMtpc/45XN6weIfgy13EJ4vl4rICag5j5Jq52xalmDdI8SfTxpAej8qQLtmtb0rCGoF c/sOAqfUREvP6m5JDfcFpkEh1M3+8+zDd8d1ZYvKjkXUT1meTATSalK8QbC2hxr4GAu2Wd uYABVuF0FUMfAgQYalmaykE0iBhLKjDDa6o5Gk90Znv1BPd0gt/iazwCQw6v7mFQiZXtj+ yCnL8myt0Z/8qOcLRbRdBGVg+Z4vGOYM/0oyVJ4rcE/K+Xk6CeheqGE0CI6ubw== 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 4V22PW2Vd2zsh0; Sat, 23 Mar 2024 14:58:07 +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 42NEw7Li084739; Sat, 23 Mar 2024 14:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NEw7sv084736; Sat, 23 Mar 2024 14:58:07 GMT (envelope-from git) Date: Sat, 23 Mar 2024 14:58:07 GMT Message-Id: <202403231458.42NEw7sv084736@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 881ef1a077b2 - main - devel/github-backup-utils: Convert REINPLACE_CMD to patch 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 881ef1a077b2fe77b8d94b5668f98afb10c6209c Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=881ef1a077b2fe77b8d94b5668f98afb10c6209c commit 881ef1a077b2fe77b8d94b5668f98afb10c6209c Author: Po-Chuan Hsieh AuthorDate: 2024-03-23 14:18:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-23 14:30:40 +0000 devel/github-backup-utils: Convert REINPLACE_CMD to patch file --- devel/github-backup-utils/Makefile | 2 +- ...tch-share-github-backup-utils-ghe-backup-config | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/devel/github-backup-utils/Makefile b/devel/github-backup-utils/Makefile index 23d149e33121..d94133d70b2a 100644 --- a/devel/github-backup-utils/Makefile +++ b/devel/github-backup-utils/Makefile @@ -25,7 +25,7 @@ SUB_FILES= pkg-message SHEBANG_FILES= bin/* share/github-backup-utils/* post-patch: - @${REINPLACE_CMD} -e 's|/etc/github-backup-utils/backup.config|${PREFIX}/etc/github.backup.config|g' ${WRKSRC}/share/github-backup-utils/ghe-backup-config + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/share/github-backup-utils/ghe-backup-config do-install: cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin diff --git a/devel/github-backup-utils/files/patch-share-github-backup-utils-ghe-backup-config b/devel/github-backup-utils/files/patch-share-github-backup-utils-ghe-backup-config new file mode 100644 index 000000000000..52111dc37e92 --- /dev/null +++ b/devel/github-backup-utils/files/patch-share-github-backup-utils-ghe-backup-config @@ -0,0 +1,22 @@ +% sed -i '' 's|/etc/github-backup-utils/backup.config|%%PREFIX%%/etc/github.backup.config|g' share/github-backup-utils/ghe-backup-config + +--- share/github-backup-utils/ghe-backup-config.orig 2024-02-15 22:08:04 UTC ++++ share/github-backup-utils/ghe-backup-config +@@ -59,7 +59,7 @@ for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup + # first and then fall back to the backup-utils root, home directory and system. + config_found=false + for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup.config" \ +- "$HOME/.github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do ++ "$HOME/.github-backup-utils/backup.config" "%%PREFIX%%/etc/github.backup.config"; do + if [ -f "$f" ]; then + GHE_BACKUP_CONFIG="$f" + # shellcheck disable=SC1090 # This is a user-supplied value that can't be predicted +@@ -259,7 +259,7 @@ if ! $config_found; then + [ -n "$GHE_BACKUP_CONFIG" ] && echo " - $GHE_BACKUP_CONFIG" 1>&2 + echo " - $GHE_BACKUP_ROOT/backup.config" 1>&2 + echo " - $HOME/.github-backup-utils/backup.config" 1>&2 +- echo " - /etc/github-backup-utils/backup.config" 1>&2 ++ echo " - %%PREFIX%%/etc/github.backup.config" 1>&2 + exit 2 + fi +