[107141] trunk/dports/sysutils/pv
larryv at macports.org
larryv at macports.org
Wed Jun 19 09:59:45 PDT 2013
Revision: 107141
https://trac.macports.org/changeset/107141
Author: larryv at macports.org
Date: 2013-06-19 09:59:45 -0700 (Wed, 19 Jun 2013)
Log Message:
-----------
pv: Update to 1.4.6, switch maintainers (maintainer, #39466).
Modified Paths:
--------------
trunk/dports/sysutils/pv/Portfile
trunk/dports/sysutils/pv/files/stat64.diff
Modified: trunk/dports/sysutils/pv/Portfile
===================================================================
--- trunk/dports/sysutils/pv/Portfile 2013-06-19 14:37:04 UTC (rev 107140)
+++ trunk/dports/sysutils/pv/Portfile 2013-06-19 16:59:45 UTC (rev 107141)
@@ -5,10 +5,10 @@
PortGroup muniversal 1.0
name pv
-version 1.3.4
+version 1.4.6
categories sysutils
platforms darwin
-maintainers gmail.com:meissnem
+maintainers me.com:mark.carver
license Apache-2
description monitor the progress of data through a pipe
@@ -25,8 +25,8 @@
use_bzip2 yes
-checksums rmd160 8fa94f1317f191f3e2138d74b7de2e5ff0a1b0d0 \
- sha256 26b031e0a713ee00d956ed75b0c445a8aa614f40289d96f623efc177c1388b84
+checksums rmd160 ecbcc4791acd108bfee09f49280808d1470e37c2 \
+ sha256 edfea0033ec6222eb60b4ec6d905dd2dccdb5900beef03f67f42ca9ed67e9fe2
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info
Modified: trunk/dports/sysutils/pv/files/stat64.diff
===================================================================
--- trunk/dports/sysutils/pv/files/stat64.diff 2013-06-19 14:37:04 UTC (rev 107140)
+++ trunk/dports/sysutils/pv/files/stat64.diff 2013-06-19 16:59:45 UTC (rev 107141)
@@ -1,100 +1,110 @@
---- src/pv/file.c.orig 2012-06-26 04:37:50.000000000 -0500
-+++ src/pv/file.c 2012-07-21 11:18:47.000000000 -0500
-@@ -37,27 +37,27 @@
- */
- void pv_calc_total_size(opts_t opts)
+--- src/pv/file.c 2013-01-22 17:28:24.000000000 -0600
++++ src/pv/file.c 2013-06-19 02:27:43.000000000 -0500
+@@ -33,7 +33,7 @@
+ unsigned long long pv_calc_total_size(pvstate_t state)
{
+ unsigned long long total;
- struct stat64 sb;
+ struct stat sb;
int rc, i, j, fd;
- opts->size = 0;
- rc = 0;
-
- if (opts->argc < 1) {
-- if (fstat64(STDIN_FILENO, &sb) == 0)
-+ if (fstat(STDIN_FILENO, &sb) == 0)
- opts->size = sb.st_size;
- return;
+ total = 0;
+@@ -43,20 +43,20 @@
+ * No files specified - check stdin.
+ */
+ if (state->input_file_count < 1) {
+- if (0 == fstat64(STDIN_FILENO, &sb))
++ if (0 == fstat(STDIN_FILENO, &sb))
+ total = sb.st_size;
+ return total;
}
- for (i = 0; i < opts->argc; i++) {
- if (strcmp(opts->argv[i], "-") == 0) {
+ for (i = 0; i < state->input_file_count; i++) {
+ if (0 == strcmp(state->input_files[i], "-")) {
- rc = fstat64(STDIN_FILENO, &sb);
+ rc = fstat(STDIN_FILENO, &sb);
if (rc != 0) {
- opts->size = 0;
- return;
+ total = 0;
+ return total;
}
} else {
-- rc = stat64(opts->argv[i], &sb);
-+ rc = stat(opts->argv[i], &sb);
- if (rc == 0)
- rc = access(opts->argv[i], R_OK);
+- rc = stat64(state->input_files[i], &sb);
++ rc = stat(state->input_files[i], &sb);
+ if (0 == rc)
+ rc = access(state->input_files[i], R_OK);
}
-@@ -109,14 +109,14 @@
+@@ -112,7 +112,7 @@
+ * and that we can seek back to the start after getting the size.
+ */
+ if (total <= 0) {
+- rc = fstat64(STDOUT_FILENO, &sb);
++ rc = fstat(STDOUT_FILENO, &sb);
+ if ((0 == rc) && S_ISBLK(sb.st_mode)
+ && (0 == (fcntl(STDOUT_FILENO, F_GETFL) & O_APPEND))) {
+ total = lseek64(STDOUT_FILENO, 0, SEEK_END);
+@@ -148,14 +148,14 @@
fd = -1;
- if (strcmp(opts->argv[i], "-") == 0) {
+ if (0 == strcmp(state->input_files[i], "-")) {
- rc = fstat64(STDIN_FILENO, &sb);
+ rc = fstat(STDIN_FILENO, &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
- opts->size = 0;
- return;
+ total = 0;
+ return total;
}
fd = dup(STDIN_FILENO);
} else {
-- rc = stat64(opts->argv[i], &sb);
-+ rc = stat(opts->argv[i], &sb);
+- rc = stat64(state->input_files[i], &sb);
++ rc = stat(state->input_files[i], &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
- opts->size = 0;
- return;
-@@ -167,8 +167,8 @@
+ total = 0;
+ return total;
+@@ -212,8 +212,8 @@
*/
- int pv_next_file(opts_t opts, int filenum, int oldfd)
+ int pv_next_file(pvstate_t state, int filenum, int oldfd)
{
- struct stat64 isb;
- struct stat64 osb;
+ struct stat isb;
+ struct stat osb;
- int fd;
+ int fd, input_file_is_stdout;
if (oldfd > 0) {
-@@ -206,7 +206,7 @@
+@@ -252,7 +252,7 @@
}
}
- if (fstat64(fd, &isb)) {
+ if (fstat(fd, &isb)) {
fprintf(stderr, "%s: %s: %s: %s\n",
- opts->program_name,
+ state->program_name,
_("failed to stat file"),
-@@ -216,7 +216,7 @@
+@@ -262,7 +262,7 @@
return -1;
}
- if (fstat64(STDOUT_FILENO, &osb)) {
+ if (fstat(STDOUT_FILENO, &osb)) {
fprintf(stderr, "%s: %s: %s\n",
- opts->program_name,
+ state->program_name,
_("failed to stat output file"), strerror(errno));
---- src/pv/loop.c.orig 2012-06-26 04:37:50.000000000 -0500
-+++ src/pv/loop.c 2012-07-21 11:18:47.000000000 -0500
-@@ -63,7 +63,7 @@
+--- src/pv/loop.c 2013-01-22 17:28:24.000000000 -0600
++++ src/pv/loop.c 2013-06-19 02:27:43.000000000 -0500
+@@ -50,7 +50,7 @@
struct timeval start_time, next_update, next_ratecheck, cur_time;
- struct timeval init_time;
+ struct timeval init_time, next_remotecheck;
long double elapsed;
- struct stat64 sb;
+ struct stat sb;
int fd, n;
/*
-@@ -111,7 +111,7 @@
- return opts->exit_status;
- }
-
-- if (fstat64(fd, &sb) == 0) {
-+ if (fstat(fd, &sb) == 0) {
- pv_set_buffer_size(sb.st_blksize * 32, 0);
- }
-
+@@ -105,7 +105,7 @@
+ * Set target buffer size if the initial file's block size can be
+ * read and we weren't given a target buffer size.
+ */
+- if (0 == fstat64(fd, &sb)) {
++ if (0 == fstat(fd, &sb)) {
+ unsigned long long sz;
+ sz = sb.st_blksize * 32;
+ if (sz > BUFFER_SIZE_MAX)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130619/97ca7619/attachment.html>
More information about the macports-changes
mailing list