Changes merged, delete brep-debug (svn branch delete)

svn:revision:77232 svn:branch:brep-debug svn:account:starseeker
2020-09-25 16:52:15 +00:00
11417 changed files with 1487173 additions and 1438593 deletions
@@ -1,161 +0,0 @@
-# This file defines Continuous Integration (CI) tests for BRL-CAD using the
-# Github Actions framework.  Currently it defines configurations for Windows,
-# Linux and OSX.
-#
-# Initially we used examples to try and define one common configuration for all
-# platforms, but that turned out to be more complex than it was worth.  The
-# different platforms manifest different issues, and it is easier to keep the
-# individual steps simple and address what needs addressing per-platform.
-#
-# For more information about available platforms for testing, see:
-#
-# https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners
-#
-# The general rule when building in CI is to go more verbose in output settings
-# rather than less, since iterative debugging isn't practical.  We also want to
-# avoid parallel building - while that will sometimes catch dependency issues,
-# it also makes the outputs far harder to interpret when there is a problem.
-# Better to do parallel build debugging in an environment were more interactive
-# and iterative debugging is available while preserving the readability of the
-# CI outputs for other issues.
-#
-# Note that there is another reason not to do parallel runs; we have had some
-# trouble with issues that appear to be related to files not being fully
-# written out to disk. To try and help mitigate this, we don't want to stress
-# the I/O subsystem any more than necessary:
-#
-# https://github.com/actions/runner/issues/718
-#
-
-name: BRL-CAD
-
-on: [push]
-
-jobs:
-  windows:
-    name: Windows Latest MSVC
-    runs-on: windows-latest
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Setup - CMake
-        uses: lukka/get-cmake@latest
-
-      - name: Setup - Ninja
-        uses: seanmiddleditch/gha-setup-ninja@master
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Add github workspace to path
-        # https://github.community/t/deprecated-add-path/136621
-        run: echo "$ENV{GITHUB_WORKSPACE}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
-
-      - name: Add cl.exe to PATH
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Configure
-        run: |
-          cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
-          # We do the following in order to help ensure files are "flushed"
-          # to disk before compilation is attempted
-          # https://superuser.com/a/1553374/1286142
-          powershell Write-VolumeCache C
-          powershell Write-VolumeCache D
-
-      - name: Build
-        run: cd build && ninja -j1 -v && ninja check -v && ninja package
-
-        # Various other Windows build lines used for various types of testing.
-        # Preserved for reference, as the iterative time to figure out how to
-        # perform them was significant...
-        #run: cmake --build build --config Release --target package
-        #run: cd build && ninja -j1 -v STEPCODE_BLD && cd src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && ninja clean && ninja -j1 -v
-        #run: cmake --build build --config Release --target STEPCODE_BLD && cd build/src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && msbuild ALL_BUILD.vcxproj -t:clean && msbuild ALL_BUILD.vcxproj -v:diag
-
-        # For the moment the space demands are too extreme to enable this
-        # output for every compile test, but leave the enabling logic present
-        # in commented out form so it can be enabled as needed.
-#     - name: Upload Package
-#       uses: actions/upload-artifact@v2
-#       with:
-#         name: BRLCAD_Windows
-#         path: ${{ github.workspace }}/build/BRL-CAD*exe
-
-  linux:
-    name: Ubuntu Latest GCC
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Setup - CMake
-        uses: lukka/get-cmake@latest
-
-      - name: Setup - Ninja
-        uses: seanmiddleditch/gha-setup-ninja@master
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Configure
-        run: |
-          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
-          cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
-
-      - name: Build
-        run: |
-          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
-          cmake --build build --config Release --target check
-          cmake --build build --config Release --target package
-
-        # For the moment the space demands are too extreme to enable this
-        # output for every compile test, but leave the enabling logic present
-        # in commented out form so it can be enabled as needed.
-#     - name: Upload Package
-#       uses: actions/upload-artifact@v2
-#       with:
-#         name: BRLCAD_Linux
-#         path: ${{ github.workspace }}/build/BRL-CAD*gz
-
-  osx:
-    name: macOS Latest Clang
-    runs-on: macos-latest
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Setup - CMake
-        uses: lukka/get-cmake@latest
-
-      - name: Setup - Ninja
-        uses: seanmiddleditch/gha-setup-ninja@master
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Configure
-        run: |
-          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
-          export CC=clang
-          export CXX=clang++
-          cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
-
-      - name: Build
-        run: |
-          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
-          cd build && ninja -j1 && ninja -j1 package
-          #cmake --build build --config Release --target check
-          #cmake --build build --config Release --target package
-
-        # For the moment the space demands are too extreme to enable this
-        # output for every compile test, but leave the enabling logic present
-        # in commented out form so it can be enabled as needed.
-#     - name: Upload Package
-#       uses: actions/upload-artifact@v2
-#       with:
-#         name: BRLCAD_OSX
-#         path: ${{ github.workspace }}/build/BRL-CAD*gz
-
-
@@ -1,17 +0,0 @@
-# Common build directories used in the source tree
-/build
-/.build
-
-# Temporary files
-*~
-\#*\#
-.\#*
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-v][a-z]
-[._]sw[a-p]
-
-# OS specific files
-.DS_Store
-.DS_Store?
-
@@ -913,11 +913,6 @@ nicknames sumagnadas
 2020 May
 Open Source

-Atreya, Vikram
-nicknames vikram-atreya
-2020 October
-Open Source
-

 SPECIAL THANKS
 --------------
@@ -129,10 +129,6 @@ removed at any time.

 7.32
 ----
-include/bu/app.h
-        bu_brlcad_root: replaced by bu_dir
-        bu_brlcad_dir:  replaced by bu_dir
-
 include/bg/chull.h
        All functions returning point arrays instead of index arrays.
        Will be replaced by similarly named functions returning
@@ -141,13 +137,6 @@ include/bg/chull.h
        bg_polyline_2d_chull, bg_2d_chull, bg_3d_coplanar_chull,
        bg_3d_chull

-include/bu/exit.h
-        bu_backtrace and bu_crashreport will be replaced with versions
-        that take an optional parameter to pass in a full path from
-        the calling application.  (Currently available as
-        bu_backtrace_app and bu_crashreport_app, these will
-        replace existing versions after deprecation is complete.)
-
 MGED gui
 	The following will be removed from MGED's menu bar (unused
 	features, can be accomplished another way, or will be exposed
@@ -719,7 +708,7 @@ perl -0777 -pi -e 'EXPRESSION' FILE
 To apply an expression to an entire source tree, the following pattern
 may work:

-find . -type f -not -path "*.git/*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e 'EXPRESSION' {} \;
+find . -type f -not -path "*.svn/*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e 'EXPRESSION' {} \;

 find src \( -name '*.c' -or -name '*.cxx' -or -name '*.cpp' -or -name '*.h' -or -name '*.hxx' -or -name '*.hpp' -or -name '*.java' -or -name '*.f' -or -name '*.sh' -or -name '*.tcl' -or -name '*.tk' -or -name '*.itcl' -or -name '*.itk' -or -name '*.pl' -or -name '*.php' -or -name '*.inc' -or -name '*.mged' -or -name '*.y' -or -name '*.l' -or -name '*.yy' \) -not \( -name other -or -regex '.*/other/.*' -or -name tools -or -regex '.*/misc/tools/.*' -or -regex '.*/\.[^\.].*' -or -regex '.*~' -or -regex '.*/#.*' \)

@@ -1562,6 +1551,3 @@ s/proe-brl/creo-brl/g
 ----
 s/facetall.sh/mged -c facetize/g
        replaced by more improved facetize command [7.30]
-s/pixcmp -s/pixcmp -q/g
-s/pixcmp -l/pixcmp -d/g
-	changed pixcmp options for consistency with new options [7.32]
@@ -26,8 +26,8 @@ License for more details.

 You should have received a copy of the GNU Lesser General Public
 License along with this file.  If you did not, please contact one of
-the BRL-CAD project administrators listed at the Github project
-site https://github.com/BRL-CAD/brlcad/ or listed in the AUTHORS file
+the BRL-CAD project administrators listed at the SourceForge project
+site http://sf.net/projects/brlcad/ or listed in the AUTHORS file
 included as part of the distribution.

 Overview
@@ -101,7 +101,7 @@ arranged.  This includes an implicit assignment of copyright for any
 and all contributions being made.  The following notice should be
 prominent in the BRL-CAD sources:

-  Copyright (c) 1984-2021 United States Government as represented by
+  Copyright (c) 1984-2020 United States Government as represented by
  the U.S. Army Research Laboratory.

 Contact
@@ -810,7 +810,7 @@ DOCUMENTATION
 BRL-CAD has extensive documentation in various formats and presently
 maintained in various locations.  It is an on-going desire and goal of
 the project to have all documentation located along with the source
-code in our Git repository.
+code in our Subversion (SVN) repository.

 In line with that goal and where beneficial, a large portion of the
 tutorial documentation is being converted to the DocBook XML format.
@@ -920,27 +920,27 @@ gdb> backtrace
 PATCH SUBMISSION GUIDELINES
 ---------------------------

-To contribute to BRL-CAD, begin by submitting pull requests to the
-Github project at https://github.com/BRL-CAD/brlcad.
+To contribute to BRL-CAD, begin by submitting modifications to the
+patches section at http://sf.net/projects/brlcad/.  Patches in the
+unified diff format (diff -u) are generally preferred when modifying
+existing source or other text files.  Otherwise, contributors are
+welcome to submit their changes in full to the patches tracker as
+compressed file attachments.

-For an introduction to the standard Github workflow for forking and
-submitting pull requests, see:
+All text patches should be submitted in the unified diff format where
+it's feasible to create one either using SVN or using the unmodified
+original file.  This is generally the "-u" option to diff, and is also
+supported by the SVN diff command:

-https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
-https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks
+  svn diff > mychanges.patch

-While working in your fork to prepare your pull request, remember to
-frequently sync with upstream sources.  BRL-CAD uses an active main
-branch for most of its ongoing work, so this syncing process is
-particularly important when working with BRL-CAD.  Patches need to be
-based on the latest sources and avoid reverting improvements that have
-been added to the upstream sources since your fork was created.
-
-Although the Github pull request based workflow is recommended and
-preferred, if for any reason you cannot use Github you may also
-submit "git format-patch" patches through other channels.  See:
-
-https://git-scm.com/docs/git-format-patch
+Where possible, patch files should be generated against the latest
+sources available to make it easier to review and apply the changes.
+If a modification involves the addition or removal of files, those
+files can be provided separately with instructions on where they
+belong (or what should be removed).  If SVN cannot be used, please
+provide the complete release and build number of the files you worked
+with.

 ANY MODIFICATIONS THAT ARE PROVIDED MUST NOT MODIFY OR CONFLICT WITH
 THE EXISTING "COPYING" FILE DISTRIBUTION REQUIREMENTS.  This means
@@ -949,8 +949,7 @@ asked to only provide patches that may legally be incorporated into
 BRL-CAD under the existing distribution provisions described in the
 COPYING file.

-Patches that are difficult to apply and/or review are difficult to
-accept.
+Patches that are difficult to apply are difficult to accept.


 BUGS & UNEXPECTED BEHAVIOR
@@ -958,9 +957,9 @@ BUGS & UNEXPECTED BEHAVIOR

 When a bug or unexpected behavior is encountered that cannot be
 quickly fixed, it needs to be documented in our BUGS file or more
-formally reported to the Github issues tracker at:
+formally reported to the SourceForge bug tracker at:

-https://github.com/BRL-CAD/brlcad/issues
+http://sourceforge.net/tracker/?atid=640802&group_id=105292&func=browse

 The tracker is the main source for user-reported bugs and/or any
 issues that require significant discussion or benefit from having
@@ -990,7 +989,7 @@ access to be granted:

 3) Join the brlcad-devel developer mailing list, introduce yourself.

-4) Create a Github account, submit at least pull requests that
+4) Create a SourceForge account, submit at least two patches that
 demonstrate competency with our coding style, apply flawlessly, and
 provide some significant improvement.

@@ -1257,53 +1256,17 @@ Release steps are as follows:
    echo "Release preparations are under way.  Trunk sources merged to the RELEASE branch will be reviewed for sync to STABLE and release tagging.  Please help test by compiling distcheck-full and running benchmark, mged, and archer." | mail -s "Release preparations commencing" brlcad-devel@lists.sourceforge.net -r "your@subscribed.address"

 #####################################################################
-# 01: Sync main to RELEASE branch.
+# 01: Sync trunk to RELEASE branch.

-    git clone git@github.com:BRL-CAD/brlcad.git
-    cd brlcad
-    git checkout RELEASE
-    git merge main
+    # NON-AUTO: Review the log and obtain the last trunk merge
+    # revision number from comments.
+    svn log --stop-on-copy https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE | grep -E 'r[0-9]{5}'
+    PREV=[[last_trunk_rev]]
+    echo "PREV=$PREV"

-    # NON-AUTO:  The merge may succeed without conflicts.  If
-    # not, you will see the message:
-    #
-    # Automatic merge failed; fix conflicts and then commit the result.
-    #
-    # To see what the problem was, use git status:
-
-    git status
-    On branch RELEASE
-    Your branch is ahead of 'origin/RELEASE' by 1 commit.
-      (use "git push" to publish your local commits)
-
-    You have unmerged paths.
-      (fix conflicts and run "git commit")
-      (use "git merge --abort" to abort the merge)
-
-    Changes to be committed:
-            [list of cleanly merged changes]
-
-    Unmerged paths:
-      (use "git add <file>..." to mark resolution)
-	    [list of conflict files]
-
-    # The unmerged files must be inspected and their final form
-    # decided upon.  This can be done manually by editing the
-    # files to put them in their desired final state and using
-    # "git add" to mark them resolved, but it is usually more
-    # convenient and less error prone to use the git mergetool
-    # command with one of a number of tools designed for merge
-    # work.  For users new to this process practicing on a
-    # throw-away copy of the repository is recommended before
-    # doing a merge in earnest.
-    #
-    # See https://git-scm.com/docs/git-mergetool for details
-    #
-    # Some commonly used mergetool options:
-    # [meld]    https://meldmerge.org/help/resolving-conflicts.html
-    # [vimdiff] https://gist.github.com/karenyyng/f19ff75c60f18b4b8149
-
-    git mergetool
+    svn co https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE brlcad.RELEASE
+    cd brlcad.RELEASE
+    svn merge https://svn.code.sf.net/p/brlcad/code/brlcad/trunk@$PREV https://svn.code.sf.net/p/brlcad/code/brlcad/trunk@HEAD .

 #####################################################################
 # 02: Test the merge.
@@ -1325,16 +1288,12 @@ Release steps are as follows:
    cd .. && rm -rf .build

 #####################################################################
-# 03: Commit the merge (if necessary) and push.
+# 03: Commit the merge.

-    # If merge conflict resolution was needed, make a merge commit:
-    MSHA1=$(git log -1 main --pretty=format:"%h")a
-    echo $MSHA1
-    git commit -m "merge of main $MSHA1 to RELEASE branch"
+    CURR=`svn log --xml https://svn.code.sf.net/p/brlcad/code/brlcad/trunk | grep 'revision=' | head -n 1 | sed 's/.*="\([0-9][0-9]*\)".*/\1/g'`
+    echo "CURR=$CURR"

-    # Whether or not their was a conflict, let upstream know what
-    # has changed
-    git push
+    svn commit -m "merge of trunk to RELEASE branch, r$PREV through r$CURR"

 #####################################################################
 # 04: Reprioritize or address remaining TODO items.
@@ -1362,14 +1321,11 @@ Release steps are as follows:
 #####################################################################
 # 07: Update ChangeLog.  Use the YYYY-MM-DD of previous NEWS entry.

-    TODO - if we want GNU style changelogs, more work will be needed
-    as there's not an out of the box solution...
-
    LAST=`grep -E "\--- [0-9]{4}-[0-9]{2}-[0-9]{2}" NEWS | head -n 2 | tail -n 1 | awk '{print $2}'`
    echo "LAST=$LAST"
-    git log --since=$LAST > ChangeLog
-    git add ChangeLog
-    git commit -m "Update log with commits since $LAST"
+    LAST=r57446
+    svn2cl --break-before-msg --include-rev --stdout -r HEAD:{$LAST} > ChangeLog
+    svn commit -m "update log with commits through $LAST" ChangeLog

 #####################################################################
 # 08: Run distcheck-full on at least two platforms.
@@ -1379,21 +1335,19 @@ Release steps are as follows:
 #####################################################################
 # 09: Sync RELEASE to STABLE branch:

-    # NON-AUTO: Update the NEWS release date for the current release to today's date
-    git add NEWS
-    MAJOR=`awk '{print $1}' include/conf/MAJOR`
-    MINOR=`awk '{print $1}' include/conf/MINOR`
-    PATCH=`awk '{print $1}' include/conf/PATCH`
-    UTCDATE=$(date -u)
-    git commit -m "Finalize $MAJOR.$MINOR.$PATCH release date ($UTCDATE)"
+    # Update the NEWS release date for the current release to today's date

-    # merge RELEASE into STABLE.
-    git checkout STABLE
-    git merge --strategy-option theirs RELEASE
+    # NON-AUTO: Review the log and obtain the last merge revision
+    # number from comments.
+    svn log --stop-on-copy https://svn.code.sf.net/p/brlcad/code/brlcad/branches/STABLE | less
+    PREV=[[last_trunk_rev]]
+	### OR ###
+    PREV=`svn log --xml --stop-on-copy https://svn.code.sf.net/p/brlcad/code/brlcad/branches/STABLE | grep 'revision=' | head -n 1 | sed 's/.*revision="\([0-9][0-9]*\)".*/\1/g'`
+    echo "PREV=$PREV"

-    # NON-AUTO:  Resolve any conflicts as before, although note that
-    # the intent is usually for STABLE to match RELEASE so normally
-    # the resolution will be to make STABLE match the state of RELEASE
+    # merge that range of changes into STABLE
+    svn co https://svn.code.sf.net/p/brlcad/code/brlcad/branches/STABLE brlcad.STABLE && cd brlcad.STABLE
+    svn merge https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE@$PREV https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE@HEAD .

 #####################################################################
 # 10: Test the merge.
@@ -1404,14 +1358,10 @@ Release steps are as follows:
 #####################################################################
 # 11: Commit the merge.

-    # If merge conflict resolution was needed, make a merge commit:
-    RSHA1=$(git log -1 RELEASE --pretty=format:"%h")a
-    echo $RSHA1
-    git commit -m "merge of RELEASE $RSHA1 to STABLE branch"
+    CURR=`svn log --xml https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE | grep 'revision=' | head -n 1 | sed 's/.*="\([0-9][0-9]*\)".*/\1/g'`
+    echo "CURR=$CURR"

-    # Whether or not their was a conflict, let upstream know what
-    # has changed
-    git push
+    svn commit -m "merging RELEASE branch to STABLE branch, r$PREV through r$CURR"

 #####################################################################
 # 12: Tag the release using "rel-MAJOR-MINOR-PATCH" format:
@@ -1420,9 +1370,7 @@ Release steps are as follows:
    MINOR=`awk '{print $1}' include/conf/MINOR`
    PATCH=`awk '{print $1}' include/conf/PATCH`
    echo "Tagging rel-$MAJOR-$MINOR-$PATCH"
-    UTCDATE=$(date -u)
-    git tag -a rel-$MAJOR-$MINOR-$PATCH -m "Tag rel-$MAJOR-$MINOR-$PATCH ($UTCDATE)"
-    git push origin rel-$MAJOR-$MINOR-$PATCH
+    svn cp https://svn.code.sf.net/p/brlcad/code/brlcad/branches/STABLE https://svn.code.sf.net/p/brlcad/code/brlcad/tags/rel-$MAJOR-$MINOR-$PATCH

 #####################################################################
 # 13: Increment and commit the next BRL-CAD release numbers to SVN.
@@ -1437,31 +1385,19 @@ Release steps are as follows:
    perl -pi -e "s/Release [0-9]+\.[0-9]+\.[0-9]+/Release $MAJOR.$MINOR.$NEXT/" README
    EXPR="s/(@---[[:space:]@-]*[0-9]{4}-)([0-9]{2}-[0-9]{2})([[:space:]]*Release[[:space:]]*${MAJOR}\.${MINOR}\.)(${PATCH})([[:space:]@-]*-@)/\$1XX-XX\${3}${NEXT}\$5@* TBD@@\1\2\3\4\5/"
    cat NEWS | tr '\n' '@' | perl -pi -e "$EXPR" | tr '@' '\n' > NEWS
-    git add include/conf/PATCH README NEWS
-    git commit -m "Bump to next development revision after tagging the $MAJOR.$MINOR.$PATCH release"
-    git push
+    svn commit -m "bump to next development revision after tagging the $MAJOR.$MINOR.$PATCH release" ../include/conf/PATCH

 #####################################################################
 # 14: Sync RELEASE changes back to trunk.

-    git checkout main
-    git merge RELEASE
-
-    # NON-AUTO - resolve any conflicts
-
-    # If merge conflict resolution was needed, make a merge commit:
-    RSHA1=$(git log -1 RELEASE --pretty=format:"%h")a
-    echo $RSHA1
-    git commit -m "merge of RELEASE $RSHA1 to main branch"
-
-    git push
+    # Work-in-progress

 #####################################################################
 # 15: Obtain a tagged version of the sources from the repository, make
 # final distribution tarballs:

-    git checkout rel-$MAJOR-$MINOR-$PATCH
-    mkdir .build && cd .build
+    svn checkout https://svn.code.sf.net/p/brlcad/code/brlcad/tags/rel-$MAJOR-$MINOR-$PATCH brlcad-$MAJOR.$MINOR.$PATCH
+    cd brlcad-$MAJOR.$MINOR.$PATCH-build && mkdir .build && cd .build
    cmake .. -DBRLCAD_BUNDLED_LIBS=ON -DCMAKE_BUILD_TYPE=Release && make distcheck-full

 #####################################################################
@@ -1469,7 +1405,7 @@ Release steps are as follows:
 # tarballs to create binaries.

    # create a shell session and source dir
-    SFUSERNAME=username
+    SFUSERNAME=`ls ~/.subversion/auth/svn.simple/* | xargs -n 1 grep -A4 sourceforge | tail -1`
    echo "SFUSERNAME=$SFUSERNAME MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCH"
    ssh -v $SFUSERNAME,brlcad@shell.sf.net create
    ssh -v $SFUSERNAME,brlcad@shell.sf.net mkdir "/home/frs/project/brlcad/BRL-CAD\ Source/$MAJOR.$MINOR.$PATCH"
@@ -135,11 +135,21 @@ INSTALLING FROM SOURCE
 There are a couple of ways to obtain the BRL-CAD sources, usually via
 one of the following starting points:

-  1) from a Git checkout, or
+  1) from a SVN checkout/export, or
  2) from a source distribution tarball

-Using the latest Git sources is recommended where possible since it
-will have the latest changes.
+Using the latest SVN sources is recommended where possible since it
+will have the latest changes.  See the corresponding section below for
+details on how to install from either starting point.
+
+
+Starting From a SVN Checkout/Export:
+
+With CMake, there is no longer any difference between building from
+a subversion checkout and a tarball--follow the Source Distribution
+instructions below.
+
+Starting From a Source Distribution:

 There are many different ways to build BRL-CAD and depending on what
 you need/want will determine which configuration options you should
@@ -434,88 +444,35 @@ permissions).
 Aliases:  ENABLE_DOCS, ENABLE_EXTRA_DOCS, ENABLE_DOCBOOK


--- BRLCAD_ZLIB ---
+--- BRLCAD_LEMON ---

-Option for enabling and disabling compilation of the zlib library
+Option for enabling and disabling compilation of the lemon parser
 provided with BRL-CAD's source distribution.  Default is AUTO,
 responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
 first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.

-Aliases:  ENABLE_ZLIB, ENABLE_LIBZ
+Aliases:  ENABLE_LEMON


--- BRLCAD_REGEX ---
+--- BRLCAD_RE2C ---

-Option for enabling and disabling compilation of the Regular
-Expression Library provided with BRL-CAD's source distribution.
-Default is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option
-and testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-
-Aliases:  ENABLE_REGEX
-
-
--- BRLCAD_NETPBM ---
-
-Option for enabling and disabling compilation of the netpbm library
-provided with BRL-CAD's source code.  Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases:  ENABLE_NETPBM
-
-
--- BRLCAD_PNG ---
-
-Option for enabling and disabling compilation of the Portable Network
-Graphics library provided with BRL-CAD's source distribution.  Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-
-Aliases:  ENABLE_PNG
-
-
--- BRLCAD_SC ---
-
-Option for enabling and disabling compilation of the NIST Step Class
-Libraries provided with BRL-CAD's source code.  Default is AUTO,
+Option for enabling and disabling compilation of the re2c scanner
+utility provided with BRL-CAD's source distribution.  Default is AUTO,
 responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
 first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.

-Aliases:  ENABLE_SCL, ENABLE_STEP, ENABLE_STEP_CLASS_LIBRARIES
+Aliases:  ENABLE_RE2C


--- BRLCAD_PROJ4 ---
+--- BRLCAD_PERPLEX ---

-Option for enabling and disabling compilation of the PROJ.4 geographic
-projection library provided with BRL-CAD's source code.  Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+Option for enabling and disabling compilation of the perplex scanner
+generator provided with BRL-CAD's source distribution.  Default is
+AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
 testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
+AUTO.  perplex requires a working re2c.

-Aliases:  ENABLE_PROJ4
-
-
--- BRLCAD_GDAL ---
-
-Option for enabling and disabling compilation of the GDAL geographic
-library provided with BRL-CAD's source code.  Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-
-Aliases:  ENABLE_GDAL
-
-
--- BRLCAD_TCL ---
-
-Option for enabling and disabling compilation of the Tcl library
-provided with BRL-CAD's source code.  Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases:  ENABLE_TCL
+Aliases:  ENABLE_PERPLEX


 --- BRLCAD_ASTYLE ---
@@ -552,6 +509,232 @@ version if BRLCAD_BUNDLED_LIBS is also AUTO.
 Aliases:  ENABLE_XMLLINT


+--- BRLCAD_REGEX ---
+
+Option for enabling and disabling compilation of the Regular
+Expression Library provided with BRL-CAD's source distribution.
+Default is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option
+and testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_REGEX
+
+
+--- BRLCAD_ZLIB ---
+
+Option for enabling and disabling compilation of the zlib library
+provided with BRL-CAD's source distribution.  Default is AUTO,
+responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
+first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_ZLIB, ENABLE_LIBZ
+
+
+--- BRLCAD_PNG ---
+
+Option for enabling and disabling compilation of the Portable Network
+Graphics library provided with BRL-CAD's source distribution.  Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_PNG
+
+
+--- BRLCAD_NETPBM ---
+
+Option for enabling and disabling compilation of the netpbm library
+provided with BRL-CAD's source code.  Default is AUTO, responsive to
+the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
+version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_NETPBM
+
+
+--- BRLCAD_UTAHRLE ---
+
+Option for enabling and disabling compilation of the Utah Raster
+Toolkit library provided with BRL-CAD's source code.  Default is AUTO,
+responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
+first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_UTAHRLE
+
+
+--- BRLCAD_TCL ---
+
+Option for enabling and disabling compilation of the Tcl library
+provided with BRL-CAD's source code.  Default is AUTO, responsive to
+the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
+version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_TCL
+
+
+--- BRLCAD_TK ---
+
+Option for enabling and disabling compilation of the Tk library
+provided with BRL-CAD's source code.  Default is AUTO, responsive to
+the BRLCAD_TCL option and testing first for a system version if
+BRLCAD_BUNDLED_LIBS is also AUTO. Option for enabling and disabling
+compilation of the Tk graphics package for Tcl provided with BRL-CAD's
+source distribution.  Default is AUTO, auto-enabling if the BRLCAD_TCL
+option is set to BUNDLED and testing first for a system version if
+BRLCAD_TCL is set to AUTO or SYSTEM.  If BRLCAD_TK is set to BUNDLED,
+local copy is built even if a system version is present.  This option
+also depends on BRLCAD_ENABLE_TK being ON.
+
+Aliases:  ENABLE_TK
+
+
+--- BRLCAD_ITCL ---
+
+Option for enabling and disabling compilation of the IncrTcl package
+for Tcl objects provided with BRL-CAD's source distribution.  Default
+is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
+testing first for a system version if BRLCAD_TCL is set to AUTO or
+SYSTEM.  If BRLCAD_ITCL is set to BUNDLED, local copy is built even if
+a system version is present.
+
+Aliases:  ENABLE_ITCL
+
+
+--- BRLCAD_ITK ---
+
+Option for enabling and disabling compilation of the IncrTcl itk
+package for Tk objects provided with BRL-CAD's source distribution.
+Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
+BUNDLED and testing first for a system version if BRLCAD_TCL is set to
+AUTO or SYSTEM.  If BRLCAD_ITK is set to BUNDLED, local copy is built
+even if a system version is present.  This package will be disabled if
+BRLCAD_ENABLE_TK is OFF.
+
+Aliases:  ENABLE_ITK
+
+
+--- BRLCAD_IWIDGETS ---
+
+Option for enabling and disabling compilation of the IWidgets Tk
+widget package provided with BRL-CAD's source distribution.  Default
+is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
+testing first for a system version if BRLCAD_TCL is set to AUTO or
+SYSTEM.  If BRLCAD_IWIDGETS is set to BUNDLED, local copy is built even if
+a system version is present.  This package will be disabled if
+BRLCAD_ENABLE_TK is OFF.
+
+Aliases:  ENABLE_IWIDGETS
+
+
+--- BRLCAD_TKHTML ---
+
+Option for enabling and disabling compilation of the Tkhtml HTML
+viewing package provided with BRL-CAD's source distribution.  Default
+is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
+testing first for a system version if BRLCAD_TCL is set to AUTO or
+SYSTEM.  If BRLCAD_TKHTML is set to BUNDLED, local copy is built even if
+a system version is present.  This package will be disabled if
+BRLCAD_ENABLE_TK is OFF.
+
+Aliases:  ENABLE_TKHTML
+
+
+--- BRLCAD_TKTABLE ---
+
+Option for enabling and disabling compilation of the Tktable graphical
+table widget package provided with BRL-CAD's source distribution.
+Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
+BUNDLED and testing first for a system version if BRLCAD_TCL is set to
+AUTO or SYSTEM.  If BRLCAD_TKTABLE is set to BUNDLED, local copy is built
+even if a system version is present.  This package will be disabled if
+BRLCAD_ENABLE_TK is OFF.
+
+Aliases:  ENABLE_TKTABLE
+
+
+--- BRLCAD_OPENNURBS ---
+
+Option for enabling and disabling compilation of the openNURBS library
+provided with BRL-CAD's source code.  Default is AUTO, responsive to
+the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
+version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_OPENNURBS
+
+
+--- BRLCAD_SPSR ---
+
+Option for enabling and disabling compilation of the Screened Poisson
+Surface Reconstruction library provided with BRL-CAD's source code.
+Default is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option
+and testing first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_SPSR
+
+
+--- BRLCAD_SC ---
+
+Option for enabling and disabling compilation of the NIST Step Class
+Libraries provided with BRL-CAD's source code.  Default is AUTO,
+responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
+first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_SCL, ENABLE_STEP, ENABLE_STEP_CLASS_LIBRARIES
+
+
+--- BRLCAD_VDS ---
+
+Option for enabling and disabling compilation of the libvds triangle
+simplification library provided with BRL-CAD's source code.  Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_VDS
+
+
+--- BRLCAD_OSG ---
+
+Option for enabling and disabling compilation of the OpenSceneGraph
+libraries provided with BRL-CAD's source code.  Default is AUTO, responsive to
+the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
+version if BRLCAD_BUNDLED_LIBS is also AUTO.
+
+Aliases:  ENABLE_OPENSCENEGRAPH
+
+
+--- BRLCAD_GDIAM ---
+
+Option for enabling and disabling compilation of the libgdiam approximate
+tight bounding box library provided with BRL-CAD's source code.  Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_GDIAM
+
+
+--- BRLCAD_PROJ4 ---
+
+Option for enabling and disabling compilation of the PROJ.4 geographic
+projection library provided with BRL-CAD's source code.  Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_PROJ4
+
+
+--- BRLCAD_GDAL ---
+
+Option for enabling and disabling compilation of the GDAL geographic
+library provided with BRL-CAD's source code.  Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+
+Aliases:  ENABLE_GDAL
+
+

 *** Note - Do not add or edit configuration option descriptions and alias
   lists in this file - those entries are auto-generated from information in
@@ -10,50 +10,9 @@ descriptive text that emphasizes or further describes significant
 changes made.  See document footer for additional details.

 ----------------------------------------------------------------------
--- 2021-XX-XX  Release 7.32.4                                     ---
+--- 2020-xx-xx  Release 7.32.2                                     ---
 ----------------------------------------------------------------------

-* fixed overlay support for drawing multiple files - Cliff Yapp
-* fixed file creation for tire command - Cliff Yapp
-* fixed mixing object and full path searches in MGED - Cliff Yapp
-* fixed launching of ISST graphical viewer - Cliff Yapp
-* updated stepcode to latest upstream version - Cliff Yapp
-
----------------------------------------------------------------------
--- 2021-02-06  Release 7.32.2                                     ---
----------------------------------------------------------------------
-
-* fixed OSX g-iges crash due to improper memory freeing - Cliff Yapp
-* fixed GQA multithreaded plotting file corruption - Cliff Yapp
-* added -S structural diff option to MGED gdiff command - Cliff Yapp
-* added -v verbosity option to MGED tree command - Cliff Yapp
-* added -? option to MGED which command - Cliff Yapp
-* updated Archer to set cwd=HOME when run without args - Cliff Yapp
-* updated rtwizard to set cwd=HOME when run without args - Cliff Yapp
-* updated MGED to set cwd=HOME when run without args - Cliff Yapp
-* fixed reporting of MGED "vars" command - Cliff Yapp
-* updated MGED to not open non-.g-files as databases - Cliff Yapp
-* fixed MGED I/O when running GED subcommands - Cliff Yapp
-* added decimation control examples to facetize man page - Cliff Yapp
-* changed gcv converter to append to existing .g files - Cliff Yapp
-* removed obscure MGED menu entries for unused features - Cliff Yapp
-* fixed crash when trying to shade invalid breps - Cliff Yapp
-* improved librt CPU timer behavior - Cliff Yapp
-* fixed example in saveview manual page - Sean Morrison
-* added support for in-database vol primitive data - Sumagna Das
-* changed 'mvall' to rename all refs even w/ no object - Sean Morrison
-* updated MGED Overlap GUI to run reliably on Windows - Cliff Yapp
-* fixed MGED search command crash on empty database - Sean Morrison
-* improved performance calculating BoT bounding boxes - Vikram Atreya
-* fixed MGED crash closing multiple rt views on Windows - Cliff Yapp
-* fixed 'n' key binding override with MGED key forwarding - Cliff Yapp
-* fixed mged crash when there are no display managers - Sean Morrison
-* added pixcmp -n length flag for subset comparisons - Sean Morrison
-* added pixcmp -s same and -d different printing flags - Sean Morrison
-* updated non-shape objects list for search shape filter - Cliff Yapp
-* added volume type to search -type filters - Cliff Yapp
-* applied shorter default title in fast4-g conversions - Cliff Yapp
-* improved pixcmp support for subset image comparisons - Sean Morrison
 * added subtract subcommand to MGED analyze command - Cliff Yapp
 * added intersect subcommand to MGED analyze command - Cliff Yapp
 * added summarize subcommand to MGED analyze command - Cliff Yapp
@@ -63,7 +22,6 @@ changes made.  See document footer for additional details.
 * fixed help message for -F option on gdiff command - Cliff Yapp
 * fixed mged -c bomb attaching to graphical displays - Sean Morrison
 * fixed titlebar bug opening .g with filename spaces - Sean Morrison
-* added a new 'N' graphics window keybinding to run nirt - Cliff Yapp

 ----------------------------------------------------------------------
 --- 2020-09-14  Release 7.32.0                                     ---
@@ -1,14 +1,18 @@
 			    BRL-CAD
-			 Release 7.32.4
+			 Release 7.32.2
 		       http://brlcad.org/

 BRL-CAD is a powerful cross-platform open source combinatorial
-solid modeling system that includes an interactive 3D solid geometry
-editor, a network-distributed symmetric multiprocessing (SMP)
-high-performance ray-tracer with support for rendering and geometric
-analysis, image and signal-processing tools, a system performance
-analysis benchmark suite, a flexible geometry scripting interface, 
-and a high-performance geometric representation and analysis library.
+Constructive Solid Geometry (CSG) solid modeling system that includes
+an interactive 3D solid geometry editor, a network-distributed
+symmetric multiprocessing high-performance ray-tracer,
+network-distributed framebuffer support, image and signal-processing
+tools, ray-tracing support for rendering and geometric analysis,
+path-tracing and photon mapping support for realistic image synthesis,
+animation capabilities, ray-tracing and numerical processing
+libraries, a system performance analysis benchmark suite, an embedded
+scripting interface, and a robust high-performance geometric
+representation and analysis library.


 TABLE OF CONTENTS
@@ -22,6 +26,8 @@ TABLE OF CONTENTS
  Bug Reports/Feature Requests
  Distribution Details
  Background Information
+  Future Events
+  Getting Help


 GETTING STARTED
@@ -112,32 +118,60 @@ comparing the results of the benchmark tests in more detail.
 COMMUNICATION
 -------------

-There are various BRL-CAD mailing lists available including three
+You are invited to participate in the InterNet (aka "ARPANET")
+electronic mailing list on the BRL-CAD software.  There are various
+BRL-CAD mailing lists available on the project website at
+http://sourceforge.net/mail/?group_id=105292 including three
 developer-oriented lists, a user list, and a read-only news
-announcement list:
+announcement list.  See the posted archives to get a feel for the
+volume of list traffic for each list and to read/search past
+discussions.

-  http://sourceforge.net/mail/?group_id=105292 
+On-line web forums are likewise available on the project site at
+http://sourceforge.net/forum/?group_id=105292

-For interactive discussion, there is Zulip chat and IRC available:
+A variety of information on BRL-CAD is available via the
+World-Wide-Web.  Papers, documentation, and the software repository
+may be found at:

-  https://brlcad.zulipchat.com
-  https://brlcad.org/wiki/IRC
+  http://brlcad.org
+
+In addition to the above, there is an official BRL-CAD IRC channel on
+the Freenode network that may be reached by joining #brlcad on
+irc.freenode.net connecting via port 6667.  For first-time users,
+there is a web-based IRC client available for certain browsers at:
+
+  http://irc.brlcad.org
+
+IRC is the preferred method of communication to interact with the
+BRL-CAD developers, to get involved with the project, obtain support,
+or provide direct feedback.


 BUG REPORTS AND FEATURE REQUESTS
 --------------------------------

-Please submit all bugs, support requests, and feature requests to:
+Please report any bugs encountered to the project bug tracker at
+http://sourceforge.net/tracker/?group_id=105292&atid=640802

-  https://github.com/BRL-CAD/brlcad/issues
+Similarly, please post any request for feature enhancements or support
+request to http://sourceforge.net/tracker/?group_id=105292&atid=640805
+and http://sourceforge.net/tracker/?group_id=105292&atid=640803
+respectively.


 DISTRIBUTION DETAILS
 --------------------

-BRL-CAD is available via Git or Subversion checkout from:
+BRL-CAD is freely available and distributed in both binary and source
+code form through the BRL-CAD project website on Sourceforge:

-https://github.com/BRL-CAD/brlcad
+  http://sf.net/projects/brlcad/
+
+The package is similarly available via a Subversion repository.  To
+obtain the latest, follow the directions for anonymous checkout at:
+
+  http://sourceforge.net/svn/?group_id=105292

 There is also a paid-for full-service support distribution available
 for those interested through SURVICE Engineering, Inc., and the
@@ -205,6 +239,38 @@ software (FOSS), provided under Open Source Initiative (OSI) approved
 license terms.  BRL-CAD was released as open source in December 2004.
 See the COPYING file for more details.

+
+FUTURE EVENTS
+-------------
+
+It is expected that new releases of BRL-CAD will be issued
+approximately once a month.  A new release is scheduled for
+distribution at the beginning of every month, usually being posted
+sometime within the first week of every month.
+
+Depending on need, demand, and activity, additional releases may also
+be made.  The additional releases will be heavily dependent upon the
+level of user involvement and contributions in particular.
+Information about new releases will be routinely provided by
+electronic mail to recipients of this software as well as to the
+BRL-CAD NEWS mailing list:
+
+  http://sourceforge.net/mail/?group_id=105292
+
+Periodically, training and user group meetings are provided with
+announcements similarly posted to the BRL-CAD NEWS mailing list.
+Several BRL-CAD developers also regularly attend the ACM Siggraph
+conference, the ACM Solid and Physical Modeling conference, and other
+similar conferences, conventions, and symposiums as well.
+
+
+GETTING HELP
+------------
+
+Feel free to direct any unanswered questions relating to BRL-CAD via
+e-mail or to any of the other contact means described above in the
+COMMUNICATIONS section of this document.
+
 Best Wishes,
 The BRL-CAD Development Team
 devs@brlcad.org
@@ -1,22 +0,0 @@
-Release 8 notes:
-
-Idea:  For every primitive written out to a .g database, include as a standard
-component a version id so (for example) we can have multiple different versions
-of brep data storage, and have the libg I/O system be able to handle it (or
-skip it) cleanly.  db_upgrade would take an older .g and assign version 1 to
-all existing primitives writing out the new version.  A downgrade would either
-down-convert (if possible) or skip and report when version 1 isn't an option.
-This would make .g files backwards incompatible since the on-disk serialization
-would change for every object, but with versioning it should (hopefully) be the
-last time we would need to do that.
-
-Idea:  Reorder the ad-hoc list of librt primitive ids to be grouped by
-mathematical surface order.  Minor, but would make that code a bit cleaner.
-
-Remove the global region_id based material table (rt_material_head and related
-code).  There are other ways to achieve this result (search -exec assignment of
-colors, for example) and it's not an intuitive mechanism for folks who don't
-know where/how to look for it.  db_upgrade can be updated to do the attr color
-assignments to produce a .g that doesn't need it, so there will be a clear and
-automatic migration path as well.
-
@@ -18,33 +18,59 @@ tasks as they are completed.
 THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
 -------------------------------------------------

-* On some Windows machine Tcl script commands using "puts" to write to
-  stdout are intermittently failing with:
-  Error: error writing "stdout": invalid argument
+* Release Testing, final commit reviews


 THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 -------------------------------------------------------

-* dbconcat corrupted database / failed. created a top-level comb with
-  invalid "1_[subcomb]/" to be created that result in error messages
-  during any db listing (e.g., tops).  workaround was to manually edit
-  the comb and remove the 1_ and / on the entries.
-
 * The following will be removed from MGED's menu bar (unused
  features, can be accomplished another way, or will be exposed
  only as lower level settings when there are sensible defaults
  that are seldom changed.)

+  ViewRing menu and entries.
+  Modes->Persistent Sweep Rectangle
+  Modes->Collaborate
+  Modes->Rateknobs
  Modes->Display Lists
  Misc->Keystroke Forwarding
  Misc->Depth Cueing
  Misc->Z Buffer
  Misc->Lighting
+  Settings->Mouse Behavior->Sweep Raytrace-Rectangle
+  Settings->Mouse Behavior->Sweep Paint-Rectangle
+  Settings->Mouse Behavior->Sweep Zoom-Rectangle
+  Settings->Apply To->Local Panes
+  Settings->Apply To->Listed Panes
+  Settings->Framebuffer->Rectangle Area
+
+* The embedded framebuffer for the X display manager is not working
+  with Tcl/Tk 8.6 - it brings down mged with an Xerror when it tries
+  to XFlush after X24_blit.  Better solution is to replace the X
+  dm/fb with a cross platform software rasterizing solution of some
+  sort.
+
+* Implement new behavior for quit command in MGED - if bu_subprocess
+  commands are running, by default refuse to quit and print out a
+  list of currently running processes and instructions on how to abort
+  them.  Implement a -f option to forcibly quite even if there are
+  subprocesses running, and (perhaps) a --wait option to quite after
+  all subprocesses complete.
+
+  Also of interest in this context (but not critical for the basic
+  functionality) is designing a general mechanism or protocol for
+  applications to communicate progress back to bu_subprocess.

 * implement uv-mapping callback so we can texture-map BoT, NMG, and
  NURBS geometry

+* check thread safety history of gqa + plot calls (pl_color)
+
+* mged> nirt -? needs to provide help
+
+* mged> nirt -f fmt doesn't seem to work at all
+
 * modify libfb's default memory buffer allocation to be dynamic

 * create a BRL-CAD .g with all possible object types embedded.
@@ -56,6 +82,59 @@ THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 * attribute normalization is drastically slowing down
  region creation - need to fix or back out

+* g-obj not exporting colors
+
+* finish testing of libbu bu_dir API and matching bu_dir TCL function.
+  bu_dir bin and lib don't work when the MGED prompt's working directory
+  is changed to (e.g.) the user's home directory.
+  bu_brlcad_root and bu_brlcad_data will need verbose deprecation process.
+
+* Need to eliminate bu_argv0_full_path and rework the bu_brlcad_*
+  functions that currently rely on it to take that path as a
+  parameter from the calling application.  The library shouldn't be
+  responsible for managing that path - there are too many issues
+  with doing so.  The current approach fixes some concerns but
+  breaks if an application changes its notion of the current working
+  directory after initialization, for example.
+
+* tree command shouldn't infinite loop when encountering a cyclic
+  path - need to print a warning and stop walking.  Requries full
+  path awareness in tree command walk.
+
+  Consider implementing a corollary to FTS instead of dirent for
+  simplified tree traversal with cyclic awareness.
+
+  https://keramida.wordpress.com/2009/07/05/fts3-or-avoiding-to-reinvent-the-wheel/
+
+* move the rt_*_timer timing facilities to libbu and rework to allow
+  contexts, allowing for more than one timer to be active.  Make sure
+  the old librt API can be obsoleted cleanly.
+
+* check that dbconcat supports objects created with the bo cmd
+
+* libgcv should add objects to an existing .g if one is specified
+  as the output target - right now it's overwriting the old file
+
+* consolidate dbconcat, clone, make_name, and any other .g I/O
+  routines that need to autogenerate names to use the new
+  bu_vls_incr/bu_vls_simplify functions.
+
+* rename zlib and libpng when building bundled to avoid conflicting
+  with system-installed libs.  e.g., default to ENABLE_Z_PREFIX=ON
+  with name z_brlcad (perhaps as a post-compile rename custom command)
+  and png_brlcad respectively.
+
+* investigate possibility of using simple, compact libs
+  like miniz and lodepng to replace the complexity of
+  managing zlib and libpng in src/other.  These have been
+  a source of ongoing annoyance, particularly (but not
+  exclusively) on OSX.
+
+* f_dbopen in MGED doesn't seem to be reporting failure
+  if a non-.g file is fed to opendb.  That doesn't seem
+  right... shouldn't the open process completely fail
+  if the file isn't a valid .g?
+
 * add regression test for directional light sources

 * bundle primary rays in rt front end into postage stamps, shoot via
@@ -86,108 +165,13 @@ THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 * make sure we can run db_dirbuild() multiple times without creating
  duplicate entries.

-* tree command shouldn't infinite loop when encountering a cyclic
-  path - need to print a warning and stop walking.  Requries full
-  path awareness in tree command walk.
-
-  Consider implementing a corollary to FTS instead of dirent for
-  simplified tree traversal with cyclic awareness.
-
-  https://keramida.wordpress.com/2009/07/05/fts3-or-avoiding-to-reinvent-the-wheel/
-
-* bounding box reduction command
-
-* consolidate dbconcat, clone, make_name, and any other .g I/O
-  routines that need to autogenerate names to use the new
-  bu_vls_incr/bu_vls_simplify functions.
-
-* g-obj not exporting colors
-
 * heap unit test needs to actually compare performance against system
  allocation, not just do some work

-* mged> nirt -? needs to provide help
-
-* mged> nirt -f fmt doesn't seem to work at all
-
-* move the rt_*_timer timing facilities to libbu and rework to allow
-  contexts, allowing for more than one timer to be active.  Make sure
-  the old librt API can be obsoleted cleanly.
-
-* investigate problems with struct parsing running the MGED
-  "vars" command - most visible on OpenBSD, but Linux valgrind can
-  also see issues.
-

 THESE ARE UNSCHEDULED BACKLOG TASKS
 -----------------------------------

-* dbconcat option to override / merge over existing objects
-
-* gdiff in mged appears to be broken?  get "no primitives found" on
-  second comb when specifying two combs (gdiff comb1 comb2).
-  UPDATE - this appears to be a consequence of how gdiff internally
-  implements its raytrace diffing.  The "fix" would be to separately
-  raytrace each object and post-process the line segments, rather
-  than drawing up everything at once - the latter has problems if
-  part or all of comb2 is shared with comb1.  A workaround is to
-  keep out comb2 and dbconcat it back in, then gdiff comb1 with the
-  imported tree.
-
-* pixscale doesn't seem to handle stdin (due to bu_seek) for very
-  long
-
-* The embedded framebuffer for the X display manager is not working
-  with Tcl/Tk 8.6 - it brings down mged with an Xerror when it tries
-  to XFlush after X24_blit.  Better solution is to replace the X
-  dm/fb with a cross platform software rasterizing solution of some
-  sort.
-
-* extract a skin or other exterior surface for a given model.  3 options:
-  1. Implement a "shrinkwrap" feature that calculates a concave hull
-  2. Shoot rays from outside, construct exterior mesh based on hits
-     (akin to marching cubes, a surface reconstruction)
-  3. Shoot rays from outside at exterior vertices, retain all mesh faces
-     and objects encountered (i.e., not reconstructed, but extracted)
-
-* RTAREA
-
-  * add an option to rtarea for onehit.  this is probably best as an
-    option that reports the requested objects only and then has a
-    verbose option for the more detailed hiearchical report that is
-    currently produced.
-
-  * verify rtarea.  There are reports that the rtarea
-    command may have a bug in its calculations.  This needs to be
-    investigated.
-
-  * review and fix rtarea's taxonomy for describing
-    presented/projected areas.  users expect presented area to
-    represent what is currently referred to as exposed area.  may make
-    more sense to introduce a different terms for other shotline
-    encounters.
-
-  * make rtarea display a cross-hair and perhaps coordinates for the
-    center of area if run from within mged.
-
-  * add an option to rtarea for onehit.  this is probably best as an
-    option that reports the requested objects only and then has a
-    verbose option for the more detailed hiearchical report that is
-    currently produced.
-
-  * verify rtarea.  There are reports that the rtarea
-    command may have a bug in its calculations.  This needs to be
-    investigated.
-
-  * review and fix rtarea's taxonomy for describing
-    presented/projected areas.  users expect presented area to
-    represent what is currently referred to as exposed area.  may make
-    more sense to introduce a different terms for other shotline
-    encounters.
-
-  * make rtarea display a cross-hair and perhaps coordinates for the
-    center of area if run from within mged.
-
 * bot -V check solid bot.s visualizations don't show up if bot.s is
  first drawn in MGED - should properly "overlay" them so the user
  doesn't have to first erase the solid from the scene visual.
@@ -515,6 +499,11 @@ THESE ARE UNSCHEDULED BACKLOG TASKS
  parallel.  This would be a way to easily parallelize existing code
  without needing to create wrapper functions for bu_parallel().

+* Now that we have >3.0 CMake required, look into replacing our custom
+  time stamping code in favor of using  the CMake time stamp mechanism.
+  Also get rid of the fallback in src/libgcv/plugins/CMakeLists.txt
+  (and any others that have crept in over the years...)
+
 * convert usages of Tcl_InitHashTable() and friends to libbu
  containers (see src/conv/enf-g.c for example usage)

@@ -873,6 +862,11 @@ THESE ARE UNSCHEDULED BACKLOG TASKS
  file for FIXME note); add tests for both functions (note only
  g-dot.c wants to use the functions at the moment)

+* verify/fix/improve rtarea.  There are reports that the rtarea
+  command may have a bug in its calculations.  This needs to be
+  investigated along with a review of the taxonomy used by rtarea for
+  describing presented/projected areas.
+
 * eliminate dbi_filepath (perhaps replace with dbi_filedir) as we
  shouldn't need to search.  we were told where the database was.

@@ -1037,6 +1031,9 @@ THESE ARE UNSCHEDULED BACKLOG TASKS
  normals.  Consider adding an option to smoothly interpolate normals
  (per face or vertex).

+* make rtarea display a cross-hair and perhaps coordinates for the
+  center of area if run from within mged.
+
 * refactor and manage libbn tolerance uses by providing an interface
  default (e.g., an init macro) and making everyone use that where it
  is hardcoded to 0.0005 presently (and a few places where it's
@@ -2143,10 +2140,6 @@ CONVERTERS
 * implement a ls-dyna "keyword" file format importer.  perhaps extract
  as nmg/bot boundary representation meshes.  lots of great vehicle
  datasets at http://www.ncac.gwu.edu/vml/models.html
-  Update - above link seems to be down as of 2020, see:
-  https://www.nhtsa.gov/crash-simulation-vehicle-models
-  https://www.ccsa.gmu.edu/models/
-


 STEP
@@ -15,7 +15,6 @@ BRLCAD_ADDEXEC(bark "${BARK_SOURCES}" libbu NO_STRICT NO_INSTALL TEST_USESDATA)

 configure_file(run.sh "${CMAKE_CURRENT_BINARY_DIR}/benchmark" COPYONLY)
 install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/benchmark" DESTINATION ${BIN_DIR})
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/benchmark")

 add_custom_command(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/benchmark-${CMAKE_CFG_INTDIR}-done
@@ -48,7 +47,7 @@ CMAKEFILES(

 if(SH_EXEC AND TARGET m35.g)
  # CTest enabled short run of the benchmark suite
-  BRLCAD_ADD_TEST(NAME benchmark COMMAND ${SH_EXEC} "$<TARGET_FILE_DIR:bark>/benchmark" run TIMEFRAME=1)
+  add_test(NAME benchmark COMMAND ${SH_EXEC} "$<TARGET_FILE_DIR:bark>/benchmark" run TIMEFRAME=1)
  set_tests_properties(benchmark PROPERTIES LABELS "Benchmark")
  add_custom_target(benchmark-check
    COMMAND ${CMAKE_CTEST_COMMAND} -L Benchmark --output-on-failure
@@ -1,7 +1,7 @@
 /*                     B E N C H M A R K . C
 * BRL-CAD
 *
- * Copyright (c) 2011-2021 United States Government as represented by
+ * Copyright (c) 2011-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 /*                         C L E A N . C
 * BRL-CAD
 *
- * Copyright (c) 2011-2021 United States Government as represented by
+ * Copyright (c) 2011-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 /*                       C O M P U T E . C
 * BRL-CAD
 *
- * Copyright (c) 2011-2021 United States Government as represented by
+ * Copyright (c) 2011-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 #                          L G T . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2021 United States Government as represented by
+# Copyright (c) 2004-2020 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 /*                        P I X C M P . C
 * BRL-CAD
 *
- * Copyright (c) 2004-2021 United States Government as represented by
+ * Copyright (c) 2004-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This program is free software; you can redistribute it and/or
@@ -47,16 +47,9 @@
 #define FILE_ERROR 126

 /* exit codes for normal operation */
-#define EXIT_OFF_BY_NONE 0
-#define EXIT_OFF_BY_ONE  1
-#define EXIT_OFF_BY_MANY 2
-
-enum diff {
-    MATCHING,
-    OFF_BY_ONE,
-    OFF_BY_MANY,
-    MISSING
-};
+#define OFF_BY_NONE 0
+#define OFF_BY_ONE  1
+#define OFF_BY_MANY 2


 HIDDEN void
@@ -66,40 +59,27 @@ usage(const char *name)
    if (!name) {
 	name = unknown;
    }
-
-    /* split to fit within ISO C90 max static string length < 509 chars */
-    bu_log("Usage: %s [OPTIONS] FILE1 [FILE2 [SKIP1 [SKIP2]]]\n"
-	   "\n"
-	   "  Compare two PIX files pixel by pixel (or byte by byte), optionally"
-	   "  skipping initial pixels (or bytes) in one or both input files.\n"
-	   "\n", name);
-    bu_log("Options:"
-	   "  -b   Iterate and print by bytes instead of by pixels.\n"
-	   "  -s   Print all that have the same matching values.\n"
-	   "  -d   Print all that have different values.\n"
-	   "  -q   Quiet.  Suppress printing header and summary.\n"
+    /* this must be split, ISO C90 has a max static string length of 509 */
+    bu_log("Usage: %s [OPTIONS] FILE1 [FILE2 [SKIP1 [SKIP2]]]\n%s", name,
+	   "Compare two PIX image files pixel by pixel.\n\n"
+	   "  -l   List pixel numbers and values for all pixels that differ.\n"
+	   "  -b   Output and process by bytes instead of pixels.\n"
 	   "  -i SKIP\n"
-	   "       Discard initial SKIP pixels (or bytes w/ -b) in FILE1 and FILE2 input.\n"
-	   "  -i SKIP1:SKIP2\n"
-	   "       Skip initial SKIP1 pixels (or bytes w/ -b) in FILE1 and SKIP2 in FILE2.\n"
-	   "  -n COUNT\n"
-	   "       Compare COUNT pixels (or bytes w/ -b).  Stops by default at EOF.\n"
-	   "\n");
-    bu_log("If either FILE is `-' or is missing, then input is read from standard input.\n"
-	   "If FILE1 and FILE2 are both standard input, then values must be interleaved.\n"
-	   "If the `-b' option is used, SKIP and COUNT values are bytes instead of pixels.\n"
-	   "Pixel numbers and bytes are indexed linearly from one.\n"
-	   "\n");
+	   "       Skip the first SKIP pixels of input (for FILE1 and FILE2)\n");
+    bu_log("  -i SKIP1:SKIP2\n"
+	   "       Skip the first SKIP1 pixels in FILE1 and SKIP2 pixels in FILE2.\n"
+	   "  -s   Silent output.  Only return an exit status.\n\n"
+	   "If FILE is `-' or is missing, then input is read from standard input.\n"
+	   "If the `-b' option is used, SKIP values are bytes instead of pixels.\n"
+	   "Pixel numbers and bytes are indexed linearly from one.\n");
    return;
 }


 HIDDEN void
-handle_range_opt(const char *arg, size_t *skip1, size_t *skip2)
+handle_i_opt(const char *arg, size_t *skip1, size_t *skip2)
 {
    const char *endptr = arg;
-    long val;
-
    if ((arg == NULL) || ((skip1 == NULL) && (skip2 == NULL))) {
 	/* nothing to do */
 	return;
@@ -111,14 +91,12 @@ handle_range_opt(const char *arg, size_t *skip1, size_t *skip2)
 	/* probably empty string */
 	if (skip2) {
 	    endptr++;
-	    val = strtol(endptr, NULL, 10);
-	    *skip2 = (val < 0) ? 0 : val;
+	    *skip2 = strtol(endptr, NULL, 10);
 	}
    } else if ((endptr == NULL) || (endptr[0] == '\0')) {
 	/* no : found */
 	if (skip2) {
-	    val = strtol(arg, NULL, 10);
-	    *skip2 = (val < 0) ? 0 : val;
+	    *skip2 = strtol(arg, NULL, 10);
 	}
 	if (skip1 && skip2) {
 	    *skip1 = *skip2;
@@ -126,13 +104,11 @@ handle_range_opt(const char *arg, size_t *skip1, size_t *skip2)
    } else if (endptr[0] == ':') {
 	/* found : */
 	if (skip1) {
-	    val = strtol(arg, NULL, 10);
-	    *skip1 = (val < 0) ? 0 : val;
+	    *skip1 = strtol(arg, NULL, 10);
 	}
 	if (skip2) {
 	    endptr++; /* skip over : */
-	    val = strtol(endptr, NULL, 10);
-	    *skip2 = (val < 0) ? 0 : val;
+	    *skip2 = strtol(endptr, NULL, 10);
 	}
    } else {
 	bu_exit(OPTS_ERROR, "Unexpected input processing [%s]\n", arg);
@@ -140,117 +116,45 @@ handle_range_opt(const char *arg, size_t *skip1, size_t *skip2)
 }


-HIDDEN enum diff
-compare_rgb(int r1, int g1, int b1, int r2, int g2, int b2, size_t *matching, size_t *off1, size_t *offmany, size_t *missing)
-{
-    enum diff result = MISSING;
-
-    if ((r1 == r2 && r1 != -1)
-	&& (g1 == g2 && g1 != -1)
-	&& (b1 == b2 && b1 != -1))
-    {
-	result = MATCHING;
-	(*matching)++;
-    } else if (r1 == -1 || r2 == -1 || g1 == -1 || g2 == -1 || b1 == -1 || b2 == -1) {
-	/* image sizes don't match (or other I/O error) */
-	result = MISSING;
-	(*missing)++;
-    } else if (((r1 != r2) && (g1 == g2) && (b1 == b2))
-	       || ((r1 == r2) && (g1 != g2) && (b1 == b2))
-	       || ((r1 == r2) && (g1 == g2) && (b1 != b2)))
-    {
-	/* off by one channel */
-	if (r1 != r2) {
-	    if ((r1 > r2 ? r1 - r2 : r2 - r1) > 1) {
-		result = OFF_BY_MANY;
-		(*offmany)++;
-	    } else {
-		result = OFF_BY_ONE;
-		(*off1)++;
-	    }
-	} else if (g1 != g2) {
-	    if ((g1 > g2 ? g1 - g2 : g2 - g1) > 1) {
-		result = OFF_BY_MANY;
-		(*offmany)++;
-	    } else {
-		result = OFF_BY_ONE;
-		(*off1)++;
-	    }
-	} else if (b1 != b2) {
-	    if ((b1 > b2 ? b1 - b2 : b2 - b1) > 1) {
-		result = OFF_BY_MANY;
-		(*offmany)++;
-	    } else {
-		result = OFF_BY_ONE;
-		(*off1)++;
-	    }
-	}
-    } else {
-	result = OFF_BY_MANY;
-	(*offmany)++;
-    }
-
-    return result;
-}
-
-
 int
 main(int argc, char *argv[])
 {
-    const char *argv0 = argv[0];
-
    FILE *f1 = NULL;
    FILE *f2 = NULL;
-    struct stat sf1;
-    struct stat sf2;
+    struct stat sf1, sf2;

    size_t matching = 0;
    size_t off1 = 0;
    size_t offmany = 0;
-    size_t missing = 0;

    int c;
-    int list_diff = 0;
-    int list_same = 0;
+    int list_pixel_values = 0;
    int print_bytes = 0;
-    int quiet = 0;
-
-    size_t bytes = 0;
+    int silent = 0;
    size_t f1_skip = 0;
    size_t f2_skip = 0;
-    size_t stop_after = 0;
+    size_t bytes = 0;

    bu_setprogname(argv[0]);

    /* process opts */
-    while ((c = bu_getopt(argc, argv, "sdbi:n:q?")) != -1) {
+    while ((c = bu_getopt(argc, argv, "lbi:s")) != -1) {
 	switch (c) {
-	    case 's':
-		list_same = 1;
-		break;
-	    case 'd':
-		list_diff = 1;
+	    case 'l':
+		list_pixel_values = 1;
 		break;
 	    case 'b':
 		print_bytes = 1;
 		break;
 	    case 'i':
-		handle_range_opt(bu_optarg, &f1_skip, &f2_skip);
+		handle_i_opt(bu_optarg, &f1_skip, &f2_skip);
 		break;
-	    case 'n':
-	    {
-		long num = strtol(bu_optarg, NULL, 10);
-		stop_after = (num < 0) ? 0 : num;
+	    case 's':
+		silent = 1;
 		break;
-	    }
-	    case 'q':
-		quiet = 1;
-		break;
-	    case '?':
-	    case 'h':
-		usage(argv0);
-		return 0;
 	    default:
+		bu_log("\n");
+		usage(argv[0]);
 		exit(OPTS_ERROR);
 	}
    }
@@ -260,17 +164,17 @@ main(int argc, char *argv[])
    /* validate what is left over */
    if (argc < 1 || argc > 4) {
 	bu_log("ERROR: incorrect number of arguments provided\n\n");
-	usage(argv0);
+	usage(argv[0]);
 	exit(OPTS_ERROR);
    }
    if ((argc > 0 && !argv[0]) || (argc > 1 && !argv[1])) {
 	bu_log("ERROR: bad filename\n\n");
-	usage(argv0);
+	usage(argv[0]);
 	exit(OPTS_ERROR);
    }
    if ((argc > 2 && !argv[2]) || (argc > 3 && !argv[3])) {
 	bu_log("ERROR: bad skip value\n\n");
-	usage(argv0);
+	usage(argv[0]);
 	exit(OPTS_ERROR);
    }

@@ -282,25 +186,10 @@ main(int argc, char *argv[])
 	} else {
 	    snprintf(range, 64, "%s", argv[2]);
 	}
-	handle_range_opt(range, &f1_skip, &f2_skip);
+	handle_i_opt(range, &f1_skip, &f2_skip);
    }

-    if (!print_bytes) {
-	if ((f1_skip > ((size_t)-1)/3)
-	    || (f2_skip > ((size_t)-1)/3))
-	{
-	    bu_log("ERROR: overflow, -i skip value(s) are too big {%zu:%zu}\n", f1_skip, f2_skip);
-	    exit(OPTS_ERROR);
-	}
-	f1_skip *= 3;
-	f2_skip *= 3;
-	if (stop_after > ((size_t)-1)/3)
-	{
-	    bu_log("ERROR: overflow, -n number is too big {%zu}\n", stop_after);
-	    exit(OPTS_ERROR);
-	}
-	stop_after *= 3;
-    }
+    /* printf("Skip from FILE1: %ld and from FILE2: %ld\n", f1_skip, f2_skip); */

    if (BU_STR_EQUAL(argv[0], "-")) {
 	f1 = stdin;
@@ -308,7 +197,6 @@ main(int argc, char *argv[])
 	perror(argv[0]);
 	exit(FILE_ERROR);
    }
-
    if ((argc < 2) || BU_STR_EQUAL(argv[1], "-")) {
 	f2 = stdin;
    } else if ((f2 = fopen(argv[1], "rb")) == NULL) {
@@ -316,155 +204,108 @@ main(int argc, char *argv[])
 	exit(FILE_ERROR);
    }

-    setmode(fileno(stdin), O_BINARY);
-    /* we're writing out ascii */
-    /* setmode(fileno(stdout), O_BINARY); */
+    stat(argv[0], &sf1);
+    stat(argv[1], &sf2);

-    if (f1_skip != f2_skip && f1 == stdin && f2 == stdin) {
-	bu_exit(OPTS_ERROR, "ERROR: cannot skip the same input stream by different amounts\n");
+    if (sf1.st_size != sf2.st_size) {
+	bu_exit(FILE_ERROR, "Different file sizes found: %s(%d) and %s(%d).  Cannot perform pixcmp.\n", argv[0], (int)sf1.st_size, argv[1], (int)sf2.st_size);
    }

-    fstat(fileno(f1), &sf1);
-    fstat(fileno(f2), &sf2);
-
-    bu_log("FILE1_size(%zu) FILE1_skip(%zu) FILE2_size(%zu) FILE2_skip(%zu)\n", (size_t)sf1.st_size, f1_skip, (size_t)sf2.st_size, f2_skip);
-
-    if (!quiet && ((sf1.st_size - f1_skip) != (sf2.st_size - f2_skip))) {
-	bu_log("WARNING: Different image sizes detected\n");
-	if (print_bytes) {
-	    bu_log("\t%s: %7llu bytes (%8llu bytes, skipping %7llu)\n",
-		   argv[0], (unsigned long long)(sf1.st_size - f1_skip), (unsigned long long)sf1.st_size, (unsigned long long)f1_skip);
-	    bu_log("\t%s: %7llu bytes (%8llu bytes, skipping %7llu)\n",
-		   argv[1], (unsigned long long)(sf2.st_size - f2_skip), (unsigned long long)sf2.st_size, (unsigned long long)f2_skip);
-	} else {
-	    bu_log("\t%s: %7llu pixels (%8llu bytes, skipping %7llu)\n",
-		   argv[0], (unsigned long long)((sf1.st_size - f1_skip)/3), (unsigned long long)sf1.st_size, (unsigned long long)f1_skip);
-	    bu_log("\t%s: %7llu pixels (%8llu bytes, skipping %7llu)\n",
-		   argv[1], (unsigned long long)((sf2.st_size - f2_skip)/3), (unsigned long long)sf2.st_size, (unsigned long long)f2_skip);
-	}
+    if (!print_bytes) {
+	f1_skip *= 3;
+	f2_skip *= 3;
    }

-    /* make sure we read all bytes */
-    if (stop_after == 0) {
-	stop_after = FMAX((sf1.st_size - f1_skip), (sf2.st_size - f2_skip));
-	if (f1 == stdin && f2 == stdin) {
-	    /* dual stdin is interleaved */
-	    stop_after = (stop_after+1)/2;
-	}
-    }
-
-    /*
-    bu_log("mode is [%d] and [%d]\n", S_ISFIFO(sf1.st_mode), S_ISFIFO(sf2.st_mode));
-    bu_log("tty is [%d] and [%d]\n", isatty(fileno(f1)), isatty(fileno(f2)));
-    */
-
    /* skip requested pixels/bytes in FILE1 */
-    if (f1_skip) {
-	if (S_ISFIFO(sf1.st_mode)) {
-	    size_t skipped = 0;
-	    for (skipped = 0; skipped < f1_skip; skipped++) {
-		(void)fgetc(f1);
-	    }
-	} else if (fseek(f1, f1_skip, SEEK_SET)) {
-	    bu_log("ERROR: Unable to seek %zd %s%s in FILE1\n",
-		   f1_skip,
-		   print_bytes?"byte":"pixel",
-		   f1_skip==1?"":"s");
-	    perror("FILE1 fseek failure");
-	    exit(FILE_ERROR);
-	}
+    if (f1_skip && fseek(f1, f1_skip, SEEK_SET)) {
+	bu_log("ERROR: Unable to seek %zd %s%s in FILE1\n",
+	       f1_skip,
+	       print_bytes?"byte":"pixel",
+	       f1_skip==1?"":"s");
+	perror("FILE1 fseek failure");
+	exit(FILE_ERROR);
    }

    /* skip requested pixels in FILE2 */
-    if (f2_skip) {
-	if (S_ISFIFO(sf2.st_mode)) {
-	    size_t skipped = 0;
-	    for (skipped = 0; skipped < f2_skip; skipped++) {
-		(void)fgetc(f2);
-	    }
-	} else if (fseek(f2, f2_skip, SEEK_SET)) {
-	    bu_log("ERROR: Unable to seek %zd %s%s in FILE2\n",
-		   f2_skip,
-		   print_bytes?"byte":"pixel",
-		   f2_skip==1?"":"s");
-	    perror("FILE2 fseek failure");
-	    exit(FILE_ERROR);
-	}
-    }
-
-    /* print header to stderr, output to stdout */
-    if (!quiet && (list_same || list_diff)) {
-	if (print_bytes) {
-	    bu_log("#Byte FILE1 FILE2 LABEL\n");
-	} else {
-	    bu_log("#Pixel\t(FILE1 R, G, B) (FILE2 R, G, B)\n");
-	}
+    if (f2_skip && fseek(f2, f2_skip, SEEK_SET)) {
+	bu_log("ERROR: Unable to seek %zd %s%s in FILE2\n",
+	       f1_skip,
+	       print_bytes?"byte":"pixel",
+	       f1_skip==1?"":"s");
+	perror("FILE2 fseek failure");
+	exit(FILE_ERROR);
    }

    /* iterate over the pixels/bytes in the files */
-    while (bytes < stop_after) {
-	enum diff result;
-	int r1, r2, g1, g2, b1, b2;
+    while ((!feof(f1) && !feof(f2)) &&
+	   (!ferror(f1) && !ferror(f2))) {
+	register int r1, r2, g1, g2, b1, b2;
 	r1 = r2 = g1 = g2 = b1 = b2 = -1;

-	/* bu_log("\tbytes[%zu] < stop[%zu\n", bytes, stop_after); */
-
 	r1 = fgetc(f1);
 	r2 = fgetc(f2);
+	if (feof(f1) || feof(f2)) break;
 	bytes++;
-
-	if (print_bytes) {
-	    /* replicate */
-	    b1 = g1 = 0;
-	    b2 = g2 = 0;
-	} else {
+	if (!print_bytes) {
 	    g1 = fgetc(f1);
 	    g2 = fgetc(f2);
+	    if (feof(f1) || feof(f2)) break;
 	    bytes++;
 	    b1 = fgetc(f1);
 	    b2 = fgetc(f2);
+	    if (feof(f1) || feof(f2)) break;
 	    bytes++;
 	}

-	result = compare_rgb(r1, g1, b1, r2, g2, b2, &matching, &off1, &offmany, &missing);
+	if ((r1 == r2) && (g1 == g2) && (b1 == b2)) {
+	    matching++;
+	    continue;
+	}

-	/* print them? */
-	if ((result==MATCHING && list_same)
-	    || (result!=MATCHING && list_diff))
-	{
-	    const char *label = NULL;
-	    switch (result) {
-		case MATCHING:
-		    label = "MATCHING";
-		    break;
-		case OFF_BY_MANY:
-		    label = "OFF_BY_MANY";
-		    break;
-		case OFF_BY_ONE:
-		    label = "OFF_BY_ONE";
-		    break;
-		case MISSING:
-		default:
-		    label = "MISSING";
-		    break;
+	/* tabulate differing pixels */
+	if (((r1 != r2) && (g1 == g2) && (b1 == b2)) ||
+	    ((r1 == r2) && (g1 != g2) && (b1 == b2)) ||
+	    ((r1 == r2) && (g1 == g2) && (b1 != b2))) {
+	    /* off by one channel */
+	    if (r1 != r2) {
+		if ((r1 > r2 ? r1 - r2 : r2 - r1) > 1) {
+		    offmany++;
+		} else {
+		    off1++;
+		}
+	    } else if (g1 != g2) {
+		if ((g1 > g2 ? g1 - g2 : g2 - g1) > 1) {
+		    offmany++;
+		} else {
+		    off1++;
+		}
+	    } else if (b1 != b2) {
+		if ((b1 > b2 ? b1 - b2 : b2 - b1) > 1) {
+		    offmany++;
+		} else {
+		    off1++;
+		}
 	    }
+	} else {
+	    /* off by many */
+	    offmany++;
+	}
+
+	/* they're different, so print something */
+	if (list_pixel_values) {
 	    if (print_bytes) {
-		printf("%ld %3d %3d %s\n", bytes, r1, r2, label);
+		printf("%ld %3d %3d\n", bytes, r1, r2);
 	    } else {
-		printf("%ld\t(%3d, %3d, %3d)\t(%3d, %3d, %3d) %s\n", bytes / 3, r1, g1, b1, r2, g2, b2, label);
+		printf("%ld\t(%3d, %3d, %3d)\t(%3d, %3d, %3d)\n", bytes / 3, r1, g1, b1, r2, g2, b2);
 	    }
 	}
    }

    /* print summary */
-    if (!quiet) {
-	printf("pixcmp %s: %8zd matching, %8zd off by 1, %8zd off by many",
-	       print_bytes?"bytes":"pixels", matching, off1, offmany);
-	if (missing) {
-	    printf(", %8zd missing\n", missing);
-	} else {
-	    printf("\n");
-	}
+    if (!silent) {
+	printf("pixcmp %s: %8zd matching, %8zd off by 1, %8zd off by many\n",
+	       print_bytes?"bytes":"pixels",
+	       matching, off1, offmany);
    }

    /* check for errors */
@@ -473,16 +314,21 @@ main(int argc, char *argv[])
 	return FILE_ERROR;
    }

+    /* if files were of different lengths, consider it an error */
+    if (feof(f1) != feof(f2)) {
+	return FILE_ERROR;
+    }
+
    /* indicate how many differences there were overall */
-    if (offmany || missing) {
-	return EXIT_OFF_BY_MANY;
+    if (offmany) {
+	return OFF_BY_MANY;
    }
    if (off1) {
-	return EXIT_OFF_BY_ONE;
+	return OFF_BY_ONE;
    }

    /* Success! */
-    return EXIT_OFF_BY_NONE;
+    return OFF_BY_NONE;
 }


@@ -1,7 +1,7 @@
 /*                           R U N . C
 * BRL-CAD
 *
- * Copyright (c) 2011-2021 United States Government as represented by
+ * Copyright (c) 2011-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 #                          R U N . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2021 United States Government as represented by
+# Copyright (c) 2004-2020 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -608,27 +608,30 @@ if test ! "x${ret}" = "x0" ; then
    "$RT"
    $ECHO
    $ECHO "ERROR:  RT does not seem to work as expected"
-    $ECHO "        (returned $ret, output was [$out])"
+    $ECHO "        (output was [$out])"
    exit 2
 fi

 # sanity check: make sure $CMP runs
-out=`eval \"$CMP\" - - 2>&1 <<EOF
-EOF`
+echo "" > tmp1
+echo "" > tmp2
+out=`echo "" | eval \"$CMP\" tmp1 tmp2 2>&1`
 ret=$?
 if test ! "x${ret}" = "x0" ; then
    $ECHO
    $ECHO "ERROR:  CMP does not seem to work as expected"
-    $ECHO "        (returned $ret, output was [$out])"
+    $ECHO "        (output was [$out])"
+    rm -f tmp1 tmp2
    exit 2
 fi
+rm -f tmp1 tmp2

 # sanity check: make sure $ELP runs
 out=`eval \"$ELP\" 0 2>&1`
 if test ! "x${ret}" = "x0" ; then
    $ECHO
    $ECHO "ERROR:  ELP does not seem to work as expected"
-    $ECHO "        (returned $ret, output was [$out])"
+    $ECHO "        (output was [$out])"
    exit 2
 fi

@@ -1141,7 +1144,7 @@ EOF
 	ls -la *.pix*
    fi
    $VERBOSE_ECHO "DEBUG: $CMP $PIX/${bench_testname}.pix ${bench_testname}.pix"
-    cmp_result="`eval \\\"${CMP}\\\" \\\"${PIX}/${bench_testname}.pix\\\" ${bench_testname}.pix 2>&1 | grep pixels`"
+    cmp_result="`eval \\\"${CMP}\\\" \\\"${PIX}/${bench_testname}.pix\\\" ${bench_testname}.pix 2>&1`"
    ret=$?

    $ECHO "$cmp_result"
@@ -2,7 +2,7 @@
 #                          T R Y . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2021 United States Government as represented by
+# Copyright (c) 2004-2020 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 #                    V I E W D I F F . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2021 United States Government as represented by
+# Copyright (c) 2004-2020 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -82,49 +82,17 @@ do
                                  shift;;
     --disable-docbook)                options="$options -DBRLCAD_EXTRADOCS=OFF";
                                  shift;;
-     --enable-zlib)                options="$options -DBRLCAD_ZLIB=BUNDLED";
+     --enable-lemon)                options="$options -DBRLCAD_LEMON=BUNDLED";
                                  shift;;
-     --disable-zlib)                options="$options -DBRLCAD_ZLIB=SYSTEM";
+     --disable-lemon)                options="$options -DBRLCAD_LEMON=SYSTEM";
                                  shift;;
-     --enable-libz)                options="$options -DBRLCAD_ZLIB=BUNDLED";
+     --enable-re2c)                options="$options -DBRLCAD_RE2C=BUNDLED";
                                  shift;;
-     --disable-libz)                options="$options -DBRLCAD_ZLIB=SYSTEM";
+     --disable-re2c)                options="$options -DBRLCAD_RE2C=SYSTEM";
                                  shift;;
-     --enable-regex)                options="$options -DBRLCAD_REGEX=BUNDLED";
+     --enable-perplex)                options="$options -DBRLCAD_PERPLEX=BUNDLED";
                                  shift;;
-     --disable-regex)                options="$options -DBRLCAD_REGEX=SYSTEM";
-                                  shift;;
-     --enable-netpbm)                options="$options -DBRLCAD_NETPBM=BUNDLED";
-                                  shift;;
-     --disable-netpbm)                options="$options -DBRLCAD_NETPBM=SYSTEM";
-                                  shift;;
-     --enable-png)                options="$options -DBRLCAD_PNG=BUNDLED";
-                                  shift;;
-     --disable-png)                options="$options -DBRLCAD_PNG=SYSTEM";
-                                  shift;;
-     --enable-scl)                options="$options -DBRLCAD_SC=BUNDLED";
-                                  shift;;
-     --disable-scl)                options="$options -DBRLCAD_SC=SYSTEM";
-                                  shift;;
-     --enable-step)                options="$options -DBRLCAD_SC=BUNDLED";
-                                  shift;;
-     --disable-step)                options="$options -DBRLCAD_SC=SYSTEM";
-                                  shift;;
-     --enable-step-class-libraries)                options="$options -DBRLCAD_SC=BUNDLED";
-                                  shift;;
-     --disable-step-class-libraries)                options="$options -DBRLCAD_SC=SYSTEM";
-                                  shift;;
-     --enable-proj4)                options="$options -DBRLCAD_PROJ4=BUNDLED";
-                                  shift;;
-     --disable-proj4)                options="$options -DBRLCAD_PROJ4=SYSTEM";
-                                  shift;;
-     --enable-gdal)                options="$options -DBRLCAD_GDAL=BUNDLED";
-                                  shift;;
-     --disable-gdal)                options="$options -DBRLCAD_GDAL=SYSTEM";
-                                  shift;;
-     --enable-tcl)                options="$options -DBRLCAD_TCL=BUNDLED";
-                                  shift;;
-     --disable-tcl)                options="$options -DBRLCAD_TCL=SYSTEM";
+     --disable-perplex)                options="$options -DBRLCAD_PERPLEX=SYSTEM";
                                  shift;;
     --enable-astyle)                options="$options -DBRLCAD_ASTYLE=BUNDLED";
                                  shift;;
@@ -138,6 +106,98 @@ do
                                  shift;;
     --disable-xmllint)                options="$options -DBRLCAD_XMLLINT=SYSTEM";
                                  shift;;
+     --enable-regex)                options="$options -DBRLCAD_REGEX=BUNDLED";
+                                  shift;;
+     --disable-regex)                options="$options -DBRLCAD_REGEX=SYSTEM";
+                                  shift;;
+     --enable-zlib)                options="$options -DBRLCAD_ZLIB=BUNDLED";
+                                  shift;;
+     --disable-zlib)                options="$options -DBRLCAD_ZLIB=SYSTEM";
+                                  shift;;
+     --enable-libz)                options="$options -DBRLCAD_ZLIB=BUNDLED";
+                                  shift;;
+     --disable-libz)                options="$options -DBRLCAD_ZLIB=SYSTEM";
+                                  shift;;
+     --enable-png)                options="$options -DBRLCAD_PNG=BUNDLED";
+                                  shift;;
+     --disable-png)                options="$options -DBRLCAD_PNG=SYSTEM";
+                                  shift;;
+     --enable-netpbm)                options="$options -DBRLCAD_NETPBM=BUNDLED";
+                                  shift;;
+     --disable-netpbm)                options="$options -DBRLCAD_NETPBM=SYSTEM";
+                                  shift;;
+     --enable-utahrle)                options="$options -DBRLCAD_UTAHRLE=BUNDLED";
+                                  shift;;
+     --disable-utahrle)                options="$options -DBRLCAD_UTAHRLE=SYSTEM";
+                                  shift;;
+     --enable-tcl)                options="$options -DBRLCAD_TCL=BUNDLED";
+                                  shift;;
+     --disable-tcl)                options="$options -DBRLCAD_TCL=SYSTEM";
+                                  shift;;
+     --enable-tk)                options="$options -DBRLCAD_TK=BUNDLED";
+                                  shift;;
+     --disable-tk)                options="$options -DBRLCAD_TK=SYSTEM";
+                                  shift;;
+     --enable-itcl)                options="$options -DBRLCAD_ITCL=BUNDLED";
+                                  shift;;
+     --disable-itcl)                options="$options -DBRLCAD_ITCL=SYSTEM";
+                                  shift;;
+     --enable-itk)                options="$options -DBRLCAD_ITK=BUNDLED";
+                                  shift;;
+     --disable-itk)                options="$options -DBRLCAD_ITK=SYSTEM";
+                                  shift;;
+     --enable-iwidgets)                options="$options -DBRLCAD_IWIDGETS=BUNDLED";
+                                  shift;;
+     --disable-iwidgets)                options="$options -DBRLCAD_IWIDGETS=SYSTEM";
+                                  shift;;
+     --enable-tkhtml)                options="$options -DBRLCAD_TKHTML=BUNDLED";
+                                  shift;;
+     --disable-tkhtml)                options="$options -DBRLCAD_TKHTML=SYSTEM";
+                                  shift;;
+     --enable-tktable)                options="$options -DBRLCAD_TKTABLE=BUNDLED";
+                                  shift;;
+     --disable-tktable)                options="$options -DBRLCAD_TKTABLE=SYSTEM";
+                                  shift;;
+     --enable-opennurbs)                options="$options -DBRLCAD_OPENNURBS=BUNDLED";
+                                  shift;;
+     --disable-opennurbs)                options="$options -DBRLCAD_OPENNURBS=SYSTEM";
+                                  shift;;
+     --enable-spsr)                options="$options -DBRLCAD_SPSR=BUNDLED";
+                                  shift;;
+     --disable-spsr)                options="$options -DBRLCAD_SPSR=SYSTEM";
+                                  shift;;
+     --enable-scl)                options="$options -DBRLCAD_SC=BUNDLED";
+                                  shift;;
+     --disable-scl)                options="$options -DBRLCAD_SC=SYSTEM";
+                                  shift;;
+     --enable-step)                options="$options -DBRLCAD_SC=BUNDLED";
+                                  shift;;
+     --disable-step)                options="$options -DBRLCAD_SC=SYSTEM";
+                                  shift;;
+     --enable-step-class-libraries)                options="$options -DBRLCAD_SC=BUNDLED";
+                                  shift;;
+     --disable-step-class-libraries)                options="$options -DBRLCAD_SC=SYSTEM";
+                                  shift;;
+     --enable-vds)                options="$options -DBRLCAD_VDS=BUNDLED";
+                                  shift;;
+     --disable-vds)                options="$options -DBRLCAD_VDS=SYSTEM";
+                                  shift;;
+     --enable-openscenegraph)                options="$options -DBRLCAD_OSG=BUNDLED";
+                                  shift;;
+     --disable-openscenegraph)                options="$options -DBRLCAD_OSG=SYSTEM";
+                                  shift;;
+     --enable-gdiam)                options="$options -DBRLCAD_GDIAM=BUNDLED";
+                                  shift;;
+     --disable-gdiam)                options="$options -DBRLCAD_GDIAM=SYSTEM";
+                                  shift;;
+     --enable-proj4)                options="$options -DBRLCAD_PROJ4=BUNDLED";
+                                  shift;;
+     --disable-proj4)                options="$options -DBRLCAD_PROJ4=SYSTEM";
+                                  shift;;
+     --enable-gdal)                options="$options -DBRLCAD_GDAL=BUNDLED";
+                                  shift;;
+     --disable-gdal)                options="$options -DBRLCAD_GDAL=SYSTEM";
+                                  shift;;
     --prefix=*)   	          inputstr=$1;
 				  options="$options -DCMAKE_INSTALL_PREFIX=${inputstr#--prefix=}";
 				  shift;;
@@ -57,12 +57,10 @@ function(ADD_G_TARGET in_model folder)
    set(OUTPUT_FILE "${output_file}")
    # Use the model name for the script, since the output file is specific to this input
    configure_file("${CMAKE_SOURCE_DIR}/db/conv_run.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${in_model_root}.cmake" @ONLY)
-    DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${in_model_root}.cmake")

    # Define the target
    add_custom_command(
      OUTPUT ${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}
-      COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}"
      COMMAND ${CMAKE_COMMAND} -DEXEC=$<TARGET_FILE:3dm-g> -P "${CMAKE_CURRENT_BINARY_DIR}/${in_model_root}.cmake"
      DEPENDS 3dm-g ${CMAKE_CURRENT_SOURCE_DIR}/${in_model}
      )
@@ -160,7 +158,6 @@ set(G_SAMPLE_MODELS
  pic.asc
  pinewood.asc
  prim.asc
-  radialgrid.asc
  rounds.asc
  tank_car.asc
  terra.asc
@@ -229,13 +226,12 @@ CMAKEFILES(
  ${G_SAMPLE_MODELS}
  CMakeLists.txt
  aet.rt
-  conv_run.cmake.in
  cornell.rt
  cube.rt
  db.php
  include/ctype.inc
  include/debug.inc
-  )
+)

 # Local Variables:
 # tab-width: 8
@@ -2,7 +2,7 @@
 #                         C U B E . R T
 # BRL-CAD
 #
-# Copyright (c) 2004-2021 United States Government as represented by
+# Copyright (c) 2004-2020 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 /*                         D B . P H P
 * BRL-CAD
 *
- * Copyright (c) 2004-2021 United States Government as represented by
+ * Copyright (c) 2004-2020 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,36 +0,0 @@
-title {Sample geometry with a radial gridlines and a shadow-casting light}
-units m
-put {cylinder.r} comb region yes tree {- {- {- {- {- {l c1.tgc} {l c1i.tgc}} {l c1c1.arb8}} {l c1c2.arb8}} {l c1c3.tgc}} {l c1c4.tgc}}
-attr set {cylinder.r} {region} {R} {region_id} {1003} {material_id} {1} {los} {100}
-put {50m_ring.s} tor V {0 0 0}  H {6.12323399573676603586882E-17 0 -1}  r_a 50000 r_h 100
-put {40m_ring.s} tor V {0 0 0}  H {6.12323399573676603586882E-17 0 -1}  r_a 40000 r_h 100
-put {30m_ring.s} tor V {0 0 0}  H {6.12323399573676603586882E-17 0 -1}  r_a 30000 r_h 100
-put {20m_ring.s} tor V {0 0 0}  H {6.12323399573676603586882E-17 0 -1}  r_a 20000 r_h 100
-put {10m_ring.s} tor V {0 0 0}  H {6.12323399573676603586882E-17 0 -1}  r_a 10000 r_h 100
-put {c1c2.arb8} arb8 V1 {-1449.999999999999545252649 -99.99999999999998578914528 0}  V2 {-1449.999999999999545252649 100 0}  V3 {-1449.999999999999545252649 100 1900}  V4 {-1449.999999999999545252649 -99.99999999999998578914528 1900}  V5 {-449.9999999999999431565811 -99.99999999999998578914528 0}  V6 {-449.9999999999999431565811 100 0}  V7 {-449.9999999999999431565811 100 1900}  V8 {-449.9999999999999431565811 -99.99999999999998578914528 1900} 
-put {c1c1.arb8} arb8 V1 {1450 -500 1250}  V2 {1450 500 1250}  V3 {1450 500 1750}  V4 {1450 -500 1750}  V5 {450 -500 1250}  V6 {450 500 1250}  V7 {450 500 1750}  V8 {450 -500 1750} 
-put {ground.s} arb8 V1 {60000.00000000002182787284 -60000.00000000002182787284 -100}  V2 {60000.00000000002182787284 60000.00000000002182787284 -100}  V3 {60000.00000000002182787284 60000.00000000002182787284 0}  V4 {60000.00000000002182787284 -60000.00000000002182787284 0}  V5 {-60000.00000000001455191523 -60000.00000000002182787284 -100}  V6 {-60000.00000000001455191523 60000.00000000002182787284 -100}  V7 {-60000.00000000001455191523 60000.00000000002182787284 0}  V8 {-60000.00000000001455191523 -60000.00000000002182787284 0} 
-put {ground.r} comb region yes tree {l ground.s}
-attr set {ground.r} {region} {R} {region_id} {1000} {material_id} {1} {los} {100} {color} {0/255/0}
-put {c1c4.tgc} tgc V {-6.123233995736766242944808E-14 -500 1000}  H {0 -1000 6.123233995736767505122256E-14}  A {200 0 0}  B {0 1.224646799147353374806706E-14 -200}  C {200 0 0}  D {0 1.224646799147353374806706E-14 -200} 
-put {c1c3.tgc} tgc V {0 500 1500}  H {0 1000 6.123233995736764980767359E-14}  A {200 0 0}  B {0 1.224646799147353374806706E-14 -200}  C {200 0 0}  D {0 1.224646799147353374806706E-14 -200} 
-put {165deg.s} tgc V {53125.92044589875149540603 -14235.04748063865554286167 0}  H {-106251.8408917975175427273 28470.09496127731472370215 6.735557395310443447840915E-12}  A {-5.91458985689334876413324E-15 1.584809575715884060677382E-15 -100}  B {-25.88190451025210236934981 -96.59258262890682544821175 0}  C {-5.91458985689334876413324E-15 1.584809575715884060677382E-15 -100}  D {-25.88190451025210236934981 -96.59258262890682544821175 0} 
-put {135deg.s} tgc V {38890.87296526011050445959 -38890.8729652601177804172 0}  H {-77781.74593052023556083441 77781.74593052025011274964 6.735557395310443447840915E-12}  A {-4.329780281177466281177668E-15 4.329780281177467070038573E-15 -100}  B {-70.71067811865475505328504 -70.71067811865474084243033 0}  C {-4.329780281177466281177668E-15 4.329780281177467070038573E-15 -100}  D {-70.71067811865475505328504 -70.71067811865474084243033 0} 
-put {105deg.s} tgc V {14235.04748063864644791465 -53125.92044589875877136365 0}  H {-28470.09496127729653380811 106251.8408917975320946425 6.735557395310443447840915E-12}  A {-1.58480957571588307460125E-15 5.914589856893349552994145E-15 -100}  B {-96.59258262890682544821175 -25.88190451025208460578142 0}  C {-1.58480957571588307460125E-15 5.914589856893349552994145E-15 -100}  D {-96.59258262890682544821175 -25.88190451025208460578142 0} 
-put {150deg.s} tgc V {47631.39720814413158223033 -27499.99999999999636202119 0}  H {-95262.79441628826316446066 55000 6.735557395310443447840915E-12}  A {-5.302876193624534820650073E-15 3.061616997868382648155861E-15 -100}  B {-49.99999999999999289457264 -86.60254037844387653422018 0}  C {-5.302876193624534820650073E-15 3.061616997868382648155861E-15 -100}  D {-49.99999999999999289457264 -86.60254037844387653422018 0} 
-put {120deg.s} tgc V {27499.99999999998908606358 -47631.39720814413158223033 0}  H {-54999.99999999998544808477 95262.79441628826316446066 6.735557395310443447840915E-12}  A {-3.061616997868381859294956E-15 5.302876193624534820650073E-15 -100}  B {-86.60254037844387653422018 -49.99999999999997868371793 0}  C {-3.061616997868381859294956E-15 5.302876193624534820650073E-15 -100}  D {-86.60254037844387653422018 -49.99999999999997868371793 0} 
-put {light.s} ell V {0 0 1500}  A {10 0 0}  B {0 10 0}  C {0 0 10} 
-put {light.r} comb region yes tree {l light.s}
-attr set {light.r} {oshader} {light {f 10 s 32 v 0}} {region} {R} {shader} {light {f 10.0 s 32 v 0}} {region_id} {1002} {material_id} {1} {los} {100} {color} {255/255/255}
-put {c1i.tgc} tgc V {0 0 0}  H {0 0 1900}  A {900 0 0}  B {0 900 0}  C {900 0 0}  D {0 900 0} 
-put {75deg.s} tgc V {-14235.04748063864099094644 -53125.92044589875877136365 0}  H {28470.09496127728561987169 106251.8408917975320946425 6.735557395310443447840915E-12}  A {1.584809575715882482955572E-15 5.914589856893349552994145E-15 -100}  B {-96.59258262890682544821175 25.88190451025207394764038 0}  C {1.584809575715882482955572E-15 5.914589856893349552994145E-15 -100}  D {-96.59258262890682544821175 25.88190451025207394764038 0} 
-put {45deg.s} tgc V {-38890.8729652601177804172 -38890.8729652601177804172 0}  H {77781.74593052025011274964 77781.74593052025011274964 6.735557395310443447840915E-12}  A {4.329780281177467070038573E-15 4.329780281177467070038573E-15 -100}  B {-70.71067811865475505328504 70.71067811865475505328504 0}  C {4.329780281177467070038573E-15 4.329780281177467070038573E-15 -100}  D {-70.71067811865475505328504 70.71067811865475505328504 0} 
-put {15deg.s} tgc V {-53125.92044589875877136365 -14235.04748063864099094644 0}  H {106251.8408917975320946425 28470.09496127728561987169 6.735557395310443447840915E-12}  A {5.914589856893349552994145E-15 1.584809575715882482955572E-15 -100}  B {-25.88190451025207394764038 96.59258262890682544821175 0}  C {5.914589856893349552994145E-15 1.584809575715882482955572E-15 -100}  D {-25.88190451025207394764038 96.59258262890682544821175 0} 
-put {90deg.s} tgc V {-3.367778697655221320023674E-12 -55000 0}  H {6.735557395310443447840915E-12 110000.0000000000145519152 6.735557395310443447840915E-12}  A {3.749399456654643800636173E-31 6.123233995736766085172627E-15 -100}  B {-100 6.123233995736766085172627E-15 0}  C {3.749399456654643800636173E-31 6.123233995736766085172627E-15 -100}  D {-100 6.123233995736766085172627E-15 0} 
-put {60deg.s} tgc V {-27500.00000000000727595761 -47631.39720814412430627272 0}  H {55000.00000000002182787284 95262.79441628826316446066 6.735557395310443447840915E-12}  A {3.061616997868383437016766E-15 5.302876193624534031789167E-15 -100}  B {-86.60254037844386232336547 50.00000000000001421085472 0}  C {3.061616997868383437016766E-15 5.302876193624534031789167E-15 -100}  D {-86.60254037844386232336547 50.00000000000001421085472 0} 
-put {30deg.s} tgc V {-47631.39720814413158223033 -27499.99999999999636202119 0}  H {95262.79441628826316446066 55000 6.735557395310443447840915E-12}  A {5.302876193624534820650073E-15 3.061616997868382253725408E-15 -100}  B {-49.99999999999999289457264 86.60254037844387653422018 0}  C {5.302876193624534820650073E-15 3.061616997868382253725408E-15 -100}  D {-49.99999999999999289457264 86.60254037844387653422018 0} 
-put {grid.r} comb region yes tree {u {u {u {u {u {l 50m_ring.s} {l 40m_ring.s}} {u {l 30m_ring.s} {l 20m_ring.s}}} {u {u {l 10m_ring.s} {l 0deg.s}} {u {l 15deg.s} {l 30deg.s}}}} {u {u {u {l 45deg.s} {l 60deg.s}} {u {l 75deg.s} {l 90deg.s}}} {u {u {l 105deg.s} {l 120deg.s}} {u {l 135deg.s} {l 150deg.s}}}}} {l 165deg.s}}
-attr set {grid.r} {region} {R} {shader} {plastic} {region_id} {1001} {material_id} {1} {los} {100} {color} {255/255/255}
-put {c1.tgc} tgc V {0 0 0}  H {0 0 2000}  A {1000 0 0}  B {0 1000 0}  C {1000 0 0}  D {0 1000 0} 
-put {0deg.s} tgc V {-55000 0 0}  H {110000.0000000000145519152 0 6.735557395310443447840915E-12}  A {6.123233995736766085172627E-15 0 -100}  B {0 100 0}  C {6.123233995736766085172627E-15 0 -100}  D {0 100 0} 
-put {all.g} comb region no tree {u {u {u {- {l ground.r} {l grid.r}} {- {l grid.r} {l c1.tgc}}} {l cylinder.r}} {l light.r}}
@@ -2246,19 +2246,6 @@
  timestamp = {2018.06.06}
 }

-@TECHREPORT{Dean18a,
-  author = {Dean, Allen and Thomas, Jr., John},
-  title = {Development of Large and Small Missile Target Models},
-  institution = {United States Air Force Research Laboratory, Munitions Directorate},
-  year = {2018},
-  month = dec,
-  number = {AFRL-RW-EG-TR-2018-100},
-  address = {Air Force Research Laboratory, Eglin Air Force Base, FL 32542-6810},
-  note = {Distribution authorized to Department of Defense and U.S. DoD contractors only; critical technology; distribution limitations applied November 2018. Other requests must be referred to AFRL/RWML, Eglin AFB FL 32542-5910.},
-  owner = {morrison},
-  timestamp = {2020.10.30}
-}
-
@comment{jabref-meta: selector_journal:}

@comment{jabref-meta: selector_author:}
@@ -203,18 +203,12 @@ set(documentation_mged_old_DATA
 ADD_DOC(documentation_mged_old_DATA mged_old)

 configure_file(pad_file.xml.in "${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml" @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml" DESTINATION ${DOC_DIR})

 CMAKEFILES(
  CMakeLists.txt
  STARTERS
  STRATEGY
-  git/check.yml
-  git/gitconfig
-  git/gitk
-  git/history.txt
-  git/mime_types.txt
  notes/bsd_semaphore_bug.txt
  notes/cmake_paths/CMakeLists.txt
  notes/cmake_paths/README.txt
@@ -1,15 +1,4 @@
-BRL-CAD has migrated from the Sourceforge hosting solution
-(https://sf.net/projects/brlcad) to Github (https://github.com/BRL-CAD/brlcad).
-As with other large projects that have undertaken large scale hosting and VCS
-migration(1) the BRL-CAD project is adjusting to working in the new
-environment.  The following notes are intended to capture practical tips and
-information related to working with BRL-CAD on the Github platform.
-
--------------------------------------------------------------------------------
-For those wishing to direct Github emails to different addresses on a
-per-project basis, the following information may be useful:
-
-https://docs.github.com/en/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#customizing-email-routes-per-organization
+Notes about development with the Github hosting platform.

 --------------------------------------------------------------------------------
 Using Github Actions to iteratively debug problems.
@@ -69,36 +58,3 @@ https://github.community/t/ci-access-to-shell-session/17250
 the mechanism by which the values are introduced into the runner environment,
 but there are no actual secrets contained in the values of the debugging
 variables.)
-
--------------------------------------------------------------------------------
-Git provides a stats page, but that page reports only commits to the "main"
-branch.  To prepare a more comprehensive stats page, one alternative that has
-been tested is:
-
-https://github.com/tomgi/git_stats
-
-After installing, statistics pages can be generated by running:
-the following in a clone of the repository.
-
-user@machine:~/brlcad$ git_stats generate
-
-Note - on Ubuntu, per https://github.com/rails/rails/issues/34822 I had to add the line:
-to the git_stats file
-
-user@machine:~$ echo "gem 'bigdecimal', '1.4.2'" >> /var/lib/gems/2.7.0/gems/git_stats-1.0.17/bin/git_stats
-
-and install the older version of bigdecimal (per https://stackoverflow.com/a/17026442):
-
-user@machine:~$ gem install bigdecimal -v 1.4.2
-
-
---------------------------------------------------------------------------------
-(1) Other large scale git conversions:
-https://web.archive.org/web/20130327012743/https://techbase.kde.org/Projects/MovetoGit
-https://techbase.kde.org/Projects/MovetoGit
-https://blog.runtux.com/posts/2014/04/18/233/
-https://blogs.ed.ac.uk/timc/2017/11/24/migrating-from-svn-to-git-while-splitting-repository/
-http://esr.ibiblio.org/?p=5634
-http://esr.ibiblio.org/?p=6792
-http://esr.ibiblio.org/?p=8607
-https://gitlab.com/ideasman42/blender-git-migration/
@@ -59,35 +59,6 @@ You may want to produce an NSIS installer.  If so, locate a target
 named PACKAGE and run it.  The end result should be an .exe file
 capable of installing BRL-CAD.

-Debugging with Visual Studio
----------------------------
-
-For most compilation environments, BRL-CAD defines a Debug build
-configuration which disables optimizations and a Release build that
-enables them - although Debug builds are generally easier to use when
-tracking down problems, both configurations keep debugging information.
-This allows for easier diagnosis of problems in real-world use, as
-well as diagnosis of issues that occur only when optimizations are
-enabled.
-
-MSVC and Windows present a more complicated situation. On that platform,
-Debug versions of applications are not redistributable:
-https://docs.microsoft.com/en-us/cpp/windows/determining-which-dlls-to-redistribute
-
-As a consequence the default BRL-CAD build configuration for Release
-(unlike other platforms) does not support debugging.
-
-If it is necessary to debug a Release mode specific issue on Windows,
-extra steps are needed.  Users of CMake may be familiar with the build
-configuration RelWithDebInfo, which is normally disabled for BRL-CAD
-builds - debugging a Release-mode-only problem is exactly the situation
-in which this build configuration is needed.
-
-To re-enable the availability of RelWithDebInfo for BRL-CAD builds, set
-the compilation variable ENABLE_ALL_CONFIG_TYPES to ON - once set,
-BRL-CAD's configure will no longer eliminate CMake build types other
-than Debug and Release.
-
 Working with MSI files
 ----------------------

@@ -115,44 +86,6 @@ installed on the system.  To see what versions are installed,
 look for Windows SDK installs in the "Apps & Features" Setup
 interface.

-=======================================================
-
-=== Tracking down the source of a header inclusion  ===
-
-If a Windows system header is reporting an error, it can be helpful to identify
-where the header is being included from.  By default MSVC doesn't report this,
-but in Visual Studio there is a "ShowIncludes" setting that may be enabled to
-find this information:
-
-https://stackoverflow.com/a/1138045
-
-This setting may also be added to the compilation flags directly
-in CMake as "/showIncludes":
-
-https://docs.microsoft.com/en-us/cpp/build/reference/showincludes-list-include-files
-
-Note that the output of this can be very verbose, especially if applied
-globally to all targets - you may want to consider applying it specifically to
-an individual target with target_compile_options.  This flag is a very useful
-tool when trying to determine *why* a particular header is present in an error
-message.
-
-=========================================================
-
-=== Debugging build outputs from a Ninja compilation  ===
-
-Normally, Visual Studio is used to debug Windows executables.  However,
-another alternative is available called WinDbg:
-
-https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-download-tools
-
-This has been used successfully to debug Ninja produced executables.
-Note that if debugging an issue unique to Release builds, you will
-want to set the CMake variable ENABLE_ALL_CONFIG_TYPES to ON
-and the specific build type to RelWithDebInfo
-
-cmake.exe -G Ninja -ENABLE_ALL_CONFIG_TYPES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
 ===========================================

 === Notes on Visual Studio 14 2015 ===
@@ -17,7 +17,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Apache FOP needs a couple of config files set up
  set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
  configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/fop.xconf.in ${CMAKE_BINARY_DIR}/doc/docbook/fop.xconf)
-  DISTCLEAN("${CMAKE_BINARY_DIR}/doc/docbook/fop.xconf")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For the html files, we need brlcad.css
@@ -2,13 +2,11 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Files for PDF products
@@ -16,7 +14,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Style sheet for XSLT transformation to PDF
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-article-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-article-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML and FO (FO is an intermediate file used in the
@@ -2713,14 +2713,6 @@ rt -s 512 -F :1
                zero knobs and sliders
              </entry>
            </row>
-            <row>
-              <entry>
-                N
-              </entry>
-              <entry>
-                shoot a ray with nirt
-              </entry>
-            </row>
            <row>
              <entry>
                &lt; F1 &gt;
@@ -2,13 +2,11 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Files for PDF products
@@ -16,7 +14,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Style sheet for XSLT transformation to PDF
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-book-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-book-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML and FO (FO is an intermediate file used in the
@@ -92,12 +89,10 @@ set(CURRENT_VOLUME "I")
 set(CURRENT_TITLE "An Overview of BRL-CAD")
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-cover-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI-cover.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI-cover.xsl")

 string(REPLACE " " "%20" TUTORIAL_COVER_XSL ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI-cover.xsl)
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI.xsl")

 set(XSL_FO_STYLESHEET "${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeI.xsl")

@@ -108,12 +103,10 @@ set(CURRENT_VOLUME "II")
 set(CURRENT_TITLE "Introduction to MGED")
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-cover-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII-cover.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII-cover.xsl")

 string(REPLACE " " "%20" TUTORIAL_COVER_XSL ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII-cover.xsl)
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII.xsl")

 set(XSL_FO_STYLESHEET "${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeII.xsl")

@@ -125,12 +118,10 @@ set(CURRENT_VOLUME "III")
 set(CURRENT_TITLE "Principles of Effective Modeling")
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-cover-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII-cover.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII-cover.xsl")

 string(REPLACE " " "%20" TUTORIAL_COVER_XSL ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII-cover.xsl)
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII.xsl")

 set(XSL_FO_STYLESHEET "${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIII.xsl")

@@ -142,12 +133,10 @@ set(CURRENT_VOLUME "IV")
 set(CURRENT_TITLE "Converting Geometry Between BRL-CAD and Other Formats")
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-cover-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV-cover.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV-cover.xsl")

 string(REPLACE " " "%20" TUTORIAL_COVER_XSL ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV-cover.xsl)
 configure_file(${CMAKE_SOURCE_DIR}/doc/docbook/resources/brlcad/tutorial-template.xsl.in
  ${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV.xsl @ONLY)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV.xsl")

 set(XSL_FO_STYLESHEET "${CMAKE_CURRENT_BINARY_DIR}/BRL-CAD_Tutorial_Series-VolumeIV.xsl")

@@ -498,7 +498,7 @@
      <section>
        <title>The Big Picture</title>
        <para>
-          The source code and most project data are stored in a Git<footnote><para><link xlink:href="http://git-scm.com/"/></para></footnote> version control system for change tracking and collaborative development. Primary development in the "main" branch is generally stable, but cross-platform compilation is not guaranteed. A separate branch (named STABLE) provides a higher level of quality assurance. Every released version of BRL-CAD is tested and tagged.
+          The source code and most project data are stored in a Subversion<footnote><para><link xlink:href="http://subversion.apache.org/"/></para></footnote> version control system for change tracking and collaborative development. Trunk development is generally stable, but cross-platform compilation is not guaranteed. A separate branch (named STABLE) provides a higher level of quality assurance. Every released version of BRL-CAD is tested and tagged.
        </para>

        <para>
@@ -771,7 +771,7 @@
        <title>Code Conventions</title>

        <para>
-          BRL-CAD has a STABLE branch in Git that should always compile and run on all supported platforms. The primary development branch trunk, unlike STABLE, is generally expected to compile but may occasionally fail to do so during active development.
+          BRL-CAD has a STABLE branch in SVN that should always compile and run on all supported platforms. The primary development branch trunk, unlike STABLE, is generally expected to compile but may occasionally fail to do so during active development.
        </para>
        <section>
          <title>Languages</title>
@@ -1020,11 +1020,11 @@ some_function(char *j)
      </para>
      <section><title>Obtaining the Code</title>
        <para>
-          You can get the development code for BRL-CAD from our Git code repository using the following command:
+          You can get the development code for BRL-CAD from our Subversion code repository using the following command:
        </para>

        <para>
-          <command>git clone https://github.com/BRL-CAD/brlcad</command>
+          <command>svn checkout svn://svn.code.sf.net/p/brlcad/code/brlcad/trunk brlcad-code</command>
        </para>

        <para>
@@ -1590,7 +1590,7 @@ Scanning dependencies of target ellipsoid_article_html
      </para>

      <para>
-      We also have a list of bugs in our <link xlink:href="https://github.com/BRL-CAD/brlcad/blob/main/BUGS">BUGS file</link>. While most of the bugs in the list focus on the BRL-CAD code, there are a few related to the documentation. If you plan to tackle a documentation bug, remember to report it in our <link xlink:href="https://github.com/BRL-CAD/brlcad/issues">issue tracker</link> (https://github.com/BRL-CAD/brlcad/issues).
+      We also have a list of bugs in our <link xlink:href="http://sourceforge.net/p/brlcad/code/HEAD/tree/brlcad/trunk/BUGS">BUGS file</link>. While most of the bugs in the list focus on the BRL-CAD code, there are a few related to the documentation. If you plan to tackle a documentation bug, remember to report it in our <link xlink:href="http://sourceforge.net/p/brlcad/bugs/">bug tracker</link> (http://sourceforge.net/p/brlcad/bugs/).
      </para>
      </section>

@@ -1612,15 +1612,15 @@ Scanning dependencies of target ellipsoid_article_html

      <section><title>Obtaining the Documentation</title>
      <para>
-      The documentation and the toolchain required to generate the documentation is part of the software's development code. You should download the source code from the Git version control system using the following command:
+      The documentation and the toolchain required to generate the documentation is part of the software's development code. You should download the source code from the Subversion version control system using the following command:
      </para>

      <para>
-      <command>git clone https://github.com/BRL-CAD/brlcad</command>
+      <command>svn checkout svn://svn.code.sf.net/p/brlcad/code/brlcad/trunk brlcad-code</command>
      </para>

      <para>
-      The directory <filename>brlcad</filename> should be within your <filename>/home</filename> directory so that BRL-CAD's build directory commands don't interfere with your system's commands.
+      The directory <filename>brlcad-code</filename> should be within your <filename>/home</filename> directory so that BRL-CAD's build directory commands don't interfere with your system's commands.
      </para>

      <section><title>Obtaining FOP</title>
@@ -1733,7 +1733,7 @@ Scanning dependencies of target ellipsoid_article_html

      <section><title>Bug Reporting and Feature Requests</title>
      <para>
-      Finding bugs in software is often a challenging task for developers. If you find a problem with the software, file a bug report on BRL-CAD's official <link xlink:href="https://github.com/BRL-CAD/brlcad/issues">issue tracking page</link> on SourceForge (http://sourceforge.net/p/brlcad/bugs/). Please remember to provide enough detail so that we can reproduce the problem. You can also post to our developer mailing list at <email>brlcad-devel@lists.sourceforge.net</email>.
+      Finding bugs in software is often a challenging task for developers. If you find a problem with the software, file a bug report on BRL-CAD's official <link xlink:href="http://sourceforge.net/p/brlcad/bugs/">bug tracking page</link> on SourceForge (http://sourceforge.net/p/brlcad/bugs/). Please remember to provide enough detail so that we can reproduce the problem. You can also post to our developer mailing list at <email>brlcad-devel@lists.sourceforge.net</email>.
      </para>

      <para>
@@ -1825,14 +1825,15 @@ Scanning dependencies of target ellipsoid_article_html
      <listitem><para>Wiki: <link xlink:href="http://brlcad.org/wiki/Main_Page"/></para></listitem>
      <listitem><para>FAQs: <link xlink:href="http://brlcad.org/wiki/FAQ"/></para></listitem>
      <listitem><para>Online documentation resources: <link xlink:href="http://brlcad.org/wiki/Documentation"/></para></listitem>
-      <listitem><para>Venerated developers' guide (HACKING File): <link xlink:href="https://github.com/BRL-CAD/brlcad/blob/main/HACKING"/></para></listitem>
+      <listitem><para>Venerated developers' guide (HACKING File): <link xlink:href="http://svn.code.sf.net/p/brlcad/code/brlcad/trunk/HACKING"/></para></listitem>
      <listitem><para>BRL-CAD commands: <link xlink:href="http://brlcad.org/wiki/BRL-CAD_Commands"/></para></listitem>
      <listitem><para>MGED command reference: <link xlink:href="http://brlcad.org/wiki/MGED_Commands"/></para></listitem>
      <listitem><para>BRL-CAD primitives reference: <link xlink:href="http://brlcad.org/wiki/BRL-CAD_Primitives"/></para></listitem>
-      <listitem><para>Git: <link xlink:href="http://brlcad.org/wiki/Git"/></para></listitem>
+      <listitem><para>SVN: <link xlink:href="http://brlcad.org/wiki/SVN"/></para></listitem>
      <listitem><para>BRL-CAD patch submission: <link xlink:href="http://brlcad.org/wiki/Patches"/></para></listitem>
      <listitem><para>Image gallery: <link xlink:href="http://brlcad.org/gallery/"/></para></listitem>
-      <listitem><para>BRL-CAD Github page: <link xlink:href="http://github.com/BRL-CAD/brlcad/"/></para></listitem>
+      <listitem><para>BRL-CAD SourceForge page (since we use SVN for version control): <link xlink:href="http://sourceforge.net/projects/brlcad/"/></para></listitem>
+      <listitem><para>SourceForge registration page (for contributors to submit patches): <link xlink:href="https://sourceforge.net/user/registration"/></para></listitem>
      <listitem><para>Application requirements for Google Summer of Code (GSoC) participants: <link xlink:href="http://brlcad.org/wiki/Google_Summer_of_Code/Application_Guidelines"/></para></listitem>
      <listitem><para>Acceptance requirements for Google Summer of Code (GSoC) participants: <link xlink:href="http://brlcad.org/wiki/Google_Summer_of_Code/Acceptance"/></para></listitem>
      <listitem><para>Behavioral expectations for GSoC participants: <link xlink:href="http://brlcad.org/wiki/Google_Summer_of_Code/Expectations"/></para></listitem>
@@ -2,27 +2,23 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Style sheet for XSLT transformation to manual pages
 if(BRLCAD_EXTRADOCS_MAN)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_MAN)

 # Files for PDF
 if(BRLCAD_EXTRADOCS_PDF)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML, MAN and FO (FO is an intermediate file used in the
@@ -58,10 +54,6 @@ ADD_DOC(devguides_EN html/devguides)
 ADD_DOC(devguides_EN_IMAGES html/devguides/images)
 ADD_DOCBOOK("HTML;PHP;PDF" devguides_EN devguides/en devguides_EN_IMAGES_cp)

-CMAKEFILES(
-  CMakeLists.txt
-  )
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake
@@ -2,12 +2,10 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)
 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Files for PDF products
@@ -15,7 +13,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Style sheet for XSLT transformation to PDF
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-lesson-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-lesson-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML and FO (FO is an intermediate file used in the
@@ -2,19 +2,16 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 if(BRLCAD_EXTRADOCS_PPT)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/presentation.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/presentation.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/presentation.xsl")
 endif(BRLCAD_EXTRADOCS_PPT)

 # Files for PDF products
@@ -22,7 +19,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Style sheet for XSLT transformation to PDF
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-presentation-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-presentation-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML and FO (FO is an intermediate file used in the
@@ -11,15 +11,12 @@ string(REPLACE " " "%20" DOCBOOK_SOURCE_DIR "${CMAKE_SOURCE_DIR}")

 # Common xsl for all outputs
 configure_file(brlcad-common.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/brlcad-common.xsl)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/brlcad-common.xsl")

 # Fonts definition
 configure_file(brlcad-fonts.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/brlcad-fonts.xsl)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/brlcad-fonts.xsl")

 # Wordpress
 configure_file(wordpress.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/wordpress.xsl)
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/wordpress.xsl")

 # Make sure distcheck knows about all files in directory
 set(ignore_files
@@ -2,13 +2,11 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Files for PDF products
@@ -16,7 +14,6 @@ if(BRLCAD_EXTRADOCS_PDF)
  # Style sheet for XSLT transformation to PDF
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-specification-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-specification-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML and FO (FO is an intermediate file used in the
@@ -2,27 +2,23 @@
 if(BRLCAD_EXTRADOCS_HTML)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_HTML)

 if(BRLCAD_EXTRADOCS_PHP)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-xhtml-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PHP)

 # Style sheet for XSLT transformation to manual pages
 if(BRLCAD_EXTRADOCS_MAN)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_MAN)

 # Files for PDF
 if(BRLCAD_EXTRADOCS_PDF)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl.in
    ${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl)
-  DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/../resources/brlcad/brlcad-man-fo-stylesheet.xsl")
 endif(BRLCAD_EXTRADOCS_PDF)

 # For HTML, MAN and FO (FO is an intermediate file used in the
@@ -51,7 +51,7 @@ file thus has scanlines of 3456 pixels.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -110,7 +110,7 @@ database file.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1994-2021 by the United States
+<para>This software is Copyright (c) 1994-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -56,7 +56,7 @@ Optional white space and lines beginning with the comment character
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -79,7 +79,7 @@
  </refsection>

  <refsection xml:id="copyright"><title>COPYRIGHT</title>
-  <para>This software is Copyright (c) 2012-2021 United States Government as
+  <para>This software is Copyright (c) 2012-2020 United States Government as
  represented by the U.S. Army Research Laboratory.</para>
  </refsection>

@@ -97,7 +97,7 @@

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
 <!-- <para><command>asc2g</command>, BRL-CAD and this man page are released under the <emphasis remap='B'>BSD Documentation License (BDL)</emphasis>, a content license similar to the FreeBSD Documentation License allowing flexible modification and redistribution of content.</para> -->
-<para>This software is Copyright (c) 1989-2021 by the United States Government as represented by U.S. Army Research Laboratory.</para>
+<para>This software is Copyright (c) 1989-2020 by the United States Government as represented by U.S. Army Research Laboratory.</para>

 </refsect1>

@@ -199,7 +199,7 @@ benchmark analysis, leaving only the summary file and any
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 2006-2021 United States Government as
+<para>This software is Copyright (c) 2006-2020 United States Government as
 represented by the U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -168,7 +168,7 @@ number of bolts:  3
 <refsection xml:id="copyright"><title>COPYRIGHT</title>

  <para>
-    This software is Copyright (c) 2005-2021 United States Government as
+    This software is Copyright (c) 2005-2020 United States Government as
    represented by the U.S. Army Research Laboratory.
  </para>
 </refsection>
@@ -91,7 +91,7 @@ $ bot_dump  -o <emphasis remap='I'>some_bot_dump.dxf</emphasis>  -t <emphasis re
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 2008-2021 by the United States
+<para>This software is Copyright (c) 2008-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -61,7 +61,7 @@

    <refsect1 xml:id="copyright">
        <title>COPYRIGHT</title>
-        <para>This software is Copyright (c) 2004-2021 United States Government as
+        <para>This software is Copyright (c) 2004-2020 United States Government as
        represented by the U.S. Army Research Laboratory.</para>
    </refsect1>

@@ -90,7 +90,7 @@ creating a program that refers to <emphasis remap='I'>BRL-CAD</emphasis> headers
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 2007-2021 United States Government as
+<para>This software is Copyright (c) 2007-2020 United States Government as
 represented by the U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -399,7 +399,7 @@ a convention for the number of frames/reel exists:</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -93,7 +93,7 @@

  <refsection xml:id="copyright"><title>COPYRIGHT</title>
    <para>
-      This software is Copyright (c) 2016-2021 United States Government as
+      This software is Copyright (c) 2016-2020 United States Government as
      represented by the U.S. Army Rebrlman Laboratory.
    </para>
  </refsection>
@@ -1113,7 +1113,7 @@ depth 52.88mm at (-418.907,-812.8,0) x-2 y1 lvl1 purpose=spall ray
  </refsection>

  <refsection xml:id="copyright"><title>COPYRIGHT</title>
-  <para>This software is Copyright (c) 1984-2021 United States Government as
+  <para>This software is Copyright (c) 1984-2020 United States Government as
  represented by the U.S. Army Research Laboratory.</para>
  </refsection>

@@ -136,7 +136,7 @@ with scanlines being written from the bottom to the top of the image.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -58,7 +58,7 @@ is given.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -83,7 +83,7 @@ pixels wide</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1998-2021 by the United States
+<para>This software is Copyright (c) 1998-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -99,7 +99,7 @@ on an 8.5 x 11 inch page.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -74,7 +74,7 @@ interpolation is done by this program.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -109,7 +109,7 @@ gencolor 107 93 70 | bwdiff -e <emphasis remap='I'>file.pix</emphasis> - | pix-f
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -124,7 +124,7 @@ flag displays the max and minimum values and the kernel information on standard
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -57,7 +57,7 @@ flag will output the histogram values on the terminal.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -54,7 +54,7 @@ flag will output the old and new histogram values on the terminal.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -165,7 +165,7 @@ above get higher.  A <replaceable>file.bw</replaceable> for this example can be
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -89,7 +89,7 @@ so that shell scripts, etc., could use this.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -97,7 +97,7 @@ algorithms could remedy this.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -101,7 +101,7 @@ Optional cubic interpolation would be nice.</para>
  </refsection>

  <refsection xml:id="copyright"><title>COPYRIGHT</title>
-  <para>This software is Copyright (c) 1984-2021 United States Government as
+  <para>This software is Copyright (c) 1984-2020 United States Government as
  represented by the U.S. Army Research Laboratory.</para>
  </refsection>

@@ -75,7 +75,7 @@ factor, incorrect and bizarre output is generated.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -72,7 +72,7 @@ file sufficient.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -82,7 +82,7 @@ pixel_out = 255</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -202,7 +202,7 @@ is produced.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>

 </refsect1>
@@ -110,7 +110,7 @@ of a degenerate polygon.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>

 </refsect1>
@@ -252,7 +252,7 @@ This avoids wasting paper (printing an image using incorrect dimensions).</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1992-2021 by the United States
+<para>This software is Copyright (c) 1992-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>

 </refsect1>
@@ -180,7 +180,7 @@
 <refsection xml:id="copyright"><title>COPYRIGHT</title>

  <para>
-    This software is Copyright (c) 2009-2021 United States Government as
+    This software is Copyright (c) 2009-2020 United States Government as
    represented by the U.S. Army Research Laboratory.
  </para>
 </refsection>
@@ -93,7 +93,7 @@ input may produce amusing results.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -55,7 +55,7 @@ by suitably modifying the source code to the converter.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -73,7 +73,7 @@ edited by D. F. Rogers, R. A. Earnshaw, Springer-Verlag, 1990</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -166,7 +166,7 @@
  </refsection>

  <refsection xml:id="copyright"><title>COPYRIGHT</title>
-  <para>This software is Copyright (c) 1984-2021 United States Government as
+  <para>This software is Copyright (c) 1984-2020 United States Government as
  represented by the U.S. Army Research Laboratory.</para>
  </refsection>

@@ -80,7 +80,7 @@ packages instead.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 United States Government as
+<para>This software is Copyright (c) 1991-2020 United States Government as
 represented by the U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -84,7 +84,7 @@ Chase Manhattan Building, New York, NY)</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1993-2021 by the United States
+<para>This software is Copyright (c) 1993-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -67,7 +67,7 @@ Descriptive messages are printed on standard error (file descriptor 2).</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 2006-2021 by the United States
+<para>This software is Copyright (c) 2006-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -66,7 +66,7 @@ format file, use a value of 3 for
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1992-2021 by the United States
+<para>This software is Copyright (c) 1992-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -42,7 +42,7 @@ Standard input is read if a file name is not supplied.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -147,7 +147,7 @@ $ dxf-g <emphasis remap='I'>sample.dxf sample.g</emphasis>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1993-2021 by the United States
+<para>This software is Copyright (c) 1993-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -72,7 +72,7 @@ $ enf-g <emphasis remap='I'>sample.enf sample.g</emphasis>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 2001-2021 by the United States
+<para>This software is Copyright (c) 2001-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -140,7 +140,7 @@ April 1994</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1994-2021 by the United States
+<para>This software is Copyright (c) 1994-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -84,7 +84,7 @@ and
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -50,7 +50,7 @@ flag sets verbose mode.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -80,7 +80,7 @@ output file.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -93,7 +93,7 @@ is the default).</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1998-2021 by the United States
+<para>This software is Copyright (c) 1998-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -93,7 +93,7 @@ sets both the height and width to the size given.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1988-2021 by the United States
+<para>This software is Copyright (c) 1988-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -81,7 +81,7 @@ options can be used to set the size of the output frame buffer.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1986-2021 by the United States
+<para>This software is Copyright (c) 1986-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -143,7 +143,7 @@ and 18% neutral grey, respectively.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1986-2021 by the United States
+<para>This software is Copyright (c) 1986-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -125,7 +125,7 @@ exits the program.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -671,7 +671,7 @@ for the length of the macro startup file.</para>
 </refsect1>

 <refsect1 xml:id='copyright'><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1986-2021 by the United States
+<para>This software is Copyright (c) 1986-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsect1>

@@ -149,7 +149,7 @@ Gary S. Moss, BRL/VLD-VMB</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>

 </refsection>
@@ -77,7 +77,7 @@ option specifies both the height and width of the frame to be drawn.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1989-2021 by the United States
+<para>This software is Copyright (c) 1989-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

@@ -45,7 +45,7 @@ on, e.g., Sun and SGI frame buffers.</para>
 </refsection>

 <refsection xml:id="copyright"><title>COPYRIGHT</title>
-<para>This software is Copyright (c) 1991-2021 by the United States
+<para>This software is Copyright (c) 1991-2020 by the United States
 Government as represented by U.S. Army Research Laboratory.</para>
 </refsection>

--- a/Show More
+++ b/Show More