Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sysutils/lnav/patches/patch-src_data__parser.hh Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-src_data__parser.hh,v 1.1 2015/09/05 22:12:04 wiz Exp $
Remove unused variables.
--- src/data_parser.hh.orig 2015-03-31 13:30:23.000000000 +0000
+++ src/data_parser.hh
@@ -437,8 +437,6 @@ private:
}
if (iter->e_token == this->dp_format->df_terminator) {
- std::vector<element> key_copy;
-
value.SPLICE(value.end(),
key_comps,
key_comps.begin(),
@@ -480,8 +478,6 @@ private:
}
else if (key_iter->e_token ==
this->dp_format->df_terminator) {
- std::vector<element> key_copy;
-
value.SPLICE(value.end(),
key_comps,
key_comps.begin(),

14
sysutils/lnav/patches/patch-src_grep__proc.cc Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-src_grep__proc.cc,v 1.1 2015/09/05 22:12:04 wiz Exp $
stdout is not an lvalue, and if it was, this looks idempotent.
--- src/grep_proc.cc.orig 2015-04-09 03:40:09.000000000 +0000
+++ src/grep_proc.cc
@@ -159,7 +159,6 @@ void grep_proc::child_loop(void)
char outbuf[BUFSIZ * 2];
string line_value;
- stdout = fdopen(STDOUT_FILENO, "w");
/* Make sure buffering is on, not sure of the state in the parent. */
if (setvbuf(stdout, outbuf, _IOFBF, BUFSIZ * 2) < 0) {
perror("setvbuf");

27
sysutils/lnav/patches/patch-src_log__format.hh Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-src_log__format.hh,v 1.1 2015/09/05 22:12:04 wiz Exp $
To avoid this error on NetBSD:
In file included from logfile.hh:47:0,
from logfile.cc:47:
log_format.hh: In member function 'const string logline_value::to_string() const':
log_format.hh:411:50: error: expected ')' before 'PRId64'
snprintf(buffer, sizeof(buffer), "%" PRId64, this->lv_number.i);
^
log_format.hh:411:75: warning: spurious trailing '%' in format [-Wformat=]
snprintf(buffer, sizeof(buffer), "%" PRId64, this->lv_number.i);
^
log_format.hh:411:75: warning: too many arguments for format [-Wformat-extra-args]
log_format.hh:411:75: warning: spurious trailing '%' in format [-Wformat=]
log_format.hh:411:75: warning: too many arguments for format [-Wformat-extra-args]
--- src/log_format.hh.orig 2015-04-11 05:56:05.000000000 +0000
+++ src/log_format.hh
@@ -408,7 +408,7 @@ public:
}
case VALUE_INTEGER:
- snprintf(buffer, sizeof(buffer), "%" PRId64, this->lv_number.i);
+ snprintf(buffer, sizeof(buffer), "%ld", this->lv_number.i);
break;
case VALUE_FLOAT:

19
sysutils/lnav/patches/patch-src_pretty__printer.hh Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-src_pretty__printer.hh,v 1.1 2015/09/05 22:12:04 wiz Exp $
Avoid name conflict with included header.
--- src/pretty_printer.hh.orig 2015-04-11 02:51:00.000000000 +0000
+++ src/pretty_printer.hh
@@ -171,10 +171,10 @@ private:
void ascend() {
if (this->pp_depth > 0) {
- int lines = this->pp_body_lines.top();
+ int clines = this->pp_body_lines.top();
this->pp_depth -= 1;
this->pp_body_lines.pop();
- this->pp_body_lines.top() += lines;
+ this->pp_body_lines.top() += clines;
}
else {
this->pp_body_lines.top() = 0;

15
sysutils/lnav/patches/patch-src_test__override.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_test__override.c,v 1.1 2015/09/05 22:12:04 wiz Exp $
Match NetBSD version of gettimeofday().
--- src/test_override.c.orig 2015-04-04 10:42:12.000000000 +0000
+++ src/test_override.c
@@ -47,7 +47,7 @@ time_t time(time_t *loc)
return retval;
}
-int gettimeofday(struct timeval *tv, struct timezone *tz)
+int gettimeofday(struct timeval *tv, void *tz)
{
tv->tv_sec = 1370546000;
tv->tv_usec = 123456;