Update to 1.7.0

PR:		134184
Submitted by:	Nikos Ntarmos (maintainer)

5 files changed, 30 insertions, 17 deletions

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index a49c68528637..90aae67525be 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	conky
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +23,7 @@ USE_XORG?=	x11 xext xdamage
 USE_GNOME?=	pkgconfig
 USE_ICONV=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
-			--disable-proc-uptime \
+			--disable-config-output  \
 			--disable-hddtemp
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -102,7 +101,7 @@ do-install:
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/conky.conf ${EXAMPLESDIR}/conkyrc.sample
+	@${INSTALL_DATA} ${WRKSRC}/data/conky.conf ${EXAMPLESDIR}/conkyrc.sample
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index d4be509ef10c..94470aad3915 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-MD5 (conky-1.6.1.tar.bz2) = b2839f21cec18e5eaa338c7440a1ba28
-SHA256 (conky-1.6.1.tar.bz2) = e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
-SIZE (conky-1.6.1.tar.bz2) = 442180
+MD5 (conky-1.7.0.tar.bz2) = 10360c37d76ab25f4d585bcdfd07f075
+SHA256 (conky-1.7.0.tar.bz2) = 088594166c33a03fc5aacb63ecb15a6b83ffb80dc3aa40e1f10b897ca1733355
+SIZE (conky-1.7.0.tar.bz2) = 478369
diff --git a/sysutils/conky/files/patch-src-conf_cookie.c b/sysutils/conky/files/patch-src-conf_cookie.c
new file mode 100644
index 000000000000..542caf288847
--- /dev/null
+++ b/sysutils/conky/files/patch-src-conf_cookie.c
@@ -0,0 +1,14 @@
+--- src/conf_cookie.c.orig	2009-05-03 12:39:27.000000000 +0300
++++ src/conf_cookie.c	2009-05-03 12:39:48.000000000 +0300
+@@ -23,11 +23,3 @@
+ 	}
+ 	return i;
+ }
+-
+-cookie_io_functions_t conf_cookie = {
+-	.read = &conf_read,
+-	.write = NULL,
+-	.seek = NULL,
+-	.close = NULL,
+-};
+-
diff --git a/sysutils/conky/files/patch-src-conky.h b/sysutils/conky/files/patch-src-conky.h
deleted file mode 100644
index 82ee8caefe40..000000000000
--- a/sysutils/conky/files/patch-src-conky.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/conky.h.orig	2008-08-16 10:49:12.000000000 +0400
-+++ src/conky.h	2008-08-16 10:49:24.000000000 +0400
-@@ -44,6 +44,7 @@
- #include "config.h"
- #include <sys/utsname.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <locale.h>
- #include <langinfo.h>
diff --git a/sysutils/conky/files/patch-src-freebsd.h b/sysutils/conky/files/patch-src-freebsd.h
new file mode 100644
index 000000000000..57a9651983cb
--- /dev/null
+++ b/sysutils/conky/files/patch-src-freebsd.h
@@ -0,0 +1,10 @@
+--- src/freebsd.h.orig 2009-05-03 20:22:29.000000000 +0300
++++ src/freebsd.h 2009-05-03 20:22:11.000000000 +0300
+@@ -2,6 +2,7 @@
+ #define FREEBSD_H_
+ 
+ #include "common.h"
++#include <sys/param.h>
+ #include <sys/mount.h>
+ #include <sys/ucred.h>
+ #include <fcntl.h>