svn commit: r349402 - in head/sysutils/conky: . files

[Jason E. Hale]

Author: jhale
Date: Fri Mar 28 09:35:19 2014
New Revision: 349402
URL: http://svnweb.freebsd.org/changeset/ports/349402
QAT: https://qat.redports.org/buildarchive/r349402/

Log:
  - Add patch to fix diskio memory leak
  - Bump PORTREVISION
  
  While here:
  - Convert USE_BZIP2 -> USES
  
  PR:		ports/181040
  Submitted by:	Ken DEGUCHI <kdeguchi at sz.tokoha-u.ac.jp>
  Approved by:	maintainer timeout (~8 months)

Modified:
  head/sysutils/conky/Makefile
  head/sysutils/conky/files/patch-src-freebsd.c

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Fri Mar 28 09:23:08 2014	(r349401)
+++ head/sysutils/conky/Makefile	Fri Mar 28 09:35:19 2014	(r349402)
@@ -3,7 +3,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -13,8 +13,7 @@ COMMENT?=	Advanced, highly configurable 
 CONFLICTS?=	conky-awesome-[0-9]*
 SLAVEDIRS=	sysutils/conky-awesome
 
-USES=		gmake iconv pkgconfig
-USE_BZIP2=	yes
+USES=		gmake iconv pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-hddtemp \

Modified: head/sysutils/conky/files/patch-src-freebsd.c
==============================================================================
--- head/sysutils/conky/files/patch-src-freebsd.c	Fri Mar 28 09:23:08 2014	(r349401)
+++ head/sysutils/conky/files/patch-src-freebsd.c	Fri Mar 28 09:35:19 2014	(r349402)
@@ -1,5 +1,5 @@
---- src/freebsd.c.orig	2012-05-04 00:08:27.000000000 +0300
-+++ src/freebsd.c	2012-12-04 11:09:20.000000000 +0200
+--- src/freebsd.c.orig	2012-05-04 06:08:27.000000000 +0900
++++ src/freebsd.c	2013-08-05 09:02:37.000000000 +0900
 @@ -38,6 +38,11 @@
  #include <sys/types.h>
  #include <sys/user.h>
@@ -53,3 +53,12 @@
  
  	if (!global_cpu) {
  		malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info);
+@@ -702,7 +706,7 @@
+ 		free(dev_select);
+ 	}
+ 
+-	free(statinfo_cur.dinfo);
++	free(statinfo_cur.dinfo->mem_ptr);
+ 	return 0;
+ }
+