head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.136
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.134
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.132
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.130
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.128
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.126
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.124
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.122
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.120
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.118
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.116
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.114
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.112
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.110
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.108
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.106
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.104
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.102
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.100
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.98
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.96
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.94
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.92
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.88
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.68
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.90
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.86
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.84
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.82
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.80
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.78
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.76
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.74
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.72
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.70
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.66
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.64
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.62
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.60
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.58
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.56
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.54
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.52
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.50
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.48
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.46
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.44
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.42
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.40
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.38
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.36
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.34
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.32
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.30
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.28
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.26
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.24
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.22
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.20
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.18
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.16
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.14
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.12
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.10
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.8
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.6
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.4
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.2
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.2.0.22
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.20
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.18
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.16
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.14
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.12
	pkgsrc-2008Q1:1.2.0.10
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.8
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.6
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.4
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.2
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.1.1.1.0.28
	pkgsrc-2006Q4-base:1.1.1.1
	pkgsrc-2006Q3:1.1.1.1.0.26
	pkgsrc-2006Q3-base:1.1.1.1
	pkgsrc-2006Q2:1.1.1.1.0.24
	pkgsrc-2006Q2-base:1.1.1.1
	pkgsrc-2006Q1:1.1.1.1.0.22
	pkgsrc-2006Q1-base:1.1.1.1
	pkgsrc-2005Q4:1.1.1.1.0.20
	pkgsrc-2005Q4-base:1.1.1.1
	pkgsrc-2005Q3:1.1.1.1.0.18
	pkgsrc-2005Q3-base:1.1.1.1
	pkgsrc-2005Q2:1.1.1.1.0.16
	pkgsrc-2005Q2-base:1.1.1.1
	pkgsrc-2005Q1:1.1.1.1.0.14
	pkgsrc-2005Q1-base:1.1.1.1
	pkgsrc-2004Q4:1.1.1.1.0.12
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-2004Q3:1.1.1.1.0.10
	pkgsrc-2004Q3-base:1.1.1.1
	pkgsrc-2004Q2:1.1.1.1.0.8
	pkgsrc-2004Q2-base:1.1.1.1
	pkgsrc-2004Q1:1.1.1.1.0.6
	pkgsrc-2004Q1-base:1.1.1.1
	pkgsrc-2003Q4:1.1.1.1.0.4
	pkgsrc-2003Q4-base:1.1.1.1
	netbsd-1-6-1:1.1.1.1.0.2
	netbsd-1-6-1-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2009.06.14.17.48.43;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2007.02.05.00.33.58;	author obache;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.16.11.06.37;	author markd;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.01.16.11.06.37;	author markd;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove @@dirrm entries from PLISTs
@
text
@@@comment $NetBSD: PLIST,v 1.2 2007/02/05 00:33:58 obache Exp $
bin/fcomp
bin/fhist
bin/fmerge
man/man1/fcomp.1
man/man1/fhist.1
man/man1/fhist_lic.1
man/man1/fmerge.1
share/doc/fhist/en/building.dvi
share/doc/fhist/en/building.ps
share/doc/fhist/en/building.txt
share/doc/fhist/en/man1/fcomp.1
share/doc/fhist/en/man1/fhist.1
share/doc/fhist/en/man1/fhist_lic.1
share/doc/fhist/en/man1/fmerge.1
share/doc/fhist/en/readme.dvi
share/doc/fhist/en/readme.ps
share/doc/fhist/en/readme.txt
share/doc/fhist/en/reference.dvi
share/doc/fhist/en/reference.ps
share/doc/fhist/en/reference.txt
share/locale/en/LC_MESSAGES/fcomp.mo
share/locale/en/LC_MESSAGES/fhist.mo
share/locale/en/LC_MESSAGES/fmerge.mo
@


1.2
log
@Update fhist to 1.16.
Based on patch provided in PR 35539.
And I made two modification related to pkgsrc.

PKGSRC CHANGES:
   Make document & nls files to be installed into standard location.
   Add test target.

RELEASE NOTES:
   Version 1.16 (20-Dec-2005)
       * There is a new fmerge -ignore-identical-conflicts option which may be
       used to suppress logical conflicts in which the same thing is done by
       both variants. This is often a better match for users' expectations for
       merging source code.

   Version 1.15 (8-Nov-2005)
       * There is a new fcomp -no-binary option, which may be used to prevent
       the comparison of binary files, instead it treats them both as empty.

       * A small build problem on MacOS X has been fixed.

   Version 1.14 (8-Jun-2004)
       * The ./configure script now understands the --with-nlsdir option, so
       that you can place the .mo files.

       * The fhist(1) program is now able to cope with numeric modules names.

       * The occasional false negative from test 26 has been fixed.  It was
       failing for some users because of message translation
       (internationalization) issues.
@
text
@d1 1
a1 1
@@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/16 11:06:37 markd Exp $
a24 3
@@dirrm share/doc/fhist/en/man1
@@dirrm share/doc/fhist/en
@@dirrm share/doc/fhist
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
@@comment $NetBSD$
a4 3
lib/fhist/en/LC_MESSAGES/fcomp.mo
lib/fhist/en/LC_MESSAGES/fhist.mo
lib/fhist/en/LC_MESSAGES/fmerge.mo
d9 19
a27 19
share/fhist/en/building.dvi
share/fhist/en/building.ps
share/fhist/en/building.txt
share/fhist/en/man1/fcomp.1
share/fhist/en/man1/fhist.1
share/fhist/en/man1/fhist_lic.1
share/fhist/en/man1/fmerge.1
share/fhist/en/readme.dvi
share/fhist/en/readme.ps
share/fhist/en/readme.txt
share/fhist/en/reference.dvi
share/fhist/en/reference.ps
share/fhist/en/reference.txt
@@dirrm share/fhist/en/man1
@@dirrm share/fhist/en
@@dirrm share/fhist
@@dirrm lib/fhist/en/LC_MESSAGES
@@dirrm lib/fhist/en
@@dirrm lib/fhist
@


1.1.1.1
log
@Initial import of fhist version 1.12

Provided by Matthew Aldous in PR 18970.
Updated to version 1.12 by Duncan McEwan and tidied up by me.

The FHist package contains 3 utilities, a file history tool ``fhist'',
a file comparison tool ``fcomp'', and a file merging tool ``fmerge'.
All three are bundled together, because they all use the same algorithm.

fhist

    Keeps track of versions of a file.  It works correctly when given
    binary files as input.  See fhist(1) for more information.

fcomp

    Compares two versions of a file, usually line-for- line textual
    comparison.  It is capable of comparing two binary files byte-for-byte.
    See fcomp(1) for more information.

fmerge

    Merges together edits from two descendants of a file.  See fmerge(1)
    for more information.

The history tool presented here, fhist, is a minimal history tool.
It provides no locking or branching.  This can be useful in contexts
where the configuration management or change control be being
provided by some other tool.
@
text
@@