From 23ee3071a7b4480aa2ac4597926150a081e557a4 Mon Sep 17 00:00:00 2001 From: jadawin Date: Sat, 22 Mar 2008 12:27:42 +0000 Subject: - Remove patches that are redundant since 4.12 - Add tclock plugin class registration - Bump PORTREVISION PR: ports/121867 Submitted by: Evgen Zagorodniy Approved by: Tobias Roth (maintainer) Approved by: tabthorpe (mentor) --- x11/fbpanel/Makefile | 1 + x11/fbpanel/files/patch-plugin.c | 19 ++++++++++--------- x11/fbpanel/files/patch-plugin.h | 15 ++++++--------- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'x11') diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile index d962bbddbc96..4a8df934b84c 100644 --- a/x11/fbpanel/Makefile +++ b/x11/fbpanel/Makefile @@ -7,6 +7,7 @@ PORTNAME= fbpanel PORTVERSION= 4.12 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11/fbpanel/files/patch-plugin.c b/x11/fbpanel/files/patch-plugin.c index 0516f3978d5c..31d199ea50be 100644 --- a/x11/fbpanel/files/patch-plugin.c +++ b/x11/fbpanel/files/patch-plugin.c @@ -1,15 +1,16 @@ ---- plugin.c~ Tue May 16 19:22:41 2006 -+++ plugin.c Tue May 16 19:16:29 2006 -@@ -98,7 +98,11 @@ - #ifdef STATIC_DESKNO - REGISTER_PLUGIN_CLASS(deskno_plugin_class, 0); - #endif +--- plugin.c~ 2007-04-21 14:28:25.000000000 +0300 ++++ plugin.c 2008-03-19 15:54:08.000000000 +0200 +@@ -65 +65,5 @@ +- ++ ++#ifdef STATIC_TCLOCK ++ REGISTER_PLUGIN_CLASS(tclock_plugin_class, 0); ++#endif ++ +@@ -101 +105,5 @@ - + +#if defined(STATIC_CPU) && defined(PLUGIN_CPU) + REGISTER_PLUGIN_CLASS(cpu_plugin_class, 0); +#endif + - RET(); - } - diff --git a/x11/fbpanel/files/patch-plugin.h b/x11/fbpanel/files/patch-plugin.h index 394e8f505de0..4142884fa4f8 100644 --- a/x11/fbpanel/files/patch-plugin.h +++ b/x11/fbpanel/files/patch-plugin.h @@ -1,11 +1,8 @@ ---- plugin.h~ Tue May 16 19:22:49 2006 -+++ plugin.h Tue May 16 19:00:09 2006 -@@ -61,7 +61,7 @@ - #define STATIC_SPACE - #define STATIC_ICONS - #define STATIC_DESKNO +--- plugin.h~ 2007-04-21 14:28:25.000000000 +0300 ++++ plugin.h 2008-03-19 15:54:10.000000000 +0200 +@@ -54,0 +55 @@ ++#define STATIC_TCLOCK +@@ -63,0 +65 @@ +#define STATIC_CPU - #endif +@@ -66 +67,0 @@ - - - #endif -- cgit