ports/121867: Fix port x11/fbpanel

[Evgen Zagorodniy]

>Number:         121867
>Category:       ports
>Synopsis:       Fix port x11/fbpanel
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 19 14:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Evgen Zagorodniy
>Release:        
>Organization:
>Environment:
>Description:
Some fixes to port x11/fbpanel:

 - remove patches that are redundant since 4.12
 - add tclock plugin class registration so it is loadable now

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/x11/fbpanel/Makefile x11/fbpanel/Makefile
--- /usr/ports/x11/fbpanel/Makefile	2007-08-07 11:37:22.000000000 +0300
+++ x11/fbpanel/Makefile	2008-03-19 16:21:14.000000000 +0200
@@ -7,6 +7,7 @@
 
 PORTNAME=	fbpanel
 PORTVERSION=	4.12
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN /usr/ports/x11/fbpanel/files/patch-plugin.c x11/fbpanel/files/patch-plugin.c
--- /usr/ports/x11/fbpanel/files/patch-plugin.c	2008-03-19 16:23:01.000000000 +0200
+++ x11/fbpanel/files/patch-plugin.c	2008-03-19 15:54:22.000000000 +0200
@@ -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 -ruN /usr/ports/x11/fbpanel/files/patch-plugin.h x11/fbpanel/files/patch-plugin.h
--- /usr/ports/x11/fbpanel/files/patch-plugin.h	2008-03-19 16:23:01.000000000 +0200
+++ x11/fbpanel/files/patch-plugin.h	2008-03-19 15:54:17.000000000 +0200
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted: