From: Mamoru Sakaue / MwGhennndo Date: Tue, 27 May 2014 02:39:42 +0000 (+0900) Subject: Version 3.0.5+toward_3.0.6_20140527113705 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e2aaf0bc9db1a496746a4085affe6fd4ae39b6b;p=portsreinstall%2Fcurrent.git Version 3.0.5+toward_3.0.6_20140527113705 [BUG FIX] Command prepare may have resulted in aborting at ports any of whose requirements or dependents is obsolete. modified: Makefile modified: README modified: bin/portsreinstall modified: etc/portsreinstall.conf modified: lib/libcommand.sh modified: lib/libconf.sh modified: lib/libdatabase_build.sh modified: lib/libdatabase_query.sh modified: lib/libdatabase_record.sh modified: lib/libdeinstall.sh modified: lib/libfileedit.sh modified: lib/libmessage.sh modified: lib/libmisc.sh modified: lib/liboptions.sh modified: lib/libpkgsys.sh modified: lib/libprogram.sh modified: lib/libreinstall.sh modified: lib/libstr.sh modified: lib/libtemp.sh modified: lib/libusage.sh modified: man/portsreinstall.8 --- diff --git a/Makefile b/Makefile index 3ba1096..2075f56 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # ============================================================================== # portsreinstall installation makefile -# Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # ============================================================================== PROGNAME= portsreinstall diff --git a/README b/README index 9fd88e2..f0f5d46 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ================================================================================ portsreinstall - ports upgrading utility for massive forced reinstallation - Version 3.0.5, December 14, 2013 - Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. + Version 3.0.6, May 27, 2014 + Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. ================================================================================ This software is a ports management tool for FreeBSD designed to be suitable diff --git a/bin/portsreinstall b/bin/portsreinstall index 6fb7775..d4ed120 100755 --- a/bin/portsreinstall +++ b/bin/portsreinstall @@ -1,7 +1,7 @@ #!/bin/sh -e # ================================================================================== # portsreinstall main script -# Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ================================================================================== @@ -12,11 +12,11 @@ # ============ Set up of environment ============= APPNAME=`basename "$0"` -MYVERSION=3.0.5 -COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$' +# MYVERSION=3.0.6 +# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$' # Template for development versions -# MYVERSION=3.0.4+toward_3.0.5_20131213231732 -# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$' +MYVERSION=3.0.5+toward_3.0.6_20140527113705 +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} LIBDIR=${MYPREFIX}/lib/${APPNAME} diff --git a/etc/portsreinstall.conf b/etc/portsreinstall.conf index fbc08ab..77eba4b 100644 --- a/etc/portsreinstall.conf +++ b/etc/portsreinstall.conf @@ -3,7 +3,7 @@ # Format version 1.1.0 (Mon May 27 21:58:12 JST 2013) # Comments updated at Mon May 27 21:58:12 JST 2013. # Default settings updated at Mon May 27 21:58:12 JST 2013. -# Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # ======================================================================= # This file is loaded as an include file for Bourne Shell. diff --git a/lib/libcommand.sh b/lib/libcommand.sh index 777fa71..3f0c5b8 100644 --- a/lib/libcommand.sh +++ b/lib/libcommand.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Operations of commands as well as check of command line arguments - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 5be9c0f..5c47327 100644 --- a/lib/libconf.sh +++ b/lib/libconf.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Parsing of configuration files - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 991a26e..3fcd0f9 100644 --- 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 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== @@ -214,11 +214,13 @@ database_build_setup_initial_node () do origin_requirement=`pkgsys_init_pkg_orig_by_ambiguous_matching "$requirement" || :` [ -n "$origin_requirement" ] && echo "$origin_requirement" + : done > $dbpath/requirements.all.full pkg_info_qR "$pkg" | while read dependent do origin_dependent=`pkgsys_init_pkg_orig_by_ambiguous_matching "$dependent" || :` [ -n "$origin_dependent" ] && echo "$origin_dependent" + : done > $dbpath/dependents.all.full for table in dependents requirements do diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh index 887f9c8..d221096 100644 --- 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 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 fd143ee..1ee8d46 100644 --- 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 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 ff52d01..4c7f76e 100644 --- a/lib/libdeinstall.sh +++ b/lib/libdeinstall.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Deinstallation processes - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 9f199e5..910dfae 100644 --- a/lib/libfileedit.sh +++ b/lib/libfileedit.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Editing operations on files - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== diff --git a/lib/libmessage.sh b/lib/libmessage.sh index 97e68a3..1bf2f15 100644 --- a/lib/libmessage.sh +++ b/lib/libmessage.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Messages - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== @@ -87,7 +87,7 @@ message_credit () fold -s -w $ncolumns << eof -- Ports upgrading utility for massive forced reinstallation -- And for those who are pursuing the perfect packages environment -Copyright (C) 2010 - 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +Copyright (C) 2010 - 2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. Email: Homepage: eof diff --git a/lib/libmisc.sh b/lib/libmisc.sh index a11ceb5..3342490 100644 --- a/lib/libmisc.sh +++ b/lib/libmisc.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Miscellaneous functions - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 d33a45f..81138f5 100644 --- a/lib/liboptions.sh +++ b/lib/liboptions.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Command line options - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 ebd6606..7e022d6 100644 --- 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 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== diff --git a/lib/libprogram.sh b/lib/libprogram.sh index 6e25cdc..1880dae 100644 --- a/lib/libprogram.sh +++ b/lib/libprogram.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Program control - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 d848fb8..b7055e1 100644 --- a/lib/libreinstall.sh +++ b/lib/libreinstall.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Reinstallation processes - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 cc532f5..d71bfa8 100644 --- a/lib/libstr.sh +++ b/lib/libstr.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - String processing - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 a0cfa05..f0e326f 100644 --- a/lib/libtemp.sh +++ b/lib/libtemp.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Temporary directory and signal trapping - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 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 acf3aed..46ea79b 100644 --- a/lib/libusage.sh +++ b/lib/libusage.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Help messages - -# Copyright (C) 2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== diff --git a/man/portsreinstall.8 b/man/portsreinstall.8 index e508833..8efcfb3 100644 --- a/man/portsreinstall.8 +++ b/man/portsreinstall.8 @@ -1,8 +1,8 @@ .\" ================================================================================== .\" ports reinstall installation guide -.\" Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +.\" Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved. .\" ================================================================================== -.TH PORTSREINSTALL 8 "16 November 2013" "FreeBSD" "FreeBSD System Manager's Manual" +.TH PORTSREINSTALL 8 "27 May 2014" "FreeBSD" "FreeBSD System Manager's Manual" .SH NAME portsreinstall \- ports upgrading utility for massive forced reinstallation .SH SYNOPSIS @@ -912,6 +912,10 @@ Configuration file of \fBportupgrade\fR(1). .SH HISTORY \fBportsreinstall\fR has been developed as below. .TP +3.0.6 (27 May 2014) +.RS +[BUG FIX] Command \fBprepare\fR may have resulted in aborting at ports any of whose requirements or dependents is obsolete. +.TP 3.0.5 (14 December 2013) .RS [NEW] Command of \fBrmconf\fR is added. @@ -1316,7 +1320,7 @@ in /etc/make.conf. .SH COPYRIGHT This software is distributed under the 2-Clause BSD License. .PP -(C)\ 2010\-2013\ Mamoru\ Sakaue,\ MwGhennndo,\ All\ Rights\ Reserved. +(C)\ 2010\-2014\ Mamoru\ Sakaue,\ MwGhennndo,\ All\ Rights\ Reserved. .PP Email:\ sakaue.mamoru@samurai.mwghennn.net .PP