head	1.4;
access;
symbols
	pkgsrc-2026Q1:1.4.0.2
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.3.0.2
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.2.0.40
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.38
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.36
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.34
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.32
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.30
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.28
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.26
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.24
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.22
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.20
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.18
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.16
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.14
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.12
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.10
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.8
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.6
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.4
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.2
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.1.1.1.0.134
	pkgsrc-2020Q3-base:1.1.1.1
	pkgsrc-2020Q2:1.1.1.1.0.130
	pkgsrc-2020Q2-base:1.1.1.1
	pkgsrc-2020Q1:1.1.1.1.0.110
	pkgsrc-2020Q1-base:1.1.1.1
	pkgsrc-2019Q4:1.1.1.1.0.132
	pkgsrc-2019Q4-base:1.1.1.1
	pkgsrc-2019Q3:1.1.1.1.0.128
	pkgsrc-2019Q3-base:1.1.1.1
	pkgsrc-2019Q2:1.1.1.1.0.126
	pkgsrc-2019Q2-base:1.1.1.1
	pkgsrc-2019Q1:1.1.1.1.0.124
	pkgsrc-2019Q1-base:1.1.1.1
	pkgsrc-2018Q4:1.1.1.1.0.122
	pkgsrc-2018Q4-base:1.1.1.1
	pkgsrc-2018Q3:1.1.1.1.0.120
	pkgsrc-2018Q3-base:1.1.1.1
	pkgsrc-2018Q2:1.1.1.1.0.118
	pkgsrc-2018Q2-base:1.1.1.1
	pkgsrc-2018Q1:1.1.1.1.0.116
	pkgsrc-2018Q1-base:1.1.1.1
	pkgsrc-2017Q4:1.1.1.1.0.114
	pkgsrc-2017Q4-base:1.1.1.1
	pkgsrc-2017Q3:1.1.1.1.0.112
	pkgsrc-2017Q3-base:1.1.1.1
	pkgsrc-2017Q2:1.1.1.1.0.108
	pkgsrc-2017Q2-base:1.1.1.1
	pkgsrc-2017Q1:1.1.1.1.0.106
	pkgsrc-2017Q1-base:1.1.1.1
	pkgsrc-2016Q4:1.1.1.1.0.104
	pkgsrc-2016Q4-base:1.1.1.1
	pkgsrc-2016Q3:1.1.1.1.0.102
	pkgsrc-2016Q3-base:1.1.1.1
	pkgsrc-2016Q2:1.1.1.1.0.100
	pkgsrc-2016Q2-base:1.1.1.1
	pkgsrc-2016Q1:1.1.1.1.0.98
	pkgsrc-2016Q1-base:1.1.1.1
	pkgsrc-2015Q4:1.1.1.1.0.96
	pkgsrc-2015Q4-base:1.1.1.1
	pkgsrc-2015Q3:1.1.1.1.0.94
	pkgsrc-2015Q3-base:1.1.1.1
	pkgsrc-2015Q2:1.1.1.1.0.92
	pkgsrc-2015Q2-base:1.1.1.1
	pkgsrc-2015Q1:1.1.1.1.0.90
	pkgsrc-2015Q1-base:1.1.1.1
	pkgsrc-2014Q4:1.1.1.1.0.88
	pkgsrc-2014Q4-base:1.1.1.1
	pkgsrc-2014Q3:1.1.1.1.0.86
	pkgsrc-2014Q3-base:1.1.1.1
	pkgsrc-2014Q2:1.1.1.1.0.84
	pkgsrc-2014Q2-base:1.1.1.1
	pkgsrc-2014Q1:1.1.1.1.0.82
	pkgsrc-2014Q1-base:1.1.1.1
	pkgsrc-2013Q4:1.1.1.1.0.80
	pkgsrc-2013Q4-base:1.1.1.1
	pkgsrc-2013Q3:1.1.1.1.0.78
	pkgsrc-2013Q3-base:1.1.1.1
	pkgsrc-2013Q2:1.1.1.1.0.76
	pkgsrc-2013Q2-base:1.1.1.1
	pkgsrc-2013Q1:1.1.1.1.0.74
	pkgsrc-2013Q1-base:1.1.1.1
	pkgsrc-2012Q4:1.1.1.1.0.72
	pkgsrc-2012Q4-base:1.1.1.1
	pkgsrc-2012Q3:1.1.1.1.0.70
	pkgsrc-2012Q3-base:1.1.1.1
	pkgsrc-2012Q2:1.1.1.1.0.68
	pkgsrc-2012Q2-base:1.1.1.1
	pkgsrc-2012Q1:1.1.1.1.0.66
	pkgsrc-2012Q1-base:1.1.1.1
	pkgsrc-2011Q4:1.1.1.1.0.64
	pkgsrc-2011Q4-base:1.1.1.1
	pkgsrc-2011Q3:1.1.1.1.0.62
	pkgsrc-2011Q3-base:1.1.1.1
	pkgsrc-2011Q2:1.1.1.1.0.60
	pkgsrc-2011Q2-base:1.1.1.1
	pkgsrc-2011Q1:1.1.1.1.0.58
	pkgsrc-2011Q1-base:1.1.1.1
	pkgsrc-2010Q4:1.1.1.1.0.56
	pkgsrc-2010Q4-base:1.1.1.1
	pkgsrc-2010Q3:1.1.1.1.0.54
	pkgsrc-2010Q3-base:1.1.1.1
	pkgsrc-2010Q2:1.1.1.1.0.52
	pkgsrc-2010Q2-base:1.1.1.1
	pkgsrc-2010Q1:1.1.1.1.0.50
	pkgsrc-2010Q1-base:1.1.1.1
	pkgsrc-2009Q4:1.1.1.1.0.48
	pkgsrc-2009Q4-base:1.1.1.1
	pkgsrc-2009Q3:1.1.1.1.0.46
	pkgsrc-2009Q3-base:1.1.1.1
	pkgsrc-2009Q2:1.1.1.1.0.44
	pkgsrc-2009Q2-base:1.1.1.1
	pkgsrc-2009Q1:1.1.1.1.0.42
	pkgsrc-2009Q1-base:1.1.1.1
	pkgsrc-2008Q4:1.1.1.1.0.40
	pkgsrc-2008Q4-base:1.1.1.1
	pkgsrc-2008Q3:1.1.1.1.0.38
	pkgsrc-2008Q3-base:1.1.1.1
	cube-native-xorg:1.1.1.1.0.36
	cube-native-xorg-base:1.1.1.1
	pkgsrc-2008Q2:1.1.1.1.0.34
	pkgsrc-2008Q2-base:1.1.1.1
	cwrapper:1.1.1.1.0.32
	pkgsrc-2008Q1:1.1.1.1.0.30
	pkgsrc-2008Q1-base:1.1.1.1
	pkgsrc-2007Q4:1.1.1.1.0.28
	pkgsrc-2007Q4-base:1.1.1.1
	pkgsrc-2007Q3:1.1.1.1.0.26
	pkgsrc-2007Q3-base:1.1.1.1
	pkgsrc-2007Q2:1.1.1.1.0.24
	pkgsrc-2007Q2-base:1.1.1.1
	pkgsrc-2007Q1:1.1.1.1.0.22
	pkgsrc-2007Q1-base:1.1.1.1
	pkgsrc-2006Q4:1.1.1.1.0.20
	pkgsrc-2006Q4-base:1.1.1.1
	pkgsrc-2006Q3:1.1.1.1.0.18
	pkgsrc-2006Q3-base:1.1.1.1
	pkgsrc-2006Q2:1.1.1.1.0.16
	pkgsrc-2006Q2-base:1.1.1.1
	pkgsrc-2006Q1:1.1.1.1.0.14
	pkgsrc-2006Q1-base:1.1.1.1
	pkgsrc-2005Q4:1.1.1.1.0.12
	pkgsrc-2005Q4-base:1.1.1.1
	pkgsrc-2005Q3:1.1.1.1.0.10
	pkgsrc-2005Q3-base:1.1.1.1
	pkgsrc-2005Q2:1.1.1.1.0.8
	pkgsrc-2005Q2-base:1.1.1.1
	pkgsrc-2005Q1:1.1.1.1.0.6
	pkgsrc-2005Q1-base:1.1.1.1
	pkgsrc-2004Q4:1.1.1.1.0.4
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-2004Q3:1.1.1.1.0.2
	pkgsrc-2004Q3-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2026.02.26.18.36.41;	author adam;	state Exp;
branches;
next	1.3;
commitid	WHkwuThJXAHvUUvG;

1.3
date	2025.10.05.15.22.53;	author adam;	state Exp;
branches;
next	1.2;
commitid	7DwoOvhQIgS1todG;

1.2
date	2020.12.20.13.05.00;	author rhialto;	state Exp;
branches;
next	1.1;
commitid	YQX4w8loPhg4XtAC;

1.1
date	2004.07.24.08.45.27;	author recht;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2004.07.24.08.45.27;	author recht;	state Exp;
branches;
next	;


desc
@@


1.4
log
@patchutils: updated to 0.4.5

0.4.5 (stable)

Reverted incompatible behavior change from version 0.4.4. In 0.4.4,
Git diffs without content hunks (renames, copies, mode-only changes,
binary files) were included in output and file numbering, breaking
compatibility with 0.4.3 and earlier versions. This caused file numbers
to change for scripts using -N/-F options. The 0.4.3 behavior has been
restored as the default: these diffs are now excluded from output and
numbering. Added --git-extended-diffs option to control this behavior:
use --git-extended-diffs=include to get the 0.4.4 behavior if needed.
The default will change to 'include' in version 0.5.0 for modern Git
workflow support.

Fixed grepdiff -s/--status to display correct file status indicators.
Previously, grepdiff -s incorrectly showed '!' (modification) for all
matching files regardless of whether they were additions, deletions,
or modifications. Now correctly shows '+' for file additions, '-' for
file removals, and '!' for file modifications. Added comprehensive
test coverage for grepdiff -s with both unified and context diff
formats. Documented and enabled --empty-files-as-absent option for
grepdiff (long form only, as -E is used for --extended-regexp).

Improved error handling for command pipelines. Fixed pipe handling
to properly propagate errors when commands in a pipeline fail, and
corrected stdout/stdin piping behavior (stderr is no longer redirected
to pipes).

Replaced old Git/SVN patchview scripts with unified patchview-wrapper.
The gitdiff, gitdiffview, gitshow, gitshowview, svndiff, and svndiffview
commands are now symlinks to a single patchview-wrapper script with
improved pipeline handling and debug support. Symlinks are now
automatically generated during installation rather than tracked in
source control.

Documentation improvements. Enhanced grepdiff documentation with better
organization and comprehensive examples showing different output modes.
Clarified bootstrap requirements in README.md. Restored move-to-front
script to package.

Build system and CI improvements. Updated GitHub Actions CI to run on
0.4.x branch. Conditionally enabled building from Git repository.
Updated spec file and .gitignore files.

Fixed binary file handling in lsdiff and filterdiff. Binary files now
receive sequential file numbers instead of duplicate numbers when using
lsdiff -N. Fixed filterdiff -F (file number filter) to properly filter
binary file messages - previously binary file "Binary files ... differ"
messages were not being filtered and would appear in output regardless
of the requested file number.
@
text
@@@comment $NetBSD: PLIST,v 1.3 2025/10/05 15:22:53 adam Exp $
bin/combinediff
bin/dehtmldiff
bin/editdiff
bin/espdiff
bin/filterdiff
bin/fixcvsdiff
bin/flipdiff
bin/gitdiff
bin/gitdiffview
bin/gitshow
bin/gitshowview
bin/grepdiff
bin/interdiff
bin/lsdiff
bin/move-to-front
bin/patchview
bin/patchview-wrapper
bin/recountdiff
bin/rediff
bin/splitdiff
bin/svndiff
bin/svndiffview
bin/unwrapdiff
man/man1/combinediff.1
man/man1/dehtmldiff.1
man/man1/editdiff.1
man/man1/espdiff.1
man/man1/filterdiff.1
man/man1/fixcvsdiff.1
man/man1/flipdiff.1
man/man1/gitdiff.1
man/man1/gitdiffview.1
man/man1/gitshow.1
man/man1/gitshowview.1
man/man1/grepdiff.1
man/man1/interdiff.1
man/man1/lsdiff.1
man/man1/patchview.1
man/man1/recountdiff.1
man/man1/rediff.1
man/man1/splitdiff.1
man/man1/svndiff.1
man/man1/svndiffview.1
man/man1/unwrapdiff.1
share/bash-completion/completions/combinediff
share/bash-completion/completions/dehtmldiff
share/bash-completion/completions/editdiff
share/bash-completion/completions/espdiff
share/bash-completion/completions/filterdiff
share/bash-completion/completions/fixcvsdiff
share/bash-completion/completions/flipdiff
share/bash-completion/completions/gitdiff
share/bash-completion/completions/gitdiffview
share/bash-completion/completions/grepdiff
share/bash-completion/completions/interdiff
share/bash-completion/completions/lsdiff
share/bash-completion/completions/patchview
share/bash-completion/completions/recountdiff
share/bash-completion/completions/rediff
share/bash-completion/completions/splitdiff
share/bash-completion/completions/svndiff
share/bash-completion/completions/svndiffview
share/bash-completion/completions/unwrapdiff
@


1.3
log
@patchutils: updated to 0.4.4

0.4.4

Enhanced Git diff format support in filterdiff/lsdiff/grepdiff. Improved handling of Git diffs without traditional hunks, including proper support for file renames, binary file changes, and permission mode changes. Fixed exclusion filtering (-x) for multi-file Git diffs to prevent orphaned headers. Enhanced filename extraction to properly strip Git's a/ and b/ prefixes for consistent output. Added --git-prefixes=strip|keep option to control handling of Git filename prefixes, with 'keep' as default for backward compatibility (will change to 'strip' in version 0.5.0).

Fixed interdiff --color option handling and improved color output. Replaced external diff --color dependency with internal ANSI color codes.

Code improvements and build system enhancements. Added redirectfd() utility function to redirect stdout without reassignment. Enhanced CI testing with musl support for better compatibility testing. Fixed bash completion symlinks for better installation. Made grepdiff test case PCRE-aware to handle different regex library configurations properly.

Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview commands.

Updated bash completions.
@
text
@d1 1
a1 1
@@comment $NetBSD: PLIST,v 1.2 2020/12/20 13:05:00 rhialto Exp $
d16 1
d18 1
@


1.2
log
@devel/patchutils: update to 0.4.2.

0.4.2 @@twaugh twaugh released this on Jul 17 2020

Fixed a packaging issue.

0.4.0 @@twaugh twaugh released this on Jul 16 2020

New patchview mode with accompanying scripts. New grepdiff option
--only-match.  New filterdiff option --remove-timestamps. Assorted other
fixes and improvements.
@
text
@d1 1
a1 1
@@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/24 08:45:27 recht Exp $
d11 2
d30 4
d41 2
d44 19
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
@@comment $NetBSD$
d9 2
d14 1
d18 2
d31 1
@


1.1.1.1
log
@initial import of patchutils-0.2.30

Patchutils is a small collection of programs that operate on patch files.
Interdiff generates an incremental patch from two patches against a common
source. For example, if you have applied a pre-patch to a source tree, and
wish to apply another pre-patch (which is against the same original source
tree), you can use interdiff to generate the patch that you need to apply.
You can also use this to review changes between two pre-patches.
Combinediff generates a single patch from two incremental patches, allowing
you to merge patches together. The resulting patch file only alters each file
once.
Filterdiff will select the portions of a patch file that apply to files
matching (or, alternatively, not matching) a shell wildcard.
Fixcvsdiff is for correcting the output of 'cvs diff'.
Rediff corrects hand-edited patches, by comparing the original patch with the
modified one and adjusting the offsets and counts.
Lsdiff displays a short listing of affected files in a patch file, along with
(optionally) the line numbers of the start of each patch.
Splitdiff separates out patches from a patch file so that each new patch file
only alters any given file once. In this way, a file containing several
incremental patches can be split into individual incremental patches.
Grepdiff displays a list of the files modified by a patch where the patch
contains a given regular expression.
Recountdiff fixes up counts and offsets in a unified diff.
Unwrapdiff fixes word-wrapped unified diffs.
@
text
@@