Version 3.0.4+toward_3.0.5_20131213035122

[BUG FIX] Execution of reconf command confused the work of -G option.

	modified:   bin/portsreinstall
	modified:   lib/libdatabase_build.sh
	modified:   lib/libdatabase_query.sh
	modified:   lib/libstr.sh
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index d0f3040..f79d897 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.4
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.4+toward_3.0.5_20131206004108
+MYVERSION=3.0.4+toward_3.0.5_20131213035122
 COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index 6c6ae88..991a26e 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -851,7 +851,8 @@ _database_build_reset_a_port_confdb ()
                        do
                                cat "${DBDIR}/$dbtag/$origin/$tabel.all.full" 2> /dev/null || :
                                rm -f "${DBDIR}/$dbtag/$origin/$tabel.run.full" \
-                                       "${DBDIR}/$dbtag/$origin/$tabel.build.full" 2> /dev/null
+                                       "${DBDIR}/$dbtag/$origin/$tabel.build.full" \
+                                       "${DBDIR}/$dbtag/$origin/is_customized" 2> /dev/null
                        done
                done
        } | sort -u >> ${DBDIR}/inspected_ports.update

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 834c4b0..887f9c8 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -216,7 +216,7 @@ database_query_is_default_conf ()
                is_customized=no
                if [ `ls "${DBDIR}/conf/each_port/$origin" 2> /dev/null | wc -l` -gt 0 ]
                then
-                       files=`ls "${DBDIR}/conf/each_port/$origin" | str_cancat_items_for_sentence`
+                       files=`ls "${DBDIR}/conf/each_port/$origin" | sed -E 's/^([^.]+).*/\1/' | str_concat_items_for_sentence`
                        echo "Knobs and miscellaneous customization by $files," >> $tmp_msg
                        is_customized=yes
                fi

diff --git a/lib/libstr.sh b/lib/libstr.sh
index 2c24583..cc532f5 100644 (file)
--- a/lib/libstr.sh
+++ b/lib/libstr.sh
@@ -68,7 +68,7 @@ str_dirpath_to_origin ()
 }
 
 # ============= Concatenate a space/linefeed separated list to a apart of sentence =============
-str_cancat_items_for_sentence ()
+str_concat_items_for_sentence ()
 {
        sed 's/$/,/' | tr '\n' ' ' | sed -E 's/, $//;s/, ([^ ]*)$/ and \1/'
 }

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 9a38308..7ea95a4 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -912,6 +912,8 @@ Configuration file of \fBportupgrade\fR(1).
 3.0.5 (? December 2013)
 .RS
 [IMPROVED] Automatic resolution of duplicated registrations of multiple packages for the same port origin is implemented in \fBpkgsanity\fR command.
+.PP
+[BUG FIX] Execution of \fBreconf\fR command confused the work of \fB\-G\fR option.
 .RE
 .TP
 3.0.4 (16 November 2013)