[CHANGED] The default settings in portsreinstall.conf was changed so as to include...

	modified:   portsreinstall
	modified:   portsreinstall.8
	modified:   portsreinstall.8~
	modified:   portsreinstall.conf
	modified:   portsreinstall.conf~
	modified:   portsreinstall~

diff --git a/portsreinstall b/portsreinstall
index 69f2bdf..5e92862 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.1.0+toward_2.1.1_20121215201602
+MYVERSION=2.1.0+toward_2.1.1_20121215202845
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf

diff --git a/portsreinstall.8 b/portsreinstall.8
index f6d1804..bb52343 100644 (file)
--- a/portsreinstall.8
+++ b/portsreinstall.8
@@ -284,6 +284,8 @@ Configuration file of portupgrade(1).
 \fBportsreinstall\fR has been developed as below.
 .TP
 2.1.1 (15 December 2012)
+[CHANGED] The default settings in portsreinstall.conf was changed so as to include a HOLD pattern for bsdpan.
+
 [BUG FIX] There was a problem in evaluating globs patterns of origins.
 .TP
 2.1.0 (10 December 2012)

diff --git a/portsreinstall.8~ b/portsreinstall.8~
index 30b8411..f6d1804 100644 (file)
--- a/portsreinstall.8~
+++ b/portsreinstall.8~
@@ -284,7 +284,7 @@ Configuration file of portupgrade(1).
 \fBportsreinstall\fR has been developed as below.
 .TP
 2.1.1 (15 December 2012)
-[BUG FIX] There was a problem in parsing globs patterns of origins.
+[BUG FIX] There was a problem in evaluating globs patterns of origins.
 .TP
 2.1.0 (10 December 2012)
 [NEW] New generation package (pkgng) is supported.

diff --git a/portsreinstall.conf b/portsreinstall.conf
index d1b3ff2..f3620e0 100644 (file)
--- a/portsreinstall.conf
+++ b/portsreinstall.conf
@@ -1,7 +1,8 @@
 # =======================================================================
 # Configurations for portsreinstall
 # Format version 1.0.0 (Sat Nov 13 22:08:41 JST 2010)
-#   Comments updated at Sun Mar  4 19:08:18 JST 2012.
+#   Comments updated at Sat Dec 15 20:25:31 JST 2012.
+#   Default settings updated at Sat Dec 15 20:25:31 JST 2012.
 # Copyright (C) 2010-2012 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # =======================================================================
 
@@ -42,6 +43,7 @@
 # Packages to be hold
 # SYNTAX: HOLD_PKGS_${id}=${glob_pattern}
 # EXAMPLE:
+#       HOLD_bsdpan=bsdpan-\*
 #       HOLD_001=nvidia-driver-\*
 #       HOLD_aaa=autoconf-\*
 #       HOLD_100a=lang/perl\*
@@ -53,6 +55,8 @@
 #       are processed as usual.
 # CORRESPONDING pkgtools.conf SECTION: HOLD_PKGS and IGNORE_MOVED
 
+HOLD_bsdpan=bsdpan-\*
+
 
 # Packages to be ignored
 # SYNTAX: TABOO_${id}=${glob_pattern}
@@ -61,10 +65,10 @@
 #       TABOO_aaa=autoconf-\*
 #       TABOO_100a=lang/perl\*
 # DESCRIPTION:
-#        Morbid ports which crash or confuse the system MUST be specified
-#       here. Packages listed here are untouched if the origin exists,
-#       and otherwise deleted. Dependencies and dependents of the
-#       specified packages are processed as usual. If you wish to
+#        Morbid or conflicting ports which crash or confuse the system
+#       MUST be specified here. Packages listed here are untouched if the
+#       origin exists, and otherwise deleted. Dependencies and dependents
+#       of the specified packages are processed as usual. If you wish to
 #       preserve any of the specified packages, you MUST additionally
 #       specify them in the HOLD section.
 # CORRESPONDING pkgtools.conf SECTION: (none)

diff --git a/portsreinstall.conf~ b/portsreinstall.conf~
index 3c7672a..54f14de 100644 (file)
--- a/portsreinstall.conf~
+++ b/portsreinstall.conf~
@@ -1,6 +1,7 @@
 # =======================================================================
 # Configurations for portsreinstall
 # Format version 1.0.0 (Sat Nov 13 22:08:41 JST 2010)
+#   Comments updated at Sun Mar  4 19:08:18 JST 2012.
 # Copyright (C) 2010-2012 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 # =======================================================================
 
@@ -41,6 +42,7 @@
 # Packages to be hold
 # SYNTAX: HOLD_PKGS_${id}=${glob_pattern}
 # EXAMPLE:
+#       HOLD_bsdpan=bsdpan-\*
 #       HOLD_001=nvidia-driver-\*
 #       HOLD_aaa=autoconf-\*
 #       HOLD_100a=lang/perl\*
@@ -52,6 +54,8 @@
 #       are processed as usual.
 # CORRESPONDING pkgtools.conf SECTION: HOLD_PKGS and IGNORE_MOVED
 
+HOLD_bsdpan=bsdpan-\*
+
 
 # Packages to be ignored
 # SYNTAX: TABOO_${id}=${glob_pattern}
@@ -60,10 +64,10 @@
 #       TABOO_aaa=autoconf-\*
 #       TABOO_100a=lang/perl\*
 # DESCRIPTION:
-#        Morbid ports which crash or confuse the system MUST be specified
-#       here. Packages listed here are untouched if the origin exists,
-#       and otherwise deleted. Dependencies and dependents of the
-#       specified packages are processed as usual. If you wish to
+#        Morbid or conflicting ports which crash or confuse the system
+#       MUST be specified here. Packages listed here are untouched if the
+#       origin exists, and otherwise deleted. Dependencies and dependents
+#       of the specified packages are processed as usual. If you wish to
 #       preserve any of the specified packages, you MUST additionally
 #       specify them in the HOLD section.
 # CORRESPONDING pkgtools.conf SECTION: (none)

diff --git a/portsreinstall~ b/portsreinstall~
index 413c46f..69f2bdf 100755 (executable)
--- a/portsreinstall~
+++ b/portsreinstall~
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.1.0+toward_2.1.1_20121215200218
+MYVERSION=2.1.0+toward_2.1.1_20121215201602
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf