diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2012-09-19 20:00:34 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2012-09-19 20:00:34 +0000 |
| commit | 368e46b2087db7fd2b7cef85477437cdb609ea47 (patch) | |
| tree | bb8103e07f6c458a5e8bbacb10675962aaef7f04 /sysutils | |
| parent | . Update to 4.2.0 and re-enable. (diff) | |
Fix on 9.x and newer.
PR: ports/171690
Submitted by: Eric Freeman <freebsdports@chillibear.com>
Approved by: crees, tabthorpe (mentors, implicit)
Notes
Notes:
svn path=/head/; revision=304544
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/tty-clock/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/tty-clock/files/patch-ttyclock.c | 52 |
2 files changed, 54 insertions, 7 deletions
diff --git a/sysutils/tty-clock/Makefile b/sysutils/tty-clock/Makefile index d4397753b1fe..b6d3858dbb1a 100644 --- a/sysutils/tty-clock/Makefile +++ b/sysutils/tty-clock/Makefile @@ -7,6 +7,7 @@ PORTNAME= tty-clock PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://github.com/xorg62/${PORTNAME}/tarball/ DISTNAME= a82fd71 @@ -30,10 +31,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tty-clock ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 900007 -BROKEN= Core dumps on FreeBSD 9+ -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/tty-clock/files/patch-ttyclock.c b/sysutils/tty-clock/files/patch-ttyclock.c new file mode 100644 index 000000000000..766bbbd31fce --- /dev/null +++ b/sysutils/tty-clock/files/patch-ttyclock.c @@ -0,0 +1,52 @@ +--- ttyclock.c.orig 2009-06-17 19:07:38.000000000 +0100 ++++ ttyclock.c 2012-09-16 18:16:24.000000000 +0100 +@@ -174,19 +174,19 @@ + } + + void +-draw_number(int n, int x, int y) ++draw_number(int n, int y, int x) + { +- int i, sy = y; ++ int i, sx = x; + +- for(i = 0; i < 30; ++i, ++sy) ++ for(i = 0; i < 30; ++i, ++sx) + { +- if(sy == y + 6) ++ if(sx == x + 6) + { +- sy = y; +- ++x; ++ sx = x; ++ ++y; + } + wbkgdset(ttyclock->framewin, COLOR_PAIR(number[n][i/2])); +- mvwaddch(ttyclock->framewin, x, sy, ' '); ++ mvwaddch(ttyclock->framewin, y, sx, ' '); + } + wrefresh(ttyclock->framewin); + +@@ -209,11 +209,6 @@ + draw_number(ttyclock->date.minute[0], 1, 20); + draw_number(ttyclock->date.minute[1], 1, 27); + +- /* Draw the date */ +- wbkgdset(ttyclock->datewin, (COLOR_PAIR(2))); +- mvwprintw(ttyclock->datewin, (DATEWINH / 2), 1, ttyclock->date.datestr); +- wrefresh(ttyclock->datewin); +- + /* Draw second if the option is enable */ + if(ttyclock->option.second) + { +@@ -227,6 +222,11 @@ + draw_number(ttyclock->date.second[1], 1, 46); + } + ++ /* Draw the date */ ++ wbkgdset(ttyclock->datewin, (COLOR_PAIR(2))); ++ mvwprintw(ttyclock->datewin, (DATEWINH / 2), 1, ttyclock->date.datestr); ++ wrefresh(ttyclock->datewin); ++ + return; + } |