cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.3.3; fixes aggressive malloc settings as well which were

Browse Source 
found by mlarkin@ and tedu@
This commit is contained in:
robert 2020-01-23 18:10:55 +00:00
parent 9636e7c222
commit 6238a1e748
12 changed files with 19 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/colortail/Makefile
View File

@ -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 <robert@openbsd.org>
@ -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

4
sysutils/colortail/distinfo
View File

@ -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

18
sysutils/colortail/patches/patch-CfgFileParser_cc
View File

@ -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 <stdio.h>
-#include <fstream.h>
+#include <iostream>
#include <assert.h>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
+using namespace std;
// ## class SearchData ##

14
sysutils/colortail/patches/patch-CfgFileParser_h
View File

@ -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 <sys/types.h>
#include <regex.h>
-#include <fstream.h>
+#include <fstream>
+
+using namespace std;
#ifdef HAVE_GNUREGEX_H
# include <gnuregex.h>

20
sysutils/colortail/patches/patch-ColorTail_cc
View File

@ -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 <iostream.h>
+#include <iostream>
#include <assert.h>
#include <unistd.h>
@@ -26,6 +26,7 @@
#include "OptionsParser.h"
#include "Colorizer.h"
+using namespace std;
// the constructor
ColorTail::ColorTail()

16
sysutils/colortail/patches/patch-Colorizer_cc
View File

@ -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 <assert.h>
#include <stdio.h>
-#include <strstream.h>
+#include <string.h>
+#include <strstream>
+using namespace std;
Colorizer::Colorizer()
{

17
sysutils/colortail/patches/patch-Info_cc
View File

@ -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 <iostream.h>
+#include <iostream>
#include "Info.h"
#include "config.h"
+
+using namespace std;
Info::Info()
{

23
sysutils/colortail/patches/patch-OptionsParser_cc
View File

@ -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 <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -26,6 +26,8 @@
#include "OptionsParser.h"
#include "Info.h"
#include "Usage.h"
+
+using namespace std;
// methods for class Options

34
sysutils/colortail/patches/patch-TailFile_cc
View File

@ -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 <iostream.h>
+#include <iostream>
#include <string.h>
#include <stdio.h>
#include <sys/stat.h>
@@ -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')

15
sysutils/colortail/patches/patch-TailFile_h
View File

@ -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 <stdio.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
+
+using namespace std;
#define MAX_CHARS_READ 1024

14
sysutils/colortail/patches/patch-Usage_cc
View File

@ -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 <iostream.h>
+#include <iostream>
+
+using namespace std;
#include "Usage.h"

13
sysutils/colortail/patches/patch-main_cc
View File

@ -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 <stdio.h>
+#include <stdlib.h>
#include <signal.h>
#include "main.h"