From 3f6078d003e8c4adbb5158e7fd340d622a69d383 Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Tue, 7 Feb 2017 16:55:15 +0900 Subject: [PATCH] Bumbped the copyright year. [BUG FIX] "Selection of removing leaf ports" might have failed at ports which has not been installed yet and becomes leaves by REPLACE_* tags in the configuration file. Changes to be committed: modified: COPYRIGHT modified: INSTALL modified: Makefile modified: README modified: bin/portsreinstall 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 --- COPYRIGHT | 2 +- INSTALL | 2 +- Makefile | 2 +- README | 4 ++-- bin/portsreinstall | 8 ++++---- lib/libcommand.sh | 2 +- lib/libconf.sh | 2 +- lib/libdatabase_build.sh | 2 +- lib/libdatabase_query.sh | 2 +- lib/libdatabase_record.sh | 2 +- lib/libdeinstall.sh | 4 ++-- lib/libfileedit.sh | 2 +- lib/libmessage.sh | 2 +- lib/libmisc.sh | 2 +- lib/liboptions.sh | 2 +- lib/libpkgsys.sh | 2 +- lib/libprogram.sh | 2 +- lib/libreinstall.sh | 2 +- lib/libstr.sh | 2 +- lib/libtemp.sh | 2 +- lib/libusage.sh | 2 +- man/portsreinstall.8 | 7 ++++++- 22 files changed, 32 insertions(+), 27 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 34d41a8..33a4862 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ This software is distributed under the following terms of which the compilation corresponds to the 2-Clause BSD License: -Copyright 2010-2016 Mamoru Sakaue, MwGhennndo. All rights reserved. +Copyright 2010-2017 Mamoru Sakaue, MwGhennndo. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/INSTALL b/INSTALL index 1a179c9..0bf199d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ # ============================================================================== # portsreinstall installation guide -# Copyright (C) 2010-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # ============================================================================== For managements within the port/packages system, diff --git a/Makefile b/Makefile index d84c13e..3c42d3d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # ============================================================================== # portsreinstall installation makefile -# Copyright (C) 2010-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # ============================================================================== PROGNAME= portsreinstall diff --git a/README b/README index 668aedd..9bfb352 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ================================================================================ portsreinstall - ports upgrading utility for massive forced reinstallation - Version 3.3.1, August 18, 2016 - Copyright (C) 2010-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. + Version 3.3.2, February 7, 2017 + Copyright (C) 2010-2017 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 fae813c..ee3bec5 100755 --- a/bin/portsreinstall +++ b/bin/portsreinstall @@ -1,7 +1,7 @@ #!/bin/sh -e # ================================================================================== # portsreinstall main script -# Copyright (C) 2010-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2010-2017 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.3.1 +MYVERSION=3.3.2 COMPATIBLE_VERSIONS='^(3\.[1-3]\.[0-9]+)$' # Template for development versions -# MYVERSION=3.3.0+toward_3.3.1_20160818131629 -# COMPATIBLE_VERSIONS='^(3\.[1-3]\.[0-9]+\+toward_3\.[1-3]\.[0-9]+_[0-9]+|3\.[1-3]\.[0-9]+)$' +MYVERSION=3.3.1+toward_3.3.2_20170207165450 +COMPATIBLE_VERSIONS='^(3\.[1-3]\.[0-9]+\+toward_3\.[1-3]\.[0-9]+_[0-9]+|3\.[1-3]\.[0-9]+)$' MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'` MYPREFIX=${MYPREFIX:-/usr/local} LIBDIR=${MYPREFIX}/lib/${APPNAME} diff --git a/lib/libcommand.sh b/lib/libcommand.sh index b5d7b2c..9efcfaa 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-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 9247f7c..3a2f413 100644 --- a/lib/libconf.sh +++ b/lib/libconf.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Parsing of configuration files - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 0b83431..3715839 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-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh index 12655dc..de7e8b5 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-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 951c48b..057f495 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-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 72e4775..402fb38 100644 --- a/lib/libdeinstall.sh +++ b/lib/libdeinstall.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Deinstallation processes - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== @@ -19,7 +19,7 @@ deinstall_select_leaf_ports_to_delete_dialog () desc='Unchecked ones are preserved with their requirements.\nCancellation means to preserve all.' while read origin do - pkgtag=`cat "${DBDIR}/requires/$origin/pkgtag"` + pkgtag=`cat "${DBDIR}/requires/$origin/pkgtag" 2> /dev/null` || : val=on grep -q '^'`str_escape_regexp "$origin"`'$' "$dst_unselected" 2> /dev/null && val=off printf '%s\t"(%s)"\t%s\n' "$origin" "$pkgtag" "$val" diff --git a/lib/libfileedit.sh b/lib/libfileedit.sh index b9658ab..7fe20b3 100644 --- a/lib/libfileedit.sh +++ b/lib/libfileedit.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Editing operations on files - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 5102e8c..b3d200a 100644 --- a/lib/libmessage.sh +++ b/lib/libmessage.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Messages - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. # This software is distributed under the 2-Clause BSD License. # ============================================================================== diff --git a/lib/libmisc.sh b/lib/libmisc.sh index 0f7f977..bc4b8aa 100644 --- a/lib/libmisc.sh +++ b/lib/libmisc.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Miscellaneous functions - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 1e753ad..2f88c99 100644 --- a/lib/liboptions.sh +++ b/lib/liboptions.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Command line options - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 b389e3f..a2c3677 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-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 5517a48..c089bce 100644 --- a/lib/libprogram.sh +++ b/lib/libprogram.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Program control - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 428b1ce..9e3d552 100644 --- a/lib/libreinstall.sh +++ b/lib/libreinstall.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Reinstallation processes - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 795761d..f37e83b 100644 --- a/lib/libstr.sh +++ b/lib/libstr.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - String processing - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 e9d4627..77004fd 100644 --- a/lib/libtemp.sh +++ b/lib/libtemp.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Temporary directory and signal trapping - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 ba77d77..181ebb6 100644 --- a/lib/libusage.sh +++ b/lib/libusage.sh @@ -2,7 +2,7 @@ # ============================================================================== # portsreinstall library script # - Help messages - -# Copyright (C) 2013-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +# Copyright (C) 2013-2017 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 9729587..9b1d015 100644 --- a/man/portsreinstall.8 +++ b/man/portsreinstall.8 @@ -1,6 +1,6 @@ .\" ================================================================================== .\" ports reinstall installation guide -.\" Copyright (C) 2010-2016 Mamoru Sakaue, MwGhennndo, All Rights Reserved. +.\" Copyright (C) 2010-2017 Mamoru Sakaue, MwGhennndo, All Rights Reserved. .\" ================================================================================== .TH PORTSREINSTALL 8 "18 August 2016" "FreeBSD" "FreeBSD System Manager's Manual" .SH NAME @@ -939,6 +939,11 @@ Configuration file of \fBportupgrade\fR(1). .SH HISTORY \fBportsreinstall\fR has been developed as below. .TP +3.3.2 (7 February 2017) +.RS +[BUG FIX] "Selection of removing leaf ports" might have failed at ports which has not been installed yet and becomes leaves by REPLACE_* tags in the configuration file. +.RE +.TP 3.3.1 (18 August 2016) .RS [BUG FIX] Detection of the default option configuration was unsuccessful or wrong when /etc/make.conf was configured; some ports caused aborting in the phase of inspection. -- 2.11.0