Version 3.0.5+toward_3.0.6_20140703032438

[BUG FIX] Ports with periods or underscores in their package name, port name or origin was not treated correctly.

	modified:   README
	modified:   bin/portsreinstall
	modified:   lib/libpkgsys.sh
	modified:   man/portsreinstall.8

diff --git a/README b/README
index 4f2b041..8554695 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ================================================================================
  portsreinstall - ports upgrading utility for massive forced reinstallation
-  Version 3.0.6, June 7, 2014
+  Version 3.0.6, July 3, 2014
  Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 ================================================================================
 

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 5a8d743..5b8d0bd 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.6
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.5+toward_3.0.6_20140607194853
+MYVERSION=3.0.5+toward_3.0.6_20140703032438
 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/libpkgsys.sh b/lib/libpkgsys.sh
index 06728a2..2c69640 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -788,7 +788,7 @@ pkgsys_eval_ports_glob ()
                                cut -f 2 "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null
                        } | grep -E "$glob_regexp" 2>&1 || :
                else
-                       if expr "$glob" : '^[a-z][a-zA-Z0-9+-]*[a-zA-Z0-9+]$' > /dev/null 2>&1 && \
+                       if expr "$glob" : '^[a-z][a-zA-Z0-9_.+-]*[a-zA-Z0-9_.+]$' > /dev/null 2>&1 && \
                                [ `expr "$glob" : '.*-[0-9]' 2>&1` -eq 0 ]
                        then
                                glob_regexp2=`expr "$glob_regexp" : '\(.*\)\$$' 2>&1`'-[0-9]'
@@ -805,31 +805,6 @@ pkgsys_eval_ports_glob ()
                                | cut -f 2
                        pkg_info_qoX "$glob_regexp" || :
                fi
-#              if expr "$glob" : '[^/][^/]*\/[^/][^/]*$' > /dev/null 2>&1
-#              then
-#                      grep -E "$glob_regexp" "$origlist" 2>&1 || :
-#                      {
-#                              pkg_info_qoa
-#                              cut -f 2 "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null
-#                      } | grep -E "$glob_regexp" 2>&1 || :
-#              else
-#                      if expr "$glob" : '^[a-z][a-zA-Z0-9+-]*[a-zA-Z0-9+]$' > /dev/null 2>&1 && \
-#                              [ `expr "$glob" : '.*-[0-9]' 2>&1` -eq 0 ]
-#                      then
-#                              glob_regexp2=`expr "$glob_regexp" : '\(.*\)\$$' 2>&1`'-[0-9]'
-#                      else
-#                              glob_regexp2=$glob_regexp
-#                      fi
-#                      grep -n -E "$glob_regexp2" "$pkglist" 2>&1 | cut -d : -f 1 \
-#                              | while read index
-#                      do
-#                              sed -n ${index}p "$origlist"
-#                      done || :
-#                      glob_regexp2=`expr "$glob_regexp" : '\(.*\)\$$' 2>&1`'[[:space:]]'
-#                      { sed -n -E "/$glob_regexp2/p" "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null || :; } \
-#                              | cut -f 2
-#                      pkg_info_qoX "$glob_regexp" || :
-#              fi
        done | sort -u
 }
 
@@ -949,7 +924,7 @@ pkgsys_eval_ports_glob_even_if_nonexistent ()
        glob_pattern=$1
        {
                pkgsys_eval_ports_glob "$glob_pattern" 2> /dev/null || :
-               echo "$glob_pattern" | grep '^[a-z][a-z]*/[a-zA-Z0-9_+-][a-zA-Z0-9_+-]*$' || :
+               echo "$glob_pattern" | grep '^[a-z][a-z]*/[a-zA-Z0-9_.+-][a-zA-Z0-9_.+-]*$' || :
        } | grep -v -e '^$' | sort -u
 }
 

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 6b9a1f1..f365e28 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -2,7 +2,7 @@
 .\" ports reinstall installation guide
 .\" Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
-.TH PORTSREINSTALL 8 "7 June 2014" "FreeBSD" "FreeBSD System Manager's Manual"
+.TH PORTSREINSTALL 8 "3 July 2014" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME
 portsreinstall \- ports upgrading utility for massive forced reinstallation
 .SH SYNOPSIS
@@ -912,7 +912,7 @@ Configuration file of \fBportupgrade\fR(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
-3.0.6 (07 June 2014)
+3.0.6 (03 July 2014)
 .RS
 [BUG FIX] Command \fBprepare\fR was possibly aborted at a port any of whose requirements or dependents is obsolete.
 .PP
@@ -937,6 +937,8 @@ Configuration file of \fBportupgrade\fR(1).
 [BUG FIX] The error message for invalid operation on \fBreselect\fR command was wrong.
 .PP
 [BUG FIX] Selection of leaf packages remained after all of them changed to non-leaves.
+.PP
+[BUG FIX] Ports with periods or underscores in their package name, port name or origin was not treated correctly.
 .RE
 .TP
 3.0.5 (14 December 2013)