diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2011-01-14 23:03:59 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2011-01-14 23:03:59 +0000 |
| commit | 2299afd558d088ec28d7e685b9bbf5db06b4a08f (patch) | |
| tree | ba7e3bd87d632242ccaf75886f003f79fd048ff6 /sysutils/aimage | |
| parent | TheSchwartz is a reliable job queue system. This perl module can pull (diff) | |
- Unbreak after recent sysutils/afflib update changed some function names in
header files used by aimage
- Fix warnings about passing std::string objects to printf
- Take maintainership
Reported by: pointyhat (via pav)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=267804
Diffstat (limited to 'sysutils/aimage')
| -rw-r--r-- | sysutils/aimage/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/aimage/files/patch-src__gui.cpp | 54 |
2 files changed, 55 insertions, 3 deletions
diff --git a/sysutils/aimage/Makefile b/sysutils/aimage/Makefile index 2bc77b35e1b6..a197a2ace57d 100644 --- a/sysutils/aimage/Makefile +++ b/sysutils/aimage/Makefile @@ -10,13 +10,11 @@ PORTVERSION= 3.2.4 CATEGORIES= sysutils MASTER_SITES= http://afflib.org/downloads/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= glarkin@FreeBSD.org COMMENT= Advanced Disk Imager LIB_DEPENDS= afflib:${PORTSDIR}/sysutils/afflib -BROKEN= does not compile - USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/sysutils/aimage/files/patch-src__gui.cpp b/sysutils/aimage/files/patch-src__gui.cpp new file mode 100644 index 000000000000..5a291f2d3391 --- /dev/null +++ b/sysutils/aimage/files/patch-src__gui.cpp @@ -0,0 +1,54 @@ +--- ./src/gui.cpp.orig 2008-05-24 10:00:14.000000000 -0400 ++++ ./src/gui.cpp 2011-01-11 00:53:39.000000000 -0500 +@@ -282,8 +282,8 @@ + printf("Bytes written: %qd\n",im->callback_bytes_written); + if(acbi) printf("Current phase: %d\n",acbi->phase); + printf("Free space on capture drive: %qd\n",im->output_ident->freebytes()); +- printf("Elapsed Time: %s\n",im->imaging_timer.timer_text()); +- if(fraction_done>0) printf("Done in: %s\n",im->imaging_timer.eta_text(fraction_done)); ++ printf("Elapsed Time: %s\n",im->imaging_timer.elapsed_text().c_str()); ++ if(fraction_done>0) printf("Done in: %s\n",im->imaging_timer.eta_text(fraction_done).c_str()); + printf("\n"); + return; + } +@@ -314,7 +314,7 @@ + * to use curses... + */ + +- mvprintw(time_row,0,"Elapsed Time: %s",im->imaging_timer.timer_text()); ++ mvprintw(time_row,0,"Elapsed Time: %s",im->imaging_timer.elapsed_text().c_str()); + + if(im->imaging){ + attr_on(WA_BOLD,0); +@@ -356,11 +356,11 @@ + + if(opt_use_timers){ + mvprintw(reading_row,0," Time spent reading: %15s ", +- im->read_timer.timer_text()); ++ im->read_timer.elapsed_text().c_str()); + } + if(fraction_done>0){ + mvprintw(done_in_row,0," Done in: %s ", +- im->imaging_timer.eta_text(fraction_done)); ++ im->imaging_timer.eta_text(fraction_done).c_str()); + if(imagers.size()>1){ + printw("(this drive)"); + +@@ -373,7 +373,7 @@ + double total_fraction_done = tsr_ad / ts_ad; + if(total_fraction_done>0 && total_fraction_done<100){ + printw(" %s (all drives)", +- total_time.eta_text(total_fraction_done)); ++ total_time.eta_text(total_fraction_done).c_str()); + } + } + } +@@ -406,7 +406,7 @@ + attr_off(WA_BOLD,0); + + if(opt_use_timers){ +- printw(" (%s)", im->write_timer.timer_text()); ++ printw(" (%s)", im->write_timer.elapsed_text().c_str()); + } + + if(im->callback_bytes_to_write>0 && im->callback_bytes_written>0 && acbi && acbi->af){ |