Keyword heritage is renamed to fossil.

 Changes to be committed:
	modified:   lib/libcommand_show.sh
	modified:   lib/libdatabase_query.sh
	modified:   lib/libmain.sh
	modified:   lib/main/libcommand.sh
	modified:   lib/main/libusage.sh
	modified:   man/portsreinstall.8

diff --git a/lib/libcommand_show.sh b/lib/libcommand_show.sh
index fbf6db1..d14fe77 100644 (file)
--- a/lib/libcommand_show.sh
+++ b/lib/libcommand_show.sh
@@ -17,7 +17,7 @@ command_show ()
        [ -n "$COMMAND_SHOW_LEVEL" ] || COMMAND_SHOW_LEVEL=`options_get_dependency_level`
        dbsuffix=$COMMAND_SHOW_DEPTAG.$COMMAND_SHOW_LEVEL
        case $COMMAND_SHOW_SUBJECT in
-       todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | deleted | restored | heritage |conflict )
+       todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | deleted | restored | fossil |conflict )
                database_query_show_single_list_exec "$COMMAND_SHOW_SUBJECT" \
                        "$COMMAND_SHOW_DEPTAG" "$COMMAND_SHOW_LEVEL" || :
                ;;

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 8ec6cce..8e22ca4 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -96,10 +96,10 @@ database_query_show_list_failed_conflicts_restoration ()
 }
 
 # ============= Show installed ports which have been neither upgraded or reinstalled from the initial state =============
-database_query_show_list_heritage ()
+database_query_show_list_fossil ()
 {
        local srclist origin pkg
-       srclist=`ls "${DBDIR}"/fossil_pkgs/heritage_since_* | head -n 1`
+       srclist=`ls "${DBDIR}"/fossil_pkgs/fossil_since_* | head -n 1`
        [ -e "$srclist" ] || return 0
        while read origin
        do
@@ -639,10 +639,10 @@ database_query_show_single_list_exec ()
                database_query_show_list_failure
                return
                ;;
-       heritage )
+       fossil )
                message_echo "The following ports are neither upgraded or reinstalled from the initial state:"
                message_echo
-               database_query_show_list_heritage
+               database_query_show_list_fossil
                return
                ;;
        conflict )

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 9839337..8260ebe 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ 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_20180823215600
+       MYVERSION=4.0.0+toward_4.1.0_20180823234307
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
@@ -325,18 +325,18 @@ main_collect_all_installed_packages ()
        PROGRAM_DEPENDS=''
        _program_exec_and_record_completion__operation ()
        {
-               local heritage_path
+               local fossil_path
                message_section_title "Collecting all installed packages"
                mkdir -p "${DBDIR}/fossil_pkgs"
-               heritage_path=${DBDIR}/fossil_pkgs/heritage_since_`pkgsys_get_timestamp_portstree`
-               if [ ! -e "$heritage_path" ]
+               fossil_path=${DBDIR}/fossil_pkgs/fossil_since_`pkgsys_get_timestamp_portstree`
+               if [ ! -e "$fossil_path" ]
                then
-                       pkg_info_all_flavored_origins > $heritage_path.tmp
-                       mv "$heritage_path.tmp" "$heritage_path"
+                       pkg_info_all_flavored_origins > $fossil_path.tmp
+                       mv "$fossil_path.tmp" "$fossil_path"
                fi
                if [ ! -e "${DBDIR}/installed_ports" ]
                then
-                       cp "$heritage_path" "${DBDIR}/installed_ports.tmp"
+                       cp "$fossil_path" "${DBDIR}/installed_ports.tmp"
                        mv "${DBDIR}/installed_ports.tmp" "${DBDIR}/installed_ports"
                fi
                pkgsys_gen_init_pkg_origin_table

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index 4bfcb64..ad5b401 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -201,7 +201,7 @@ command_all_parse_args ()
                ;;
        show )
                case $COMMAND_SHOW_SUBJECT in
-               todo | done | redo | resolved | failure | deleted | restored | heritage | conflict | leaves | obsolete )
+               todo | done | redo | resolved | failure | deleted | restored | fossil | conflict | leaves | obsolete )
                        database_query_chk_preparation_completion;;
                esac
                temp_warn_obsolete_temp_db >&2
@@ -234,7 +234,7 @@ command_all_parse_args ()
                        shift || :
                fi
                case $COMMAND_SHOW_SUBJECT in
-               todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | restored | deleted | heritage | conflict )
+               todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | restored | deleted | fossil | conflict )
                        _command_parse_args__chk_no_arg $#
                        ;;
                leaves | obsolete )

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 1dd3d64..eb5e579 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -81,7 +81,7 @@ USAGE: portsreinstall [OPTIONS] [--] [command]
           | glob globs... | pkg globs... | options
           | show todo | show done | show resolved | show inst_by_pkg | show failure | show redo
           | show taboo | show need | show noneed | show restored | show deleted
-          | show heritage | show conflict
+          | show fossil | show conflict
           | show build_conflict_pkgs | show inst_conflict_pkgs
           | show leaves [selected | unselected] | show obsolete [selected | unselected]
           | show requirements glob... | show dependents glob...

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 24b2aae..5cfbf43 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -303,7 +303,7 @@ With \fB\-a\fR option, the first and second columns denote the flavored origin a
 Leaf, obsolete or unneeded ports are to be or have been deleted.
 With \fB\-a\fR option, the first and second columns denote the flavored origin and initial/new/current package name, respectively.
 .TP
-\fBheritage\fR
+\fBfossil\fR
 Installed ports which have not been either upgraded or reinstalled since the initial state.
 With \fB\-a\fR option, the first and second columns denote the flavored origin and package name, respectively.
 .TP
@@ -353,7 +353,7 @@ In other words, if something is outputted, the port Makefile can have some defec
 .TP
 \fBstatus\fR \fIglob1\fR [\fIglob2\fR ...]
 Current success/failure status in (re)installation of matching ports/packages.
-Returned values are null, "todo", "done", "resolved", "inst_by_pkg", "failure", "redo", "taboo", "freeze", "need", "noneed", "restored", "deleted", "heritage", or "conflict",  where null means that they are untouched in the current option configuration or temporary reset due to configuration changes. 
+Returned values are null, "todo", "done", "resolved", "inst_by_pkg", "failure", "redo", "taboo", "freeze", "need", "noneed", "restored", "deleted", "fossil", or "conflict",  where null means that they are untouched in the current option configuration or temporary reset due to configuration changes. 
 .TP
        \fBerrormessage\fR \fIglob1\fR [\fIglob2\fR ...]
 Error message in (re)installation of matching ports/packages.
@@ -1143,7 +1143,7 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [NEW] \fBauto\fR and \fBdestroy\fR commands are added to \fBportsreinstall\-chroot\fR(8).
 .PP
-[NEW] \fBpkg\fR, \fBmake\fR, \fBshow build_conflict_pkgs\fR, \fBshow inst_conflict_pkgs\fR, \fBshow errormessage\fR, \fBshow inst_by_pkg\fR, \fBshow heritage\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
+[NEW] \fBpkg\fR, \fBmake\fR, \fBshow build_conflict_pkgs\fR, \fBshow inst_conflict_pkgs\fR, \fBshow errormessage\fR, \fBshow inst_by_pkg\fR, \fBshow fossil\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
 .PP
 [NEW] Command \fBshow status\fR newly supports \fBinst_by_pkg\fR.
 .PP