From nobody Wed Dec 13 20:43:56 2023 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 4Sr6s85kvqz54HlP; Wed, 13 Dec 2023 20:43:56 +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 4Sr6s851mxz3Gly; Wed, 13 Dec 2023 20:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702500236; 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=mdsOcXDj+ljML4did2Lzfx3z2vBrO4Vj0q+K+gWLuSo=; b=kymXlk6o0JNAja9sDhKeDNdc5LQtaMQlqv5nRgn73JF/ZbFX5RVqNoF+XgvoNBmWAGL80R JZdQVH0EMtrR+YvJ8JnAGeBz24JodcdRLA0E3O7BejSbNX2mVZyDKg0dVprmz0rcF5EHTS QK7r95fk4nphjO18UDEX6CS8uOeREHEJJ5g9kgfmtt9GarN6MKxmnMgDnDM31bxvHVN8lZ ixBcyvReb602vx0j2CHOxvu+w1uZgbXDpbyIk0IFuoMHpfC2Ivksj1bMQHYJVdJDjHBxAK S1wQizhSDqYcXRw3m0uadm63olZxluF3iNu4s77lVhKyOB1lBVdb5oNWHMUmxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702500236; a=rsa-sha256; cv=none; b=i988LJ8/poe6iqrnqL9n7hu4YjcvKRClYa8uHoVCkcA7vTJk2CVb51rkJyl9KsLkjhj+CQ naA4VRfw9EOSdU6m9knCHvWC6PXaKwZDOMJ5HG/1GEsT3DkmWPObqF/3zoOI0auJLtXKlh 6f8VHrESAXpwDpzQeGkWSz5MMo4j/Oy5XM5NKFJg1UgHvxQlR44yLIL6thlY4RqVzrjPIc +SFgzJwuqLCbPm7bJLTHslcfdx0fi7Emhpcgu6rZmxFNVgbjfFYRj37Do3BAW+v8eCQTfH 5tTE1vdhC4l1h/7p26MRTdbHEHt89JQc5g4r3zSondIXFDtRpdu07ZS+iHZrCg== 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=1702500236; 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=mdsOcXDj+ljML4did2Lzfx3z2vBrO4Vj0q+K+gWLuSo=; b=DPZHkKrqaJDFAi2nozuLLinxyU0D8PhgEL8R/bmI82ykIYUtH5DfAuYJucIVX0+J7h1nZ5 4/8wJHFCiK5Or6dc3OUg6sC/RbB3bGNdCvrid8aY+EFmd6js7WAMgObyTj3uUUO47t668U 5TDHTCtO+SX6MVgrS0sEUTOHve0WB23DMRAdLoXtT7jBlmh7DqTUl6LEqZTdbqCahKq2Zr LI/uNXl1VAMfy9wU6JVPCHyqmcwXZuAMOURvyyydTFEzaWUA2fQjS+BnDKd+TEBVm0zHWx ZZLE4PFLfKmrcGKyZd0y09xFoyLmo2pZ71aUXNjkWXTKmG8ZBerMK6iwuvSF1Q== 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 4Sr6s847qFz1Cr3; Wed, 13 Dec 2023 20:43:56 +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 3BDKhuaS054225; Wed, 13 Dec 2023 20:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDKhuZN054222; Wed, 13 Dec 2023 20:43:56 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:43:56 GMT Message-Id: <202312132043.3BDKhuZN054222@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: 413dced10985 - main - sysutils/gitwatch: Update version 0.1.a.20200814=>0.2 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: 413dced1098590cefae138c8833cf66d1169d9eb Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=413dced1098590cefae138c8833cf66d1169d9eb commit 413dced1098590cefae138c8833cf66d1169d9eb Author: Muhammad Moinur Rahman AuthorDate: 2023-12-13 16:50:18 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-13 20:43:43 +0000 sysutils/gitwatch: Update version 0.1.a.20200814=>0.2 Changelog: https://github.com/gitwatch/gitwatch/releases/tag/v0.2 --- sysutils/gitwatch/Makefile | 5 +- sysutils/gitwatch/distinfo | 6 +- sysutils/gitwatch/files/patch-gitwatch.sh | 127 ------------------------------ 3 files changed, 5 insertions(+), 133 deletions(-) diff --git a/sysutils/gitwatch/Makefile b/sysutils/gitwatch/Makefile index 91333426f93c..4643ecf16f77 100644 --- a/sysutils/gitwatch/Makefile +++ b/sysutils/gitwatch/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitwatch -DISTVERSION= 0.1.a.20200814 +DISTVERSIONPREFIX= v +DISTVERSION= 0.2 CATEGORIES= sysutils MAINTAINER= bofh@FreeBSD.org @@ -17,8 +18,6 @@ USES= shebangfix USE_GITHUB= yes USE_RC_SUBR= ${PORTNAME} -GH_TAGNAME= e62df74 - SHEBANG_FILES= ${WRKSRC}/${PORTNAME}.sh NO_ARCH= yes diff --git a/sysutils/gitwatch/distinfo b/sysutils/gitwatch/distinfo index ce9fcf25aacc..c0a45fc28765 100644 --- a/sysutils/gitwatch/distinfo +++ b/sysutils/gitwatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1605403644 -SHA256 (gitwatch-gitwatch-0.1.a.20200814-e62df74_GH0.tar.gz) = d66d9fa89619a693c3441dbf59ddd11fa4048f85f63194452a68024d75aa3b8a -SIZE (gitwatch-gitwatch-0.1.a.20200814-e62df74_GH0.tar.gz) = 21889 +TIMESTAMP = 1702485900 +SHA256 (gitwatch-gitwatch-v0.2_GH0.tar.gz) = 38fd762d2fa0e18312b50f056d9fd888c3038dc2882516687247b541b6649b25 +SIZE (gitwatch-gitwatch-v0.2_GH0.tar.gz) = 25123 diff --git a/sysutils/gitwatch/files/patch-gitwatch.sh b/sysutils/gitwatch/files/patch-gitwatch.sh deleted file mode 100644 index c4c88aeef64c..000000000000 --- a/sysutils/gitwatch/files/patch-gitwatch.sh +++ /dev/null @@ -1,127 +0,0 @@ ---- gitwatch.sh.orig 2020-11-15 05:05:21 UTC -+++ gitwatch.sh -@@ -43,6 +43,9 @@ COMMITMSG="Scripted auto-commit on change (%d) by gitw - LISTCHANGES=-1 - LISTCHANGES_COLOR="--color=always" - GIT_DIR="" -+GIT="$(which git)" -+INW="$(which inotifywait)"; -+EVENTS="${EVENTS:-close_write,move,move_self,delete,create,modify}" - - # Print a message about how to use this script - shelp () { -@@ -97,12 +100,6 @@ shelp () { - echo "It is therefore recommended to terminate the script before changing the repo's" - echo "config and restarting it afterwards." - echo "" -- echo "By default, gitwatch tries to use the binaries \"git\" and \"inotifywait\"," -- echo "expecting to find them in the PATH (it uses 'which' to check this and will" -- echo "abort with an error if they cannot be found). If you want to use binaries" -- echo "that are named differently and/or located outside of your PATH, you can define" -- echo "replacements in the environment variables GW_GIT_BIN and GW_INW_BIN for git" -- echo "and inotifywait, respectively." - } - - # print all arguments to stderr -@@ -118,11 +115,6 @@ cleanup () { - exit 0 - } - --# Tests for the availability of a command --is_command () { -- hash "$1" 2>/dev/null --} -- - ############################################################################### - - while getopts b:d:h:g:L:l:m:p:r:s:e: option # Process command line options -@@ -149,65 +141,20 @@ if [ $# -ne 1 ]; then # If no command line arguments a - exit # and exit - fi - --# if custom bin names are given for git or inotifywait, use those; otherwise fall back to "git" and "inotifywait" --if [ -z "$GW_GIT_BIN" ]; then GIT="git"; else GIT="$GW_GIT_BIN"; fi -- --if [ -z "$GW_INW_BIN" ]; then -- # if Mac, use fswatch -- if [ "$(uname)" != "Darwin" ]; then -- INW="inotifywait"; -- EVENTS="${EVENTS:-close_write,move,move_self,delete,create,modify}" -- else -- INW="fswatch"; -- # default events specified via a mask, see -- # https://emcrisostomo.github.io/fswatch/doc/1.14.0/fswatch.html/Invoking-fswatch.html#Numeric-Event-Flags -- # default of 414 = MovedTo + MovedFrom + Renamed + Removed + Updated + Created -- # = 256 + 128+ 16 + 8 + 4 + 2 -- EVENTS="${EVENTS:---event=414}" -- fi; --else -- INW="$GW_INW_BIN"; --fi -- --# Check availability of selected binaries and die if not met --for cmd in "$GIT" "$INW"; do -- is_command "$cmd" || { stderr "Error: Required command '$cmd' not found." ; exit 1; } --done --unset cmd -- - ############################################################################### - - SLEEP_PID="" # pid of timeout subprocess - - trap "cleanup" EXIT # make sure the timeout is killed when exiting script - -- - # Expand the path to the target to absolute path --if [ "$(uname)" != "Darwin" ]; then -- IN=$(readlink -f "$1") --else -- if is_command "greadlink"; then -- IN=$(greadlink -f "$1") -- else -- IN=$(readlink -f "$1") -- if [ $? -eq 1 ]; then -- echo "Seems like your readlink doesn't support '-f'. Running without. Please 'brew install coreutils'." -- IN=$(readlink "$1") -- fi -- fi; --fi; -+IN=$(readlink -f "$1") - -- - if [ -d "$1" ]; then # if the target is a directory - - TARGETDIR=$(sed -e "s/\/*$//" <<<"$IN") # dir to CD into before using git commands: trim trailing slash, if any - # construct inotifywait-commandline -- if [ "$(uname)" != "Darwin" ]; then -- INW_ARGS=("-qmr" "-e" "$EVENTS" "--exclude" "'(\.git/|\.git$)'" "\"$TARGETDIR\"") -- else -- # still need to fix EVENTS since it wants them listed one-by-one -- INW_ARGS=("--recursive" "$EVENTS" "--exclude" "'(\.git/|\.git$)'" "\"$TARGETDIR\"") -- fi; -+ INW_ARGS=("-qmr" "-e" "$EVENTS" "--exclude" "'(\.git/|\.git$)'" "\"$TARGETDIR\"") - GIT_ADD_ARGS="--all ." # add "." (CWD) recursively to index - GIT_COMMIT_ARGS="" # add -a switch to "commit" call just to be sure - -@@ -215,11 +162,7 @@ elif [ -f "$1" ]; then # if the target is a single fil - - TARGETDIR=$(dirname "$IN") # dir to CD into before using git commands: extract from file name - # construct inotifywait-commandline -- if [ "$(uname)" != "Darwin" ]; then -- INW_ARGS=("-qm" "-e" "$EVENTS" "$IN") -- else -- INW_ARGS=("$EVENTS" "$IN") -- fi -+ INW_ARGS=("-qm" "-e" "$EVENTS" "$IN") - - GIT_ADD_ARGS="$IN" # add only the selected file to index - GIT_COMMIT_ARGS="" # no need to add anything more to "commit" call -@@ -260,6 +203,8 @@ if [ -n "$REMOTE" ]; then # are we pushing to a remote - PUSH_CMD="$GIT push $REMOTE $BRANCH" - fi - fi -+elif [ -n $($GIT config --get remote.origin.url) ] ; then -+ PUSH_CMD="$GIT push" - else - PUSH_CMD="" # if not remote is selected, make sure push command is empty - fi