From nobody Wed Sep 28 07:48:30 2022 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 4McpWy2bcWz4cxL8; Wed, 28 Sep 2022 07:48:30 +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 4McpWy25Bsz3xsN; Wed, 28 Sep 2022 07:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664351310; 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=LlmiqnjR1p7VDaQ7dQfq8K3GrSoUme3PH+uomonaltQ=; b=L2aMr2YDdTPa22h8hcFtsJb77IBAjvH6q8x3I7SxAgdrfMQvWM7DPU56GmMOfuSehpYM3R XVbE23hLlEX/erbeNaqmzphkaUeCiKX6CvHLHjYyE9ISCZ2DpfW8CTC9YvmZLkZMkL1GJs TqUemPa74SGUD4YJ1cdHXBk135aDOypFPaFNVilC7xxJEdu0nLBwZfX5HVBvvAjbl+LDZm fCwVv0wNXanqAQbXqTVJfgC1iI5h6ICXvaG2SoNbyaHOl+bWSnVxFwXGY7cBDVEvROXKmM AtUgDAr9uUcs8M6wjL7jdI0zm0KGRst6LgU4mL/TMXuvV0ZJFjA+tvbKY3BAsQ== 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 4McpWy0rNTzPZ4; Wed, 28 Sep 2022 07:48:30 +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 28S7mUKa042820; Wed, 28 Sep 2022 07:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28S7mUgP042819; Wed, 28 Sep 2022 07:48:30 GMT (envelope-from git) Date: Wed, 28 Sep 2022 07:48:30 GMT Message-Id: <202209280748.28S7mUgP042819@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: b74ed0f79d32 - main - Mk: remove ancient 'make update-patches' target. 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b74ed0f79d32e7564969faac41a2e1083bbc49f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664351310; 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=LlmiqnjR1p7VDaQ7dQfq8K3GrSoUme3PH+uomonaltQ=; b=BXquDOJs8UEJanA5RfQfzhvEU8bsTDkaLRcdUASv7JTYJaKbYSR9w5gHjFwV9GxD4FgBGR W9CblZgwENI0W8dUEk6zUQQV6+3dMvS1FpmwIGYnLCeT87ATbQZyjRfJJZWfQdg87wJW6r brZmwC46FX+l/mTa5eRphr+Gd3JC0Qay709QqYSAjU2cqgLf8ho6Z740zHceUPyxFqQIFL J7EYHM5+vJG4ViebbRSl+LcijKVWPXImAzTlM+h1N2CMAbY1pQbvNI4UINCStSVWWFkGqE PuenjSFr2RpNWv/0Y1ceUdfkZeOZoHptQmWALplJufNCG8DQUcoRnyTWraC6EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664351310; a=rsa-sha256; cv=none; b=Q8PbFQZJVWjyD80CfBIyBrpSW2eifzdi7TexQLIudztMk72cIhNF9WfdBs3BzGJkrGIOuj /xl2/OGyEqv4BuERqHoSiBx0/nqhMp4fW+SDYkAM0BjVyjt4beMcNs7/MEKhmlTV64KXrh O/klLBdJsPy5VEYgkq4Xp+sGqw/SMok11fx2ck4t9RP4EJD6uAvv/O9lSGX4LLPyHZz9P8 P6c530/iqyiWFcOH2DiBlLx8Ud3WF4Ze/EnPjvnQTZ+WHmJrzPWSstXvSoMVi22ijui5Dp uvGBXmp1YziZ8SHNcoHpBl/ViISnnkWQDJ3fl6AH7iszKsI3mgrqdMvJvgGAXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=b74ed0f79d32e7564969faac41a2e1083bbc49f4 commit b74ed0f79d32e7564969faac41a2e1083bbc49f4 Author: Rene Ladan AuthorDate: 2022-09-27 20:09:56 +0000 Commit: Rene Ladan CommitDate: 2022-09-28 07:48:20 +0000 Mk: remove ancient 'make update-patches' target. People should use 'make makepatch' instead which creates patches with the expected filename and header. Differential Revision: https://reviews.freebsd.org/D36767 --- Mk/bsd.port.mk | 13 ------ Tools/scripts/README | 17 -------- Tools/scripts/update-patches | 102 ------------------------------------------- 3 files changed, 132 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c582ca50bb32..3071c4e08597 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3861,19 +3861,6 @@ delete-distfiles-list: . endif . endif -# Generates patches. - -update-patches: - @toedit=`PATCH_WRKSRC=${PATCH_WRKSRC} \ - PATCHDIR=${PATCHDIR} \ - PATCH_LIST=${PATCHDIR}/patch-* \ - DIFF_ARGS=${DIFF_ARGS} \ - DISTORIG=${DISTORIG} \ - ${SH} ${PORTSDIR}/Tools/scripts/update-patches`; \ - case $$toedit in "");; \ - *) ${ECHO_CMD} -n 'edit patches: '; read i; \ - cd ${PATCHDIR} && $${VISUAL:-$${EDIT:-/usr/bin/vi}} $$toedit;; esac - # Checksumming utilities # List all algorithms here, all the variables name must begin with dp_ diff --git a/Tools/scripts/README b/Tools/scripts/README index f69646991a45..8dfb2b17028a 100644 --- a/Tools/scripts/README +++ b/Tools/scripts/README @@ -42,8 +42,6 @@ splitpatch.pl - A small script to convert multi-file patches to several tindex - script used to build INDEXes for supported FreeBSD branches, which are the source of the 'make fetchindex' INDEXes, and the build failure reports on ports@FreeBSD.org -update-patches - generates updated patches. - update_crates - script used to generate an updated Makefile using make cargo-crates output @@ -118,18 +116,3 @@ portsearch - A utility for searching the ports tree. All searches are case-insensitive See the file README.portsearch for further information. - ----------------------------------------------------------------------- - -The update-patches script looks for files in $WRKSRC (if unset, this defaults -to the work/ subdirectory of the current directory) which have a matching .orig -file. It also looks in $PATCHDIR (if unset, this defaults to the files/ -subdirectory of the current directory) for patches that correspond to the first -set. If the changes in an existing patch do not reflect the changes in the -files in $WRKSRC, the script renames the existing patch by adding the suffix -.orig and generates a new patch in its place. If no patch existed, the new one -is created with a name that contains the path and filename of the file being -patched, except that "/" separators and "." characters are replaced by -underscores: for example, a new patch to $WRKSRC/foo/bar.c would be created as -$PATCHDIR/patch-foo_bar_c. If you save a .orig backup of a file, but don't -change the file, update-patches will generate an empty patch. diff --git a/Tools/scripts/update-patches b/Tools/scripts/update-patches deleted file mode 100755 index 0d92905f6428..000000000000 --- a/Tools/scripts/update-patches +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# $OpenBSD: update-patches,v 1.3 2000/06/09 17:08:37 espie Exp $ -# Copyright (c) 2000 -# Marc Espie. All rights reserved. -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Neither the name of OpenBSD nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY ITS AUTHOR AND THE OpenBSD project ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -# Find out all .orig files and strip the name to what diff will use -cd $PATCH_WRKSRC && find . -type f -name '*.orig' | fgrep -v $DISTORIG | \ -sed -e "s,^./\(.*\)\.orig\$,\1," | { -while read file -do - echo 1>&2 "Processing $file" - # look in patchdir for an existing patchfile matching this - mkdir -p $PATCHDIR - cd $PATCHDIR - for i in ${PATCH_LIST} - do - # Ignore non-files, or old backup - [ -f $i ] || continue - case $i in \ - *.orig|*.rej|*~) ;; - *) # Patch found. Is this the one ? - if grep "^--- $file.orig" $i >/dev/null - then - accounted="$accounted $i" - # found it, splice before diff part with diff - esc=`echo $file | sed -e 's,/,\\\\/,g'` - { sed -e "/^--- $esc.orig/,\$ d" <$i - (cd $PATCH_WRKSRC && diff -p ${DIFF_ARGS} -u $file.orig $file) } >$i.new - # did it change ? mark it as changed - if diff ${DIFF_ARGS} -u --ignore-matching-lines="^--- $file.orig .*" \ - --ignore-matching-lines="^+++ $file .*" $i $i.new 1>&2 - then - rm $i.new - else - echo 1>&2 "Patch $i for $file updated" - mv $i $i.orig - mv $i.new $i - edit="$edit $i" - fi - continue 2 - fi;; - esac - done - # Build a sensible name for the patch file - patchname=patch-`echo $file|sed -e s,/,_,g` - echo 1>&2 "No patch-* found for $file, creating $patchname" - (cd $PATCH_WRKSRC && diff -p ${DIFF_ARGS} -u $file.orig $file) >$patchname - edit="$edit $patchname" - accounted="$accounted $patchname" -done - -# Verify all patches accounted for -for i in ${PATCHDIR}/* -do - [ -f $i ] || continue - case $i in \ - *.orig|*.rej|*~) ;; - *) - for j in $accounted - do - if [ $j = $i ] - then - continue 2 - fi - done - echo 1>&2 "*** Patch $i not accounted for.";; - esac -done - -# Check for $Id and similar bugs in all those patch files. -for i in $accounted -do - if sed -e '/1,^---/ d' $i|egrep '$(Id|FreeBSD)' - then - echo 1>&2 "Problem with $i: CVS tag found in patch" - fi -done - -echo $edit -} -exit 0