CVS commit: pkgsrc/devel/texttest

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jan 12 09:47:24 UTC 2022

Modified Files:
        pkgsrc/devel/texttest: Makefile distinfo
        pkgsrc/devel/texttest/patches:
            patch-texttestlib_default_____init____.py

Log Message:
Update to 4.0.9. From the changelog:

Bugfixes:
- Allow for data files (e.g. new GUI XML files) to exist in
  texttest_config_modules along with python code
- Fixing trailing characters in floating point diff and involuntarily
  triggered split mode #98
- Making floating point diff split actually useful #45


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/texttest/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/texttest/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/texttest/Makefile
diff -u pkgsrc/devel/texttest/Makefile:1.11 pkgsrc/devel/texttest/Makefile:1.12
--- pkgsrc/devel/texttest/Makefile:1.11 Sun Jan  9 11:58:15 2022
+++ pkgsrc/devel/texttest/Makefile      Wed Jan 12 09:47:24 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2022/01/09 11:58:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/12 09:47:24 schmonz Exp $
 
-DISTNAME=              TextTest-4.0.8
+DISTNAME=              TextTest-4.0.9
 PKGNAME=               ${DISTNAME:tl}
-PKGREVISION=           2
 CATEGORIES=            devel python
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=texttest/}
 
@@ -16,6 +15,7 @@ DEPENDS+=             ${PYPKGPREFIX}-psutil-[0-9]*:
 
 USE_LANGUAGES=         # none
 
+# XXX these, and only these?
 REPLACE_PYTHON=                texttestlib/default/batch/__init__.py \
                        texttestlib/default/virtualdisplay.py
 
@@ -24,6 +24,144 @@ SUBST_STAGE.prefix= pre-configure
 SUBST_FILES.prefix=    texttestlib/default/__init__.py
 SUBST_VARS.prefix=     PREFIX
 
+SUBST_CLASSES+=                crlf
+SUBST_STAGE.crlf=      post-extract
+SUBST_FILTER_CMD.crlf= ${TR} -d '\r'
+SUBST_FILES.crlf=      PKG-INFO
+SUBST_FILES.crlf+=     bin/filter_fpdiff.py
+SUBST_FILES.crlf+=     bin/filter_rundependent.py
+SUBST_FILES.crlf+=     bin/texttest
+SUBST_FILES.crlf+=     bin/texttest_release.py
+SUBST_FILES.crlf+=     texttestlib/plugins.py
+SUBST_FILES.crlf+=     texttestlib/libexec/startXvfb.py
+SUBST_FILES.crlf+=     texttestlib/libexec/sitecustomize.py
+SUBST_FILES.crlf+=     texttestlib/libexec/startWindowManager.py
+SUBST_FILES.crlf+=     texttestlib/libexec/interpretcore
+SUBST_FILES.crlf+=     texttestlib/queuesystem/slavejobs.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/gridqueuesystem.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/__init__.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/sge.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/abstractqueuesystem.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/masterprocess.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/condor.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/utils.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/lsf.py
+SUBST_FILES.crlf+=     texttestlib/queuesystem/ec2cloud.py
+SUBST_FILES.crlf+=     texttestlib/testmodel.py
+SUBST_FILES.crlf+=     texttestlib/logconfiggen.py
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui.uimap
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-view_program-dynamic.xml
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-use_case_record_mode-static.xml
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-static.xml
+SUBST_FILES.crlf+=     texttestlib/etc/git.xml
+SUBST_FILES.crlf+=     texttestlib/etc/bzr.xml
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-use_case_record_mode-dynamic.xml
+SUBST_FILES.crlf+=     texttestlib/etc/rsync_exclude_patterns
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui.xml
+SUBST_FILES.crlf+=     texttestlib/etc/sge.xml
+SUBST_FILES.crlf+=     texttestlib/etc/cvs.xml
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-dynamic.xml
+SUBST_FILES.crlf+=     texttestlib/etc/.gtkrc-2.0
+SUBST_FILES.crlf+=     texttestlib/etc/capturemock_config
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-unordered_text-dynamic.xml
+SUBST_FILES.crlf+=     texttestlib/etc/default_gui-view_program.xml
+SUBST_FILES.crlf+=     texttestlib/etc/hg.xml
+SUBST_FILES.crlf+=     texttestlib/etc/summary_template.html
+SUBST_FILES.crlf+=     texttestlib/default/runtest.py
+SUBST_FILES.crlf+=     texttestlib/default/console.py
+SUBST_FILES.crlf+=     texttestlib/default/reconnect.py
+SUBST_FILES.crlf+=     texttestlib/default/rundependent.py
+SUBST_FILES.crlf+=     texttestlib/default/comparetest.py
+SUBST_FILES.crlf+=     texttestlib/default/actionrunner.py
+SUBST_FILES.crlf+=     texttestlib/default/__init__.py
+SUBST_FILES.crlf+=     texttestlib/default/storytext_interface.py
+SUBST_FILES.crlf+=     texttestlib/default/colorer.py
+SUBST_FILES.crlf+=     texttestlib/default/sandbox.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/bugzilla.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/bugzillav2.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/__init__.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/jira.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/github.py
+SUBST_FILES.crlf+=     texttestlib/default/knownbugs/trac.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/commentliststyle.css
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/comment.js
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/comment.php
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/filter.js
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/commentlist.js
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview_javascript/jquery.js
+SUBST_FILES.crlf+=     texttestlib/default/batch/HTMLgen.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/junitreport.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/HTMLcolors.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/__init__.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/jenkinschanges.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/testoverview.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/imgsize.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/summarypages.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/resultgraphs.py
+SUBST_FILES.crlf+=     texttestlib/default/batch/batchutils.py
+SUBST_FILES.crlf+=     texttestlib/default/traffic.py
+SUBST_FILES.crlf+=     texttestlib/default/scripts.py
+SUBST_FILES.crlf+=     texttestlib/default/comparefile.py
+SUBST_FILES.crlf+=     texttestlib/default/performance.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/statusviews.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/guiplugins.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/stockitems.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/textinfo.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/filetrees.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/git.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/custom_widgets_storytext.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/bzr.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/custom_widgets.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/__init__.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/cvs.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/version_control/hg.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/entrycompletion.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/testtree.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/selectandfilter.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/runningactions.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/adminactions.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/helpdialogs.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/__init__.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/fileproperties.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/fileviewers.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/housekeeping.py
+SUBST_FILES.crlf+=     texttestlib/default/gtkgui/default_gui/changeteststate.py
+SUBST_FILES.crlf+=     texttestlib/default/virtualdisplay.py
+SUBST_FILES.crlf+=     texttestlib/default/fpdiff.py
+SUBST_FILES.crlf+=     texttestlib/jobprocess.py
+SUBST_FILES.crlf+=     texttestlib/engine.py
+SUBST_FILES.crlf+=     texttestlib/utils.py
+SUBST_FILES.crlf+=     texttestlib/log/regenerate_log_config.py
+SUBST_FILES.crlf+=     texttestlib/log/logconfiggen_setup.py
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_2.x
+SUBST_FILES.crlf+=     texttestlib/doc/quick_start.txt
+SUBST_FILES.crlf+=     texttestlib/doc/ChangeLog
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.1
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.6
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.8
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.9
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.7
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.12
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.24
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.22
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.25
+SUBST_FILES.crlf+=     texttestlib/doc/CREDITS.txt
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.5
+SUBST_FILES.crlf+=     texttestlib/doc/LICENSE.txt
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.3
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.4
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.29
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.16
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.20
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.18
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.27
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.19
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.21
+SUBST_FILES.crlf+=     texttestlib/doc/MigrationNotes_from_3.17
+SUBST_FILES.crlf+=     texttestlib/texttest_version.py
+SUBST_FILES.crlf+=     setup.py
+SUBST_FILES.crlf+=     readme.txt
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/devel/texttest/distinfo
diff -u pkgsrc/devel/texttest/distinfo:1.6 pkgsrc/devel/texttest/distinfo:1.7
--- pkgsrc/devel/texttest/distinfo:1.6  Wed Nov 17 15:15:51 2021
+++ pkgsrc/devel/texttest/distinfo      Wed Jan 12 09:47:24 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/11/17 15:15:51 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2022/01/12 09:47:24 schmonz Exp $
 
-BLAKE2s (TextTest-4.0.8.tar.gz) = f43a4514f5e5b3462198b53f57ef940b8eb873d554d272d52ec6ba6d00bc5932
-SHA512 (TextTest-4.0.8.tar.gz) = 445527f28ec819df8b32863483ef43bea93ff47225b9100b34661c152c16feb74bbb24f630b4272336978999615efffb0caee6aad8cf88fd0858b1f03599e187
-Size (TextTest-4.0.8.tar.gz) = 602150 bytes
-SHA1 (patch-texttestlib_default_____init____.py) = 3bd79ebe3e6e6d7311d73b7063622c4cddb984d5
+BLAKE2s (TextTest-4.0.9.tar.gz) = 2781265a115443f0347c348900e518df202485db30f65f8d1ca1a036a0bc5c31
+SHA512 (TextTest-4.0.9.tar.gz) = d0cf982d2c9e7105e66c053b8dd3094f5821f3a8f232da4cfe07b1c00a21e94955b3567988b9d8372ad57d95035a1bc09468e086729dae08be24bc9d5c74f6ee
+Size (TextTest-4.0.9.tar.gz) = 605512 bytes
+SHA1 (patch-texttestlib_default_____init____.py) = 87fae6e9c04d2340510c4286b8ae5351ebc38fd5

Index: pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py
diff -u pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py:1.1 pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py:1.2
--- pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py:1.1 Sat Apr 18 19:42:18 2020
+++ pkgsrc/devel/texttest/patches/patch-texttestlib_default_____init____.py     Wed Jan 12 09:47:24 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-texttestlib_default_____init____.py,v 1.1 2020/04/18 19:42:18 schmonz Exp $
+$NetBSD: patch-texttestlib_default_____init____.py,v 1.2 2022/01/12 09:47:24 schmonz Exp $
 
 Find pkgsrc-provided diff tools.
 
---- texttestlib/default/__init__.py.orig       2020-03-23 09:09:04.000000000 +0000
+--- texttestlib/default/__init__.py.orig       2021-11-26 07:53:10.000000000 +0000
 +++ texttestlib/default/__init__.py
-@@ -1422,7 +1422,7 @@ class Config:
+@@ -1425,7 +1425,7 @@ class Config:
      def defaultDiffProgram(self):
          if os.name == "posix":
              for diff in ('tkdiff', 'kdiff3', 'meld'):