ood-ports-lbsd/sysutils/conky/patches/patch-src_core_c

$OpenBSD: patch-src_core_c,v 1.4 2012/12/31 09:36:38 chrisz Exp $
--- src/core.c.orig	Thu May  3 23:08:27 2012
+++ src/core.c	Tue Jul 24 18:10:39 2012
@@ -170,9 +170,9 @@ struct text_object *construct_text_object(const char *
 #else
 			NORM_ERR("acpiacadapter: arg is only used on linux");
 #endif
-		}
+		} END
 #endif /* !__OpenBSD__ */
-	END OBJ(freq, 0)
+	OBJ(freq, 0)
 		get_cpu_count();
 		if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
 				|| atoi(&arg[0]) > info.cpu_count) {
@@ -326,7 +326,7 @@ struct text_object *construct_text_object(const char *
 			obj->data.i = PB_BATT_STATUS;
 		}
 #endif /* __linux__ */
-#if (defined(__FreeBSD__) || defined(__linux__))
+#if (defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__linux__))
 	END OBJ_IF_ARG(if_up, 0, "if_up needs an argument")
 		parse_if_up_arg(obj, arg);
 #endif
@@ -860,7 +860,7 @@ struct text_object *construct_text_object(const char *
 	END OBJ(gw_ip, &update_gateway_info)
 #endif /* !__linux__ */
 #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
-		|| defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+		|| defined(__OpenBSD__))
 	END OBJ(apm_adapter, 0)
 	END OBJ(apm_battery_life, 0)
 	END OBJ(apm_battery_time, 0)
@@ -1523,7 +1523,7 @@ void free_text_objects(struct text_object *root, int i
 					free(data.s);
 				break;
 #endif
-#if (defined(__FreeBSD__) || defined(__linux__))
+#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__))
 			case OBJ_if_up:
 				free_if_up(obj);
 				break;