Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Sep 2012 19:50:12 GMT
From:      Lars Engels <lars.engels@0x20.net>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/168161: [PATCH] sysutils/conky: update to 1.9.0
Message-ID:  <201209201950.q8KJoCHw054064@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/168161; it has been noted by GNATS.

From: Lars Engels <lars.engels@0x20.net>
To: bug-followup@FreeBSD.org, coder@tuxfamily.org, ntarmos@ceid.upatras.gr
Cc:  
Subject: Re: ports/168161: [PATCH] sysutils/conky: update to 1.9.0
Date: Thu, 20 Sep 2012 21:47:10 +0200

 --+jMesTDEFHiw5APJ
 Content-Type: multipart/mixed; boundary="OLq6itPlQwcDjwuA"
 Content-Disposition: inline
 
 
 --OLq6itPlQwcDjwuA
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 
 The attached patch works for me. Also builds in a TB:
 
 https://redports.org/~lme/20120920192317-46529-70092/conky-1.9.0.log
 
 --OLq6itPlQwcDjwuA
 Content-Type: text/x-diff; charset=utf-8
 Content-Disposition: attachment; filename="conky-1.9.0.diff"
 Content-Transfer-Encoding: quoted-printable
 
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- distinfo	(revision 304590)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (conky-1.8.1.tar.bz2) =3D f85a278f2869596b1fd68b6d26d58c93af8dcc39d=
 5186bbcfd587d4c545e5e43
 -SIZE (conky-1.8.1.tar.bz2) =3D 612481
 +SHA256 (conky-1.9.0.tar.bz2) =3D baf1b550f135fbfb53e5e286a33aadc03a667d63b=
 f6c4d52ba7637366295bb6f
 +SIZE (conky-1.9.0.tar.bz2) =3D 626555
 Index: files/patch-src-conky.c
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-src-conky.c	(revision 304590)
 +++ files/patch-src-conky.c	(working copy)
 @@ -1,6 +1,14 @@
 ---- src/conky.c.orig	2010-10-06 00:29:36.000000000 +0300
 -+++ src/conky.c	2012-03-05 01:03:43.000000000 +0200
 -@@ -119,7 +119,7 @@
 +--- src/conky.c.orig	2012-05-03 23:22:21.000000000 +0200
 ++++ src/conky.c	2012-09-20 21:09:37.000000000 +0200
 +@@ -58,6 +58,7 @@
 + #include "imlib2.h"
 + #endif /* IMLIB2 */
 + #endif /* X11 */
 ++#include <stdbool.h>
 + #include <sys/types.h>
 + #include <sys/stat.h>
 + #include <netinet/in.h>
 +@@ -119,7 +120,7 @@
   #include "openbsd.h"
   #endif
  =20
 @@ -9,52 +17,16 @@
   #include <bsd/bsd.h>
   #endif
  =20
 -@@ -2072,9 +2072,11 @@
 - 			OBJ(xmms2_percent) {
 - 				snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100);
 - 			}
 -+#ifdef X11
 - 			OBJ(xmms2_bar) {
 - 				new_bar(obj, p, p_max_size, (int) (cur->xmms2.progress * 255.0f));
 - 			}
 -+#endif /* X11 */
 - 			OBJ(xmms2_playlist) {
 - 				snprintf(p, p_max_size, "%s", cur->xmms2.playlist);
 - 			}
 -@@ -2150,6 +2152,7 @@
 - 				snprintf(p, p_max_size, "%s",
 - 					cur->audacious.items[AUDACIOUS_MAIN_VOLUME]);
 - 			}
 -+#ifdef X11
 - 			OBJ(audacious_bar) {
 - 				double progress;
 -=20
 -@@ -2158,6 +2161,7 @@
 - 					atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
 - 				new_bar(obj, p, p_max_size, (int) (progress * 255.0f));
 - 			}
 -+#endif /* X11 */
 - #endif /* AUDACIOUS */
 -=20
 - #ifdef BMPX
 -@@ -5716,6 +5720,7 @@
 - 			"kvm_open")) =3D=3D NULL) {
 - 		CRIT_ERR(NULL, NULL, "cannot read kvm");
 +@@ -5662,6 +5663,7 @@
 + 			current_mail_spool =3D strndup(buf, text_buffer_size);
 + 		}
   	}
  +	pthread_mutex_init(&kvm_proc_mutex, NULL);
   #endif
  =20
 - 	while (1) {
 -@@ -5999,6 +6004,7 @@
 + 	/* handle other command line arguments */
 +@@ -5971,7 +5973,7 @@
  =20
 - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 - 	kvm_close(kd);
 -+	pthread_mutex_destroy(&kvm_proc_mutex);
 - #endif
 -=20
 - 	return 0;
 -@@ -6007,7 +6013,7 @@
 -=20
   void alarm_handler(void) {
   	if(childpid > 0) {
  -		kill(childpid, SIGTERM);
 Index: files/patch-src-freebsd.c
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-src-freebsd.c	(revision 304590)
 +++ files/patch-src-freebsd.c	(working copy)
 @@ -12,21 +12,8 @@
   #include <net/if.h>
   #include <net/if_mib.h>
   #include <net/if_media.h>
 -@@ -266,7 +271,9 @@
 - {
 - 	int n_processes;
 -=20
 -+	pthread_mutex_lock(&kvm_proc_mutex);
 - 	kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
 -+	pthread_mutex_unlock(&kvm_proc_mutex);
 -=20
 - 	info.procs =3D n_processes;
 - 	return 0;
 -@@ -278,9 +285,10 @@
 - 	int n_processes;
 - 	int i, cnt =3D 0;
 -=20
 -+	pthread_mutex_lock(&kvm_proc_mutex);
 +@@ -278,7 +288,7 @@
 + 	pthread_mutex_lock(&kvm_proc_mutex);
   	p =3D kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
   	for (i =3D 0; i < n_processes; i++) {
  -#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
 @@ -34,14 +21,6 @@
   		if (p[i].kp_proc.p_stat =3D=3D SRUN) {
   #else
   		if (p[i].ki_stat =3D=3D SRUN) {
 -@@ -288,6 +296,7 @@
 - 			cnt++;
 - 		}
 - 	}
 -+	pthread_mutex_unlock(&kvm_proc_mutex);
 -=20
 - 	info.run_procs =3D cnt;
 - 	return 0;
  @@ -296,7 +305,6 @@
   void get_cpu_count(void)
   {
 @@ -50,19 +29,3 @@
  =20
   	if (GETSYSCTL("hw.ncpu", cpu_count) =3D=3D 0) {
   		info.cpu_count =3D cpu_count;
 -@@ -748,6 +756,7 @@
 - 		CRIT_ERR(NULL, NULL, "Cannot read sysctl \"vm.stats.vm.v_page_count\"");
 - 	}
 -=20
 -+	pthread_mutex_lock(&kvm_proc_mutex);
 - 	p =3D kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
 - 	processes =3D malloc(n_processes * sizeof(struct process));
 -=20
 -@@ -764,6 +769,7 @@
 - 			j++;
 - 		}
 - 	}
 -+	pthread_mutex_unlock(&kvm_proc_mutex);
 -=20
 - 	qsort(processes, j - 1, sizeof(struct process), comparemem);
 - 	for (i =3D 0; i < 10 && i < n_processes; i++) {
 Index: files/patch-configure
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-configure	(revision 304590)
 +++ files/patch-configure	(working copy)
 @@ -1,6 +1,6 @@
 ---- configure.orig
 -+++ configure
 -@@ -1002,6 +1002,7 @@
 +--- configure.orig	2012-05-04 00:47:40.000000000 +0300
 ++++ configure	2012-07-18 20:26:28.000000000 +0300
 +@@ -895,6 +895,7 @@
   enable_xft
   enable_nvidia
   enable_alsa
 @@ -8,7 +8,7 @@
   enable_debug
   enable_testing
   enable_profiling
 -@@ -1729,6 +1730,7 @@
 +@@ -1620,6 +1621,7 @@
     --enable-nvidia         enable if you want nvidia support [default=3Dno]
     --disable-alsa          disable if you do not want ALSA support
                             [default=3Dyes]
 @@ -16,55 +16,47 @@
     --enable-debug          compile with debug symbols [default=3Dno]
     --enable-testing        use strict compiler flags for testing [default=
 =3Dno]
     --enable-profiling      specify compiler flags for use with gprof and g=
 cov
 -@@ -11647,7 +11649,7 @@
 +@@ -11930,7 +11932,11 @@
 +   Linux*)
 +     WANT_SYSINFO=3Dyes
 +     ;;
 +-  FreeBSD*|GNU/kFreeBSD*)
 ++  FreeBSD*)
 ++    WANT_KVM=3Dyes
 ++    WANT_DEVSTAT=3Dyes
 ++    ;;
 ++  GNU/kFreeBSD*)
 +     WANT_KVM=3Dyes
 +     WANT_DEVSTAT=3Dyes
 +     WANT_OPTRESET=3Dyes
 +@@ -16998,18 +17004,63 @@
  =20
 -=20
 - if test x$want_apcupsd =3D xyes; then
 --  if test x"$uname" !=3D xLinux; then
 -+  if test x"$uname" !=3D xLinux -a x"$uname" !=3D xFreeBSD; then
 -       { $as_echo "$as_me:${as_lineno-$LINENO}: apcupsd not supported on $=
 uname... disabling" >&5
 - $as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;}
 -       want_apcupsd=3D"not supported on $uname"
 -@@ -11675,7 +11675,7 @@
 -=20
 -=20
 - if test x$want_iostats =3D xyes; then
 --  if test x"$uname" !=3D xLinux; then
 -+  if test x"$uname" !=3D xLinux -a x"$uname" !=3D xFreeBSD; then
 -       { $as_echo "$as_me:${as_lineno-$LINENO}: iostats not supported on $=
 uname... disabling" >&5
 - $as_echo "$as_me: iostats not supported on $uname... disabling" >&6;}
 -       want_iostats=3D"not supported on $uname"
 -@@ -16071,20 +16073,65 @@
 -=20
   done
  =20
  -# check if we have inotify support
  -for ac_header in sys/inotify.h
  -do :
  -  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sy=
 s_inotify_h" "$ac_includes_default"
 --if test "x$ac_cv_header_sys_inotify_h" =3D x""yes; then :
 --  cat >>confdefs.h <<_ACEOF
 --#define HAVE_SYS_INOTIFY_H 1
 --_ACEOF
 -=20
 ++
  +# Check whether --enable-inotify was given.
  +if test "${enable_inotify+set}" =3D set; then :
  +  enableval=3D$enable_inotify; want_inotify=3D"$enableval"
  +else
  +  want_inotify=3Dno
 - fi
 -=20
 --done
 ++fi
 ++
  +if test x$want_inotify =3D xyes; then
  +    ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_=
 sys_inotify_h" "$ac_includes_default"
 -+if test "x$ac_cv_header_sys_inotify_h" =3D xyes; then :
 + if test "x$ac_cv_header_sys_inotify_h" =3D xyes; then :
 +-  cat >>confdefs.h <<_ACEOF
 +-#define HAVE_SYS_INOTIFY_H 1
 +-_ACEOF
  +=20
  +else
  +  want_inotify=3Dno
  +fi
  =20
 -=20
 -+fi
 + fi
  +if test x$want_inotify =3D xyes; then
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in=
  -linotify" >&5
  +$as_echo_n "checking for inotify_init in -linotify... " >&6; }
 @@ -75,7 +67,8 @@
  +LIBS=3D"-linotify  $LIBS"
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
 -+
 +=20
 +-done
  +#include <sys/inotify.h>
  +
  +char inotify_init ();
 @@ -105,16 +98,6 @@
  +fi
  +
  +fi
 -+
  =20
  =20
 - $as_echo "#define DEFAULTNETDEV \"eth0\"" >>confdefs.h
 -@@ -16102,7 +16153,7 @@
 - $as_echo "#define DEFAULT_TEXT_BUFFER_SIZE 256" >>confdefs.h
  =20
 -=20
 --$as_echo "#define MAX_NET_INTERFACES 16" >>confdefs.h
 -+$as_echo "#define MAX_NET_INTERFACES 64" >>confdefs.h
 -=20
 -=20
 -=20
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 304590)
 +++ Makefile	(working copy)
 @@ -6,8 +6,7 @@
  #
 =20
  PORTNAME=3D	conky
 -PORTVERSION=3D	1.8.1
 -PORTREVISION=3D	5
 +PORTVERSION=3D	1.9.0
  CATEGORIES=3D	sysutils
  MASTER_SITES=3D	SF
 =20
 
 --OLq6itPlQwcDjwuA--
 
 --+jMesTDEFHiw5APJ
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlBbcr4ACgkQKc512sD3afhakgCeJRj34ATsFsk709Z96a0FkBZz
 X1QAoIU8nWhyHMKSeKdEudElR0nCJKvx
 =2L0i
 -----END PGP SIGNATURE-----
 
 --+jMesTDEFHiw5APJ--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209201950.q8KJoCHw054064>