diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2006-11-12 13:52:38 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2006-11-12 13:52:38 +0000 |
| commit | 8b9e6a018108eda783093dbbf2ae5bfd3e46b5f6 (patch) | |
| tree | d3c3ab9b17638cd6929a928b445618be2169bbac /sysutils/conky | |
| parent | 972df48076a53d00c30a1a2d2eabad99530f6522 (diff) | |
| download | ports-8b9e6a018108eda783093dbbf2ae5bfd3e46b5f6.tar.gz ports-8b9e6a018108eda783093dbbf2ae5bfd3e46b5f6.zip | |
Notes
Diffstat (limited to 'sysutils/conky')
| -rw-r--r-- | sysutils/conky/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/conky/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/conky/files/patch-src-freebsd.c | 20 |
3 files changed, 24 insertions, 16 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 9e2c4b31e933..e3609edebf3c 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -6,8 +6,7 @@ # PORTNAME= conky -PORTVERSION= 1.4.2 -PORTREVISION= 2 +PORTVERSION= 1.4.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +18,9 @@ USE_BZIP2= yes HAS_CONFIGURE= yes USE_ICONV= yes USE_X_PREFIX= yes -CONFIGURE_ARGS+= --disable-portmon --disable-proc-uptime +CONFIGURE_ARGS+= --disable-portmon \ + --disable-proc-uptime \ + --disable-hddtemp CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" @@ -28,6 +29,13 @@ MAN1= conky.1 PORTDOCS= README AUTHORS ChangeLog TODO \ docs.html variables.html config_settings.html +.if defined(WITH_AUDACIOUS) +LIB_DEPENDS+= audacious.3:${PORTSDIR}/multimedia/audacious +CONFIGURE_ARGS+= --enable-audacious +.else +CONFIGURE_ARGS+= --disable-audacious +.endif + .if defined(WITH_BMPX) BUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx RUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 9265e2027bf7..2d340c705dc6 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -MD5 (conky-1.4.2.tar.bz2) = 050a53bdb359a96421ef3ddf761f143c -SHA256 (conky-1.4.2.tar.bz2) = e792a1ea4f865225e6f9d1e4cafd405745390a09d48d4a8936d4b0556e6e32b2 -SIZE (conky-1.4.2.tar.bz2) = 400574 +MD5 (conky-1.4.3.tar.bz2) = 35136373cd528e65d7c391261e3122e1 +SHA256 (conky-1.4.3.tar.bz2) = 47f541ad7f7ba44e0df084f1c891c1376c89ddab753ce693f527eac375d56b88 +SIZE (conky-1.4.3.tar.bz2) = 385833 diff --git a/sysutils/conky/files/patch-src-freebsd.c b/sysutils/conky/files/patch-src-freebsd.c index 0e1e6322072a..7c1ae6d21fb7 100644 --- a/sysutils/conky/files/patch-src-freebsd.c +++ b/sysutils/conky/files/patch-src-freebsd.c @@ -1,11 +1,11 @@ ---- src/freebsd.c.orig Sun Mar 26 01:47:50 2006 -+++ src/freebsd.c Wed May 24 07:57:35 2006 -@@ -508,7 +508,7 @@ +--- src/freebsd.c.orig Sun Nov 12 09:23:59 2006 ++++ src/freebsd.c Sun Nov 12 09:24:20 2006 +@@ -290,7 +290,7 @@ + size_t len = sizeof (cp_time); - if (GETSYSCTL("dev.cpu.0.freq", freq) == 0) - snprintf(p_client_buffer, client_buffer_size, -- p_format, freq/divisor); -+ p_format, (float)freq/(float)divisor); - else - snprintf(p_client_buffer, client_buffer_size, p_format, 0.0f); - } + /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ +- if ((cpu_setup == 0)) || (!info.cpu_usage) { ++ if ((cpu_setup == 0) || (!info.cpu_usage)) { + get_cpu_count(); + cpu_setup = 1; + } |