Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jan 2020 14:16:30 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522493 - in head/sysutils/conky: . files
Message-ID:  <202001091416.009EGUZv026695@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Thu Jan  9 14:16:30 2020
New Revision: 522493
URL: https://svnweb.freebsd.org/changeset/ports/522493

Log:
  Fix if_mounted and if_running variables
  
  PR:		243088
  Submitted by:	Helge Oldach <freebsd@oldach.net>
  Obtained from:	https://github.com/brndnmtthws/conky/pull/924

Added:
  head/sysutils/conky/files/patch-src_core.cc   (contents, props changed)
Modified:
  head/sysutils/conky/Makefile

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Thu Jan  9 14:16:10 2020	(r522492)
+++ head/sysutils/conky/Makefile	Thu Jan  9 14:16:30 2020	(r522493)
@@ -4,7 +4,7 @@
 PORTNAME=	conky
 PORTVERSION=	1.11.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	madpilot@FreeBSD.org

Added: head/sysutils/conky/files/patch-src_core.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/conky/files/patch-src_core.cc	Thu Jan  9 14:16:30 2020	(r522493)
@@ -0,0 +1,11 @@
+--- src/core.cc.orig	2019-08-12 21:53:54 UTC
++++ src/core.cc
+@@ -1077,7 +1077,7 @@ struct text_object *construct_text_object(char *s, con
+       obj->data.s = STRNDUP_ARG;
+   obj->callbacks.iftest = &if_existing_iftest;
+   obj->callbacks.free = &gen_free_opaque;
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+   END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument") obj->data.s =
+       STRNDUP_ARG;
+   obj->callbacks.iftest = &check_mount;



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