ports/115642: sysutils/conky build fails due to an undeclared variable

[Barbara]

>Number:         115642
>Category:       ports
>Synopsis:       sysutils/conky build fails due to an undeclared variable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 20 12:20:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        6.2-STABLE
>Organization:
>Environment:
FreeBSD satanasso.local.domain 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Aug 16 19:23:44 CEST 2007 root@:/usr/obj/usr/src/sys/SATANASSO i386
>Description:
Trying to upgrade conky, I got this message:
------------------------------------------------------------------------------
cc -DHAVE_CONFIG_H -I.    -I/usr/local/include  -O2 -pipe -fno-strict-aliasing -march=athlon-mp -I/usr/local/include -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include   -D_THREAD_SAFE -I/usr/local/include   -D_THREAD_SAFE -I/usr/local/include   -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/freetype2   -Wall -W -MT freebsd.o -MD -MP -MF .deps/freebsd.Tpo -c -o freebsd.o freebsd.c
freebsd.c: In function `get_apm_adapter':
freebsd.c:843: error: `out' undeclared (first use in this function)
freebsd.c:843: error: (Each undeclared identifier is reported only once
freebsd.c:843: error: for each function it appears in.)
freebsd.c: At top level:
..
*** Error code 1

Stop in /usr/ports/sysutils/conky/work/conky-1.4.6/src.
*** Error code 1

Stop in /usr/ports/sysutils/conky/work/conky-1.4.6/src.
*** Error code 1

Stop in /usr/ports/sysutils/conky/work/conky-1.4.6.
*** Error code 1

Stop in /usr/ports/sysutils/conky.
------------------------------------------------------------------------------

>How-To-Repeat:
cd /usr/ports/sysutils/conky
make WITH_XFT=1 WITHOUT_SETI=1

>Fix:
I've modified the file files/patch-src-freebsd.c


Patch attached with submission follows:

--- src/freebsd.c.orig	2007-08-05 06:48:13.000000000 +0200
+++ src/freebsd.c	2007-08-20 13:57:31.000000000 +0200
@@ -43,6 +43,14 @@
 #define	FREEBSD_DEBUG
 #endif
 
+#if __FreeBSD_version > 700050
+struct wi_req {
+	u_int16_t wi_len;
+	u_int16_t wi_type;
+	u_int16_t wi_val[WI_MAX_DATALEN];
+};
+#endif
+
 inline void proc_find_top(struct process **cpu, struct process **mem);
 
 u_int64_t diskio_prev = 0;
@@ -832,7 +840,7 @@
 	int fd;
 	struct apm_info info;
 
-	out = (char *)calloc(16, sizeof (char));
+	char * out = (char *)calloc(16, sizeof (char));
 
 	fd = open(APMDEV, O_RDONLY);
 	if (fd < 0) {


>Release-Note:
>Audit-Trail:
>Unformatted: