From owner-dev-commits-ports-all@freebsd.org Tue Apr 6 10:40:08 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F14DD5CA5A9; Tue, 6 Apr 2021 10:40: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 4FF3vC4tCnz4TC4; Tue, 6 Apr 2021 10:40:07 +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 1BE742485; Tue, 6 Apr 2021 10:40:07 +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 136Ae7oW087113; Tue, 6 Apr 2021 10:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136Ae6ak087110; Tue, 6 Apr 2021 10:40:06 GMT (envelope-from git) Date: Tue, 6 Apr 2021 10:40:06 GMT Message-Id: <202104061040.136Ae6ak087110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 88917e9f4666 - main - Tools/scripts/chkversion.pl: remove svn compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88917e9f46660b4839f40f73c01d63f56b613174 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 10:40:08 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=88917e9f46660b4839f40f73c01d63f56b613174 commit 88917e9f46660b4839f40f73c01d63f56b613174 Author: Rene Ladan AuthorDate: 2021-04-06 10:35:55 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 10:39:46 +0000 Tools/scripts/chkversion.pl: remove svn compatibility Differential Revision: https://reviews.freebsd.org/D29451 --- Tools/scripts/chkversion.pl | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Tools/scripts/chkversion.pl b/Tools/scripts/chkversion.pl index 4f21ec2985cd..728dfcd2d820 100755 --- a/Tools/scripts/chkversion.pl +++ b/Tools/scripts/chkversion.pl @@ -53,7 +53,6 @@ # and enter something like # # BLAME=yes (git specific) -# SVNBLAME=yes # XXX: SVN specific # ALLPORTS=yes # RCPT_ORIGIN=you@domain.example # RCPT_VERSION=you@domain.example @@ -64,10 +63,6 @@ # If the environment variable BLAME is set and the ports tree is checked # out by git, every entry is listed with a record of the last git commit. # -# XXX: SVN specific: -# If the environment variable SVNBLAME is set and the ports tree is checked -# out by SVN, every entry is listed with a record of the last SVN commit. -# use v5.20; use strict; @@ -83,7 +78,6 @@ use POSIX; my $portsdir = $ENV{PORTSDIR} // '/usr/ports'; my $versiondir = $ENV{VERSIONDIR} // '/var/db/chkversion'; -my $svnblame = exists $ENV{SVNBLAME}; # XXX: SVN specific my $blame = exists $ENV{BLAME}; my $allports = exists $ENV{ALLPORTS}; @@ -100,7 +94,6 @@ my $cc_author = exists $ENV{CC_AUTHOR}; my $cc_mntnr = exists $ENV{CC_MAINTAINER}; my $make = '/usr/bin/make'; -my $svn = '/usr/local/bin/svn'; # XXX: SVN specific my $git = '/usr/local/bin/git'; my $sendmail = '/usr/sbin/sendmail'; my $pkg = first { -x $_ } ($ENV{PKG} // '', '/usr/local/sbin/pkg', '/usr/sbin/pkg'); @@ -151,7 +144,6 @@ sub wanted() { # Skip directories we shouldn't descend into # if (/^.git$/ if (/^\.git$/ - || /^\.svn$/ # XXX: SVN specific || $File::Find::name =~ m"^$portsdir/(?:Mk|Templates|Tools|distfiles|packages)$"os || $File::Find::name =~ m"^$portsdir/[^/]+/pkg$"os) { @@ -304,15 +296,6 @@ sub printlog($fh, $portdir, $rev) { my @log = readfrom $portdir, $git, 'log', "${rev}^..HEAD", 'Makefile'; print $fh " | $_\n" for @log; } - # XXX: SVN specific: - elsif ($svnblame && -d "$portsdir/.svn") { - my @svnlog = readfrom $portdir, $svn, 'log', ($rev ? "-r$rev" : ''), 'Makefile'; - for (@svnlog) { - my $in_log = /^-{20,}$/ ... /^(-{20,}|={70,})$/; - print $fh " | $_\n" - if ($in_log && $in_log ne 1 && $in_log !~ /E0$/); - } - } } # Git version: