5 files changed, 3 insertions, 69 deletions

diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 85a9a9ea5ca4..bd3fb153d1fb 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	conky
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/conky-awesome/distinfo b/sysutils/conky-awesome/distinfo
index 71b5a7cd2c63..bcf46e25fe68 100644
--- a/sysutils/conky-awesome/distinfo
+++ b/sysutils/conky-awesome/distinfo
@@ -1,2 +1,2 @@
-MD5 (conky-1.3.1.tar.bz2) = 1dda4829734050293e07b1f0228b1a42
-SIZE (conky-1.3.1.tar.bz2) = 316741
+MD5 (conky-1.3.3.tar.bz2) = 8c200d13b31b0c441d0e8ad38161b35e
+SIZE (conky-1.3.3.tar.bz2) = 317987
diff --git a/sysutils/conky-awesome/files/patch-src-conky.c b/sysutils/conky-awesome/files/patch-src-conky.c
deleted file mode 100644
index a6411f01c071..000000000000
--- a/sysutils/conky-awesome/files/patch-src-conky.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/conky.c.orig	Fri Sep  2 21:55:33 2005
-+++ src/conky.c	Fri Sep  2 21:54:07 2005
-@@ -846,7 +846,7 @@
- 	OBJ_upspeedgraph,
- 	OBJ_uptime,
- 	OBJ_uptime_short,
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
- 	OBJ_apm_adapter,
- 	OBJ_apm_battery_time,
- 	OBJ_apm_battery_life,
-@@ -1688,8 +1688,8 @@
- 	}
- 	END OBJ(uptime_short, INFO_UPTIME) END OBJ(uptime, INFO_UPTIME) END
- 	    OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
--#ifdef __FreeBSD__
--	OBJ(apm_adapter, 0) END
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
-+        OBJ(apm_adapter, 0) END
- 	OBJ(apm_battery_life, 0) END
- 	OBJ(apm_battery_time, 0) END
- #endif /* __FreeBSD__ */
-@@ -2715,7 +2715,7 @@
- 				format_seconds(p, n, (int) cur->uptime);
- 			}
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
- 			OBJ(apm_adapter) {
- 				snprintf(p, n, "%s", get_apm_adapter());
- 			}
diff --git a/sysutils/conky-awesome/files/patch-src-conky.h b/sysutils/conky-awesome/files/patch-src-conky.h
deleted file mode 100644
index 0c6aa6f0ae20..000000000000
--- a/sysutils/conky-awesome/files/patch-src-conky.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/conky.h.orig	Fri Sep  2 21:46:54 2005
-+++ src/conky.h	Fri Sep  2 21:47:46 2005
-@@ -30,7 +30,7 @@
- #endif
- #endif /* X11 */
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
- #include <machine/apm_bios.h>
- #endif /* __FreeBSD__ */
- 
-@@ -360,7 +360,7 @@
- #endif
- 
- /* in freebsd.c */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
- int apm_getinfo(int fd, apm_info_t aip);
- char *get_apm_adapter(void);
- char *get_apm_battery_life(void);
diff --git a/sysutils/conky-awesome/files/patch-src-freebsd.c b/sysutils/conky-awesome/files/patch-src-freebsd.c
deleted file mode 100644
index cd8607ca2a48..000000000000
--- a/sysutils/conky-awesome/files/patch-src-freebsd.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/freebsd.c.orig	Fri Sep  2 21:43:44 2005
-+++ src/freebsd.c	Fri Sep  2 21:48:28 2005
-@@ -590,6 +590,7 @@
- 		return;
- }
- 
-+#if defined(i386) || defined(__i386__)
- #define APMDEV  "/dev/apm"
- #define APM_UNKNOWN     255
- 
-@@ -706,3 +707,4 @@
- 
- 	return out;
- }
-+#endif