From 6238a1e748226b75a826bf4effe9cee398498949 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 23 Jan 2020 18:10:55 +0000 Subject: [PATCH] update to 0.3.3; fixes aggressive malloc settings as well which were found by mlarkin@ and tedu@ --- sysutils/colortail/Makefile | 11 +++--- sysutils/colortail/distinfo | 4 +-- .../colortail/patches/patch-CfgFileParser_cc | 18 ---------- .../colortail/patches/patch-CfgFileParser_h | 14 -------- sysutils/colortail/patches/patch-ColorTail_cc | 20 ----------- sysutils/colortail/patches/patch-Colorizer_cc | 16 --------- sysutils/colortail/patches/patch-Info_cc | 17 ---------- .../colortail/patches/patch-OptionsParser_cc | 23 ------------- sysutils/colortail/patches/patch-TailFile_cc | 34 ++++++------------- sysutils/colortail/patches/patch-TailFile_h | 15 -------- sysutils/colortail/patches/patch-Usage_cc | 14 -------- sysutils/colortail/patches/patch-main_cc | 13 ------- 12 files changed, 19 insertions(+), 180 deletions(-) delete mode 100644 sysutils/colortail/patches/patch-CfgFileParser_cc delete mode 100644 sysutils/colortail/patches/patch-CfgFileParser_h delete mode 100644 sysutils/colortail/patches/patch-ColorTail_cc delete mode 100644 sysutils/colortail/patches/patch-Colorizer_cc delete mode 100644 sysutils/colortail/patches/patch-Info_cc delete mode 100644 sysutils/colortail/patches/patch-OptionsParser_cc delete mode 100644 sysutils/colortail/patches/patch-TailFile_h delete mode 100644 sysutils/colortail/patches/patch-Usage_cc delete mode 100644 sysutils/colortail/patches/patch-main_cc diff --git a/sysutils/colortail/Makefile b/sysutils/colortail/Makefile index 9af8ab7e860..5398b7901b7 100644 --- a/sysutils/colortail/Makefile +++ b/sysutils/colortail/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.19 2019/07/12 20:49:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.20 2020/01/23 18:10:55 robert Exp $ COMMENT= color-able replacement for tail(1) -DISTNAME= colortail-0.3.0 +GH_ACCOUNT= joakim666 +GH_PROJECT= colortail +GH_TAGNAME= 0.3.3 + CATEGORIES= sysutils -REVISION = 5 MASTER_SITES= http://keyserver.kjsl.com/~jharris/distfiles/ MAINTAINER= Robert Nagy @@ -16,7 +18,8 @@ WANTLIB= c m ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc -CONFIGURE_STYLE= gnu +AUTOCONF_VERSION= 2.61 +CONFIGURE_STYLE= autoreconf post-install: ${INSTALL_MAN} ${FILESDIR}/colortail.1 ${PREFIX}/man/man1 diff --git a/sysutils/colortail/distinfo b/sysutils/colortail/distinfo index 53d6b86e119..c1aabbe9c0c 100644 --- a/sysutils/colortail/distinfo +++ b/sysutils/colortail/distinfo @@ -1,2 +1,2 @@ -SHA256 (colortail-0.3.0.tar.gz) = uI4Yp5hDZhaRhIeZfXsarU/67KxP/WK6OIXoQPFibhs= -SIZE (colortail-0.3.0.tar.gz) = 54329 +SHA256 (colortail-0.3.3.tar.gz) = A+shWK06ifgEDveGYsX6q9UDxZjeEMoEYcvNCaCgx84= +SIZE (colortail-0.3.3.tar.gz) = 51661 diff --git a/sysutils/colortail/patches/patch-CfgFileParser_cc b/sysutils/colortail/patches/patch-CfgFileParser_cc deleted file mode 100644 index 43796666496..00000000000 --- a/sysutils/colortail/patches/patch-CfgFileParser_cc +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-CfgFileParser_cc,v 1.2 2017/04/23 22:18:32 sthen Exp $ ---- CfgFileParser.cc.orig Tue Aug 3 20:40:44 1999 -+++ CfgFileParser.cc Sun Apr 23 23:04:48 2017 -@@ -20,11 +20,12 @@ - #include "CfgFileParser.h" - - #include --#include -+#include - #include - #include --#include -+#include - -+using namespace std; - - // ## class SearchData ## - diff --git a/sysutils/colortail/patches/patch-CfgFileParser_h b/sysutils/colortail/patches/patch-CfgFileParser_h deleted file mode 100644 index 8142f1a1f54..00000000000 --- a/sysutils/colortail/patches/patch-CfgFileParser_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-CfgFileParser_h,v 1.1 2017/04/23 22:18:32 sthen Exp $ ---- CfgFileParser.h.orig Sun Apr 23 23:00:41 2017 -+++ CfgFileParser.h Sun Apr 23 23:01:48 2017 -@@ -25,7 +25,9 @@ - - #include - #include --#include -+#include -+ -+using namespace std; - - #ifdef HAVE_GNUREGEX_H - # include diff --git a/sysutils/colortail/patches/patch-ColorTail_cc b/sysutils/colortail/patches/patch-ColorTail_cc deleted file mode 100644 index 06532c83b9b..00000000000 --- a/sysutils/colortail/patches/patch-ColorTail_cc +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-ColorTail_cc,v 1.1 2017/04/23 22:18:32 sthen Exp $ ---- ColorTail.cc.orig Sun Apr 23 23:03:51 2017 -+++ ColorTail.cc Sun Apr 23 23:04:43 2017 -@@ -17,7 +17,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include - #include - #include - -@@ -26,6 +26,7 @@ - #include "OptionsParser.h" - #include "Colorizer.h" - -+using namespace std; - - // the constructor - ColorTail::ColorTail() diff --git a/sysutils/colortail/patches/patch-Colorizer_cc b/sysutils/colortail/patches/patch-Colorizer_cc deleted file mode 100644 index b040a96e737..00000000000 --- a/sysutils/colortail/patches/patch-Colorizer_cc +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-Colorizer_cc,v 1.4 2018/12/01 00:15:36 naddy Exp $ -Index: Colorizer.cc ---- Colorizer.cc.orig -+++ Colorizer.cc -@@ -23,8 +23,10 @@ - - #include - #include --#include -+#include -+#include - -+using namespace std; - - Colorizer::Colorizer() - { diff --git a/sysutils/colortail/patches/patch-Info_cc b/sysutils/colortail/patches/patch-Info_cc deleted file mode 100644 index 62b71cb9862..00000000000 --- a/sysutils/colortail/patches/patch-Info_cc +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-Info_cc,v 1.1 2017/04/23 22:18:32 sthen Exp $ ---- Info.cc.orig Sun Apr 23 23:03:51 2017 -+++ Info.cc Sun Apr 23 23:04:37 2017 -@@ -17,10 +17,12 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include - - #include "Info.h" - #include "config.h" -+ -+using namespace std; - - Info::Info() - { diff --git a/sysutils/colortail/patches/patch-OptionsParser_cc b/sysutils/colortail/patches/patch-OptionsParser_cc deleted file mode 100644 index 8a0efef43a5..00000000000 --- a/sysutils/colortail/patches/patch-OptionsParser_cc +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-OptionsParser_cc,v 1.3 2017/04/23 22:18:32 sthen Exp $ ---- OptionsParser.cc.orig Thu Aug 5 00:23:39 1999 -+++ OptionsParser.cc Sun Apr 23 23:12:41 2017 -@@ -17,8 +17,8 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include --#include -+#include -+#include - #include - #include - #include -@@ -26,6 +26,8 @@ - #include "OptionsParser.h" - #include "Info.h" - #include "Usage.h" -+ -+using namespace std; - - // methods for class Options - diff --git a/sysutils/colortail/patches/patch-TailFile_cc b/sysutils/colortail/patches/patch-TailFile_cc index 99a4ee91610..e815cafb26d 100644 --- a/sysutils/colortail/patches/patch-TailFile_cc +++ b/sysutils/colortail/patches/patch-TailFile_cc @@ -1,31 +1,17 @@ -$OpenBSD: patch-TailFile_cc,v 1.3 2017/04/23 22:18:32 sthen Exp $ ---- TailFile.cc.orig Thu Aug 5 00:09:38 1999 -+++ TailFile.cc Sun Apr 23 23:04:29 2017 -@@ -17,7 +17,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include - #include - #include - #include -@@ -25,6 +25,8 @@ - - #include "TailFile.h" - -+using namespace std; -+ - TailFile::TailFile() - { - m_filename = NULL; -@@ -417,6 +419,9 @@ void TailFile::follow_print(int n, int verbose, char * +$OpenBSD: patch-TailFile_cc,v 1.4 2020/01/23 18:10:55 robert Exp $ + +Index: TailFile.cc +--- TailFile.cc.orig ++++ TailFile.cc +@@ -352,7 +352,10 @@ void TailFile::follow_print(int n, int verbose, char * int ch = fgetc(m_file); // add the character to the string +- m_follow_buffer->put(ch); + if (ch == EOF) -+ clearerr(m_file); // required by POSIX and ANSI ++ clearerr(m_file); // required by POSIX and ANSI + else - m_follow_buffer->put(ch); ++ m_follow_buffer->put(ch); // check if return + if (ch == '\n') diff --git a/sysutils/colortail/patches/patch-TailFile_h b/sysutils/colortail/patches/patch-TailFile_h deleted file mode 100644 index 861dcf9eaf3..00000000000 --- a/sysutils/colortail/patches/patch-TailFile_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-TailFile_h,v 1.3 2017/04/23 22:18:32 sthen Exp $ ---- TailFile.h.orig Tue Aug 3 20:42:33 1999 -+++ TailFile.h Sun Apr 23 23:15:08 2017 -@@ -23,7 +23,10 @@ - #include "Colorizer.h" - - #include --#include -+#include -+#include -+ -+using namespace std; - - #define MAX_CHARS_READ 1024 - diff --git a/sysutils/colortail/patches/patch-Usage_cc b/sysutils/colortail/patches/patch-Usage_cc deleted file mode 100644 index 20d3646e183..00000000000 --- a/sysutils/colortail/patches/patch-Usage_cc +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-Usage_cc,v 1.1 2017/04/23 22:18:32 sthen Exp $ ---- Usage.cc.orig Sun Apr 23 23:03:51 2017 -+++ Usage.cc Sun Apr 23 23:04:23 2017 -@@ -17,7 +17,9 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include -+ -+using namespace std; - - #include "Usage.h" - diff --git a/sysutils/colortail/patches/patch-main_cc b/sysutils/colortail/patches/patch-main_cc deleted file mode 100644 index 76b7a4267fc..00000000000 --- a/sysutils/colortail/patches/patch-main_cc +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-main_cc,v 1.1 2018/12/01 00:15:36 naddy Exp $ - -Index: main.cc ---- main.cc.orig -+++ main.cc -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - - #include "main.h"