[IMPROVED] Adapt to the specification change of pkg-create(8) that the default extens...

The version is bumped and the credits are updated.

diff --git a/COPYRIGHT b/COPYRIGHT
index 088e55f..645835a 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 This software is distributed under the following terms of which the
 compilation corresponds to the 2-Clause BSD License:
 
-Copyright 2010-2018 Mamoru Sakaue, MwGhennndo. All rights reserved.
+Copyright 2010-2021 Mamoru Sakaue, MwGhennndo. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

diff --git a/HISTORY b/HISTORY
index 54d113c..8e4f098 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,5 @@
+4.1.1 (?? October 2021)
+[IMPROVED] Adapt to the specification change of pkg-create(8) that the default extension of the package files become "pkg".
 4.1.0 (22 September 2018)
 [NEW] Options -j and -x are added.
 [NEW] Option -J is added to the all utilities.

diff --git a/INSTALL b/INSTALL
index aae9b7b..808650b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 # ========================================================================
 # portsreinstall installation guide
-# Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # ========================================================================
 
  For managements within the port/packages system,

diff --git a/Makefile b/Makefile
index da2dec5..1317e1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # ==============================================================================
 # portsreinstall installation makefile
-# Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # ==============================================================================
 
 PROGNAME=      portsreinstall

diff --git a/README b/README
index ef2e235..17dfdc3 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ================================================================================
  portsreinstall - ports upgrading utility for massive forced reinstallation
-  Version 4.1.0, September 22, 2018
- Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+  Version 4.1.1, October ??, 2021
+ Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 ================================================================================
 
  This software is a ports management tool for FreeBSD designed to be suitable
@@ -12,7 +12,7 @@ very long absence of ports upgrade.
 "portsreinstall -h" and "portsreinstall -H", respectively. The manual page is
 shown by "man portsreinstall". The superuser privilege is required for
 operations by this executable. Entire reinstallation of all installed packages
-starts by execution without argument or options. The process can be interupped
+starts by execution without argument or options. The process can be interrupted
 by CTRL+C at any stages and restarted from there by execution without argument
 or options.
 

diff --git a/bin/portsreinstall b/bin/portsreinstall
index b12c025..6e0b22a 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # ==================================================================================
 # portsreinstall main script
-# Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==================================================================================
 

diff --git a/bin/portsreinstall-chroot b/bin/portsreinstall-chroot
index ea7e023..e79f2b3 100755 (executable)
--- a/bin/portsreinstall-chroot
+++ b/bin/portsreinstall-chroot
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # ==================================================================================
 # portsreinstall chroot main script
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==================================================================================
 

diff --git a/etc/portsreinstall.conf b/etc/portsreinstall.conf
index 45cf243..8cb53f2 100644 (file)
--- a/etc/portsreinstall.conf
+++ b/etc/portsreinstall.conf
@@ -3,7 +3,7 @@
 # Format version 1.3.0 (Sun Jul 15 15:02:00 PHT 2018)
 #   Comments updated at Sun Jul 15 15:02:00 PHT 2018.
 #   Default settings updated at Mon May 27 21:58:12 JST 2013.
-# Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # =======================================================================
 
 #  This file is loaded as an include file for Bourne Shell.

diff --git a/lib/chroot-mount/libcommand.sh b/lib/chroot-mount/libcommand.sh
index edc3b94..4423ae6 100644 (file)
--- a/lib/chroot-mount/libcommand.sh
+++ b/lib/chroot-mount/libcommand.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand.sh for portsreinstall-chroot-mount
 # - Operations of commands as well as check of command line arguments -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libconf.sh b/lib/chroot-mount/libconf.sh
index 8b53cc5..fd1dd2b 100644 (file)
--- a/lib/chroot-mount/libconf.sh
+++ b/lib/chroot-mount/libconf.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libconf.sh for portsreinstall-chroot-mount
 # - Parsing of configuration files -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libdatabase_maintain.sh b/lib/chroot-mount/libdatabase_maintain.sh
index ff4449d..412c29c 100644 (file)
--- a/lib/chroot-mount/libdatabase_maintain.sh
+++ b/lib/chroot-mount/libdatabase_maintain.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libdatabase_maintain.sh for portsreinstall-chroot-mount
 # - Operations for maintaining the temporary database -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libfs.sh b/lib/chroot-mount/libfs.sh
index caf530b..afd4c24 100644 (file)
--- a/lib/chroot-mount/libfs.sh
+++ b/lib/chroot-mount/libfs.sh
@@ -3,7 +3,7 @@
 # portsreinstall-chroot library script
 # Overlay onto lib/libfs.sh for portsreinstall-chroot-mount
 # - File system operations -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libmain.sh b/lib/chroot-mount/libmain.sh
index ab171de..568c827 100644 (file)
--- a/lib/chroot-mount/libmain.sh
+++ b/lib/chroot-mount/libmain.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmain.sh for portsreinstall-chroot-mount
 # - Common functions of main programs -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libmessage.sh b/lib/chroot-mount/libmessage.sh
index 9839e36..b46c712 100644 (file)
--- a/lib/chroot-mount/libmessage.sh
+++ b/lib/chroot-mount/libmessage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmessage.sh for portsreinstall-chroot-mount
 # - Messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/liboptions.sh b/lib/chroot-mount/liboptions.sh
index 5aa0d9b..7e66db9 100644 (file)
--- a/lib/chroot-mount/liboptions.sh
+++ b/lib/chroot-mount/liboptions.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/liboptions.sh for portsreinstall-chroot-mount
 # - Command line options -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libtemp.sh b/lib/chroot-mount/libtemp.sh
index b964333..e1c323c 100644 (file)
--- a/lib/chroot-mount/libtemp.sh
+++ b/lib/chroot-mount/libtemp.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libtemp.sh for portsreinstall-chroot-mount
 # - Temporary directory and signal trapping -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot-mount/libusage.sh b/lib/chroot-mount/libusage.sh
index 7723ffd..ab130da 100644 (file)
--- a/lib/chroot-mount/libusage.sh
+++ b/lib/chroot-mount/libusage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libusage.sh for portsreinstall-chroot-mount
 # - Help messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libcommand.sh b/lib/chroot/libcommand.sh
index 9f7aa33..ee51eed 100644 (file)
--- a/lib/chroot/libcommand.sh
+++ b/lib/chroot/libcommand.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand.sh for portsreinstall-chroot
 # - Operations of commands as well as check of command line arguments -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libcommand_do.sh b/lib/chroot/libcommand_do.sh
index 7022f70..dce60d7 100644 (file)
--- a/lib/chroot/libcommand_do.sh
+++ b/lib/chroot/libcommand_do.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand_do.sh for portsreinstall-chroot
 # - "do" command operation -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libdatabase_maintain.sh b/lib/chroot/libdatabase_maintain.sh
index 86d4236..86340b7 100644 (file)
--- a/lib/chroot/libdatabase_maintain.sh
+++ b/lib/chroot/libdatabase_maintain.sh
@@ -3,7 +3,7 @@
 # portsreinstall-chroot library script
 # Overlay onto lib/libdatabase_maintain.sh for portsreinstall-chroot
 # - Operations on the temporary database -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libfs.sh b/lib/chroot/libfs.sh
index e6f940a..1165f3f 100644 (file)
--- a/lib/chroot/libfs.sh
+++ b/lib/chroot/libfs.sh
@@ -3,7 +3,7 @@
 # portsreinstall-chroot library script
 # Overlay onto lib/libfs.sh for portsreinstall-chroot
 # - File system operations -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libmain.sh b/lib/chroot/libmain.sh
index 56d6855..e1a073d 100644 (file)
--- a/lib/chroot/libmain.sh
+++ b/lib/chroot/libmain.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmain.sh for portsreinstall-chroot
 # - Common functions of main programs -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libmessage.sh b/lib/chroot/libmessage.sh
index 1691243..3f62acb 100644 (file)
--- a/lib/chroot/libmessage.sh
+++ b/lib/chroot/libmessage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmessage.sh for portsreinstall-chroot
 # - Messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/liboptions.sh b/lib/chroot/liboptions.sh
index 16c50bb..7c73343 100644 (file)
--- a/lib/chroot/liboptions.sh
+++ b/lib/chroot/liboptions.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/liboptions.sh for portsreinstall-chroot
 # - Command line options -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/chroot/libusage.sh b/lib/chroot/libusage.sh
index c6189a5..6016034 100644 (file)
--- a/lib/chroot/libusage.sh
+++ b/lib/chroot/libusage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libusage.sh for portsreinstall-chroot
 # - Help messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand.sh b/lib/libcommand.sh
index 3bc375c..8065929 100644 (file)
--- a/lib/libcommand.sh
+++ b/lib/libcommand.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Interface of libraries for operations of commands as well as check of command line arguments -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand_do.sh b/lib/libcommand_do.sh
index d2138d9..044750b 100644 (file)
--- a/lib/libcommand_do.sh
+++ b/lib/libcommand_do.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - "do"/"redo" command operation -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand_flexconf.sh b/lib/libcommand_flexconf.sh
index 27d9697..4113667 100644 (file)
--- a/lib/libcommand_flexconf.sh
+++ b/lib/libcommand_flexconf.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Commands of flexible configuration -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand_forget.sh b/lib/libcommand_forget.sh
index 58f0223..b25afe1 100644 (file)
--- a/lib/libcommand_forget.sh
+++ b/lib/libcommand_forget.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - "forget" command operation -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand_pkgs.sh b/lib/libcommand_pkgs.sh
index 4518b07..d134476 100644 (file)
--- a/lib/libcommand_pkgs.sh
+++ b/lib/libcommand_pkgs.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Commands of ports/packages operations -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libcommand_show.sh b/lib/libcommand_show.sh
index 165ade3..cdf0d61 100644 (file)
--- a/lib/libcommand_show.sh
+++ b/lib/libcommand_show.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - "show" command operation -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libconf.sh b/lib/libconf.sh
index 1e59aa2..d16ceeb 100644 (file)
--- a/lib/libconf.sh
+++ b/lib/libconf.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Parsing of configuration files -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index b8de37a..e814790 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Operations for building the temporary database -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libdatabase_maintain.sh b/lib/libdatabase_maintain.sh
index e3e1762..d4da230 100644 (file)
--- a/lib/libdatabase_maintain.sh
+++ b/lib/libdatabase_maintain.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Operations for maintaining the temporary database -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 4936b4a..b62dbcd 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Operations for queries to the temporary database -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libdatabase_record.sh b/lib/libdatabase_record.sh
index e3e0d21..efef554 100644 (file)
--- a/lib/libdatabase_record.sh
+++ b/lib/libdatabase_record.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Operations for recording operation results to the temporary database -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libdeinstall.sh b/lib/libdeinstall.sh
index 92ea92f..096c7e2 100644 (file)
--- a/lib/libdeinstall.sh
+++ b/lib/libdeinstall.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Deinstallation processes -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libfileedit.sh b/lib/libfileedit.sh
index 8a9892a..6d8a8ef 100644 (file)
--- a/lib/libfileedit.sh
+++ b/lib/libfileedit.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Editing operations on files -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libfs.sh b/lib/libfs.sh
index 391279e..7bfeb0a 100644 (file)
--- a/lib/libfs.sh
+++ b/lib/libfs.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - File system operations -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 32928d7..6018f2d 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Common functions of main programs -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 
@@ -12,8 +12,8 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-#      MYVERSION=4.0.0+toward_4.1.0_20180920105217
-#      COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
+       MYVERSION=4.1.0+toward_4.1.1_20211011024526
+       COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
 # ============= Parse options, arguments and control parameters =============

diff --git a/lib/libmessage.sh b/lib/libmessage.sh
index 84e1304..76d3310 100644 (file)
--- a/lib/libmessage.sh
+++ b/lib/libmessage.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Messages -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libmisc.sh b/lib/libmisc.sh
index e00a6e2..bf83892 100644 (file)
--- a/lib/libmisc.sh
+++ b/lib/libmisc.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Miscellaneous functions -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/liboptions.sh b/lib/liboptions.sh
index 90c84c2..83a1e4a 100644 (file)
--- a/lib/liboptions.sh
+++ b/lib/liboptions.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Interface of libraries for command line options -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 314c2e6..8568f0f 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Wrappers for hiding version differences in the Ports/Packages system -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 
@@ -1396,7 +1396,7 @@ pkgsys_create_backup_pkg ()
        then
                pkgname_ptn=`str_escape_regexp "$pkgname"`
                backup_pkg=`ls "${TMPDIR}"/package.tmp | \
-                       grep -m 1 -E "^${pkgname_ptn}\.(txz|tbz|tgz|tar)$"` || :
+                       grep -m 1 -E "^${pkgname_ptn}\.(txz|tbz|tgz|tar|pkg)$"` || :
        fi
        if [ -z "$backup_pkg" ]
        then
@@ -1483,7 +1483,7 @@ pkgsys_pkgarc_to_pkgname ()
 {
        local pkgfile_path
        pkgfile_path=$1
-       basename "$pkgfile_path" | sed -E 's/\.(txz|tbz|tgz|tar)$//'
+       basename "$pkgfile_path" | sed -E 's/\.(txz|tbz|tgz|tar|pkg)$//'
 }
 
 # ============= Get the file name of an existing package archive for a package name =============
@@ -1497,7 +1497,7 @@ pkgsys_pkgname_to_pkgarc ()
        if [ "x$PKGSYS_USE_PKGNG" = xyes ]
        then
                pkgname_ptn=`str_escape_regexp "$pkgname"`
-               pkgnode=`ls "$pkgdir" 2> /dev/null | grep -m 1 -E "^${pkgname_ptn}\.(txz|tbz|tgz|tar)$"` || :
+               pkgnode=`ls "$pkgdir" 2> /dev/null | grep -m 1 -E "^${pkgname_ptn}\.(txz|tbz|tgz|tar|pkg)$"` || :
        elif [ -e "$pkgdir/$pkgname.tbz" ]
        then
                pkgnode=$pkgname.tbz

diff --git a/lib/libprogram.sh b/lib/libprogram.sh
index 0a5c7a2..31bdb27 100644 (file)
--- a/lib/libprogram.sh
+++ b/lib/libprogram.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Program control -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 2381397..d24eca7 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Reinstallation processes -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libstr.sh b/lib/libstr.sh
index 7989be1..c78e4df 100644 (file)
--- a/lib/libstr.sh
+++ b/lib/libstr.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - String processing -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libtemp.sh b/lib/libtemp.sh
index 05e0e50..acb23c8 100644 (file)
--- a/lib/libtemp.sh
+++ b/lib/libtemp.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Temporary directory and signal trapping -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/libusage.sh b/lib/libusage.sh
index 3f4eacf..595bfa9 100644 (file)
--- a/lib/libusage.sh
+++ b/lib/libusage.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Help messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index dc455d4..a7f621b 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand.sh
 # - Operations of commands as well as check of command line arguments -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/main/libmain.sh b/lib/main/libmain.sh
index 8651f3f..66d4658 100644 (file)
--- a/lib/main/libmain.sh
+++ b/lib/main/libmain.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmain.sh
 # - Common functions of main programs -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/main/liboptions.sh b/lib/main/liboptions.sh
index cc59653..f52172b 100644 (file)
--- a/lib/main/liboptions.sh
+++ b/lib/main/liboptions.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/liboptions.sh
 # - Command line options -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/main/libtemp.sh b/lib/main/libtemp.sh
index 47f2c7c..cee957c 100644 (file)
--- a/lib/main/libtemp.sh
+++ b/lib/main/libtemp.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libtemp.sh
 # - Temporary directory and signal trapping -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 8ef2c67..09b0e97 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Help messages -
-# Copyright (C) 2013-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2013-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/libcommand.sh b/lib/upgrade/libcommand.sh
index 5415dac..a0a2a12 100644 (file)
--- a/lib/upgrade/libcommand.sh
+++ b/lib/upgrade/libcommand.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand.sh for portsreinstall-upgrade
 # - Operations of commands as well as check of command line arguments -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/libcommand_do.sh b/lib/upgrade/libcommand_do.sh
index 29fccd6..49f7845 100644 (file)
--- a/lib/upgrade/libcommand_do.sh
+++ b/lib/upgrade/libcommand_do.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libcommand_do.sh for portsreinstall-upgrade
 # - "do" command operation -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/libmain.sh b/lib/upgrade/libmain.sh
index 81ec759..4b3ce4f 100644 (file)
--- a/lib/upgrade/libmain.sh
+++ b/lib/upgrade/libmain.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmain.sh for portsreinstall-upgrade
 # - Common functions of main programs -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/libmessage.sh b/lib/upgrade/libmessage.sh
index 02c9691..ac33562 100644 (file)
--- a/lib/upgrade/libmessage.sh
+++ b/lib/upgrade/libmessage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libmessage.sh for portsreinstall-upgrade
 # - Messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/liboptions.sh b/lib/upgrade/liboptions.sh
index 9f6a88e..a59909c 100644 (file)
--- a/lib/upgrade/liboptions.sh
+++ b/lib/upgrade/liboptions.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/liboptions.sh for portsreinstall-upgrade
 # - Command line options -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/lib/upgrade/libusage.sh b/lib/upgrade/libusage.sh
index 9c4fd6a..a2afe59 100644 (file)
--- a/lib/upgrade/libusage.sh
+++ b/lib/upgrade/libusage.sh
@@ -3,7 +3,7 @@
 # portsreinstall library script
 # Overlay onto lib/libusage.sh for portsreinstall-upgrade
 # - Help messages -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/libexec/order_dependencies.awk b/libexec/order_dependencies.awk
index 9f68edc..a4bebc9 100755 (executable)
--- a/libexec/order_dependencies.awk
+++ b/libexec/order_dependencies.awk
@@ -2,7 +2,7 @@
 # ==============================================================================
 # portsreinstall library script
 # - Order the dependency of all ports to install/reinstall -
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==============================================================================
 

diff --git a/man/portsreinstall-chroot-mount.8 b/man/portsreinstall-chroot-mount.8
index dfa6ab8..1db74d6 100644 (file)
--- a/man/portsreinstall-chroot-mount.8
+++ b/man/portsreinstall-chroot-mount.8
@@ -1,6 +1,6 @@
 .\" ==================================================================================
 .\" portsreinstall-chroot-mount(8) manual page
-.\" Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+.\" Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
 .TH PORTSREINSTALL\-CHROOT\-MOUNT 8 "22 September 2018" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME

diff --git a/man/portsreinstall-chroot.8 b/man/portsreinstall-chroot.8
index 455c9e6..652f59e 100644 (file)
--- a/man/portsreinstall-chroot.8
+++ b/man/portsreinstall-chroot.8
@@ -1,6 +1,6 @@
 .\" ==================================================================================
 .\" portsreinstall\-chroot(8) manual page
-.\" Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+.\" Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
 .TH PORTSREINSTALL\-CHROOT 8 "22 September 2018" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME

diff --git a/man/portsreinstall-upgrade.8 b/man/portsreinstall-upgrade.8
index 2e9df26..ba8259e 100644 (file)
--- a/man/portsreinstall-upgrade.8
+++ b/man/portsreinstall-upgrade.8
@@ -1,6 +1,6 @@
 .\" ==================================================================================
 .\" portsreinstall-upgrade(8) manual page
-.\" Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+.\" Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
 .TH PORTSREINSTALL\-UPGRADE 8 "22 September 2018" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 13c6651..83aa9c8 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -1,6 +1,6 @@
 .\" ==================================================================================
 .\" portsreinstall(8) manual page
-.\" Copyright (C) 2010-2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+.\" Copyright (C) 2010-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
 .TH PORTSREINSTALL 8 "22 September 2018" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME
@@ -226,7 +226,7 @@ After execution of this command, \fBpackupgrade\fR \fBcreate\fR command will ove
 .TP
 \fBmake\fR \fIglob\fR [\fItarget\fR ...] [\fIarguments\fR ...]
 Execute \fBmake\fR(1) command for ports matching the glob pattern.
-The taget and arguments are passed as they are with the arguments and environment variables customized for each port.
+The target and arguments are passed as they are with the arguments and environment variables customized for each port.
 For flavored ports, the appropriate argument (FLAVOR variable) is automatically set.
 The main purpose of this command is diagnosis and experimental build of unsuccessful ports.
 The result of this command will not be recognized by the (re)installation processes of \fBdo\fR and \fBredo\fR commands.

diff --git a/share/bin/portsreinstall-chroot-mount b/share/bin/portsreinstall-chroot-mount
index a9a664d..c8da2b7 100755 (executable)
--- a/share/bin/portsreinstall-chroot-mount
+++ b/share/bin/portsreinstall-chroot-mount
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # ==================================================================================
 # portsreinstall chroot main script
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==================================================================================
 

diff --git a/share/bin/portsreinstall-upgrade b/share/bin/portsreinstall-upgrade
index 8a3301f..3e2ee09 100644 (file)
--- a/share/bin/portsreinstall-upgrade
+++ b/share/bin/portsreinstall-upgrade
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # ==================================================================================
 # portsreinstall upgrade main script
-# Copyright (C) 2018 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+# Copyright (C) 2018-2021 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # This software is distributed under the 2-Clause BSD License.
 # ==================================================================================