5 files changed, 24 insertions, 46 deletions

diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 3abcaea1d44a..5d08e5591e02 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fbpanel
-PORTVERSION=	4.1
-PORTREVISION=	1
+PORTVERSION=	4.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,11 +19,16 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --cpu=off
+CFLAGS+=	-I${WRKSRC}
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN1=		fbpanel.1
 MANCOMPRESSED=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/man/Makefile
+
 post-install:
 	@${ECHO_MSG} ""
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/fbpanel/distinfo b/x11/fbpanel/distinfo
index b36a5c7aa138..34f3444397f1 100644
--- a/x11/fbpanel/distinfo
+++ b/x11/fbpanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fbpanel-4.1.tgz) = 70c1b3f9682a0cce0d6b5477b2bc83e4
-SIZE (fbpanel-4.1.tgz) = 96191
+MD5 (fbpanel-4.3.tgz) = 2d2f3713cf3c17b71997064f39d4c888
+SIZE (fbpanel-4.3.tgz) = 95702
diff --git a/x11/fbpanel/files/patch-Makefile b/x11/fbpanel/files/patch-Makefile
deleted file mode 100644
index 918b9c9a63bf..000000000000
--- a/x11/fbpanel/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.orig	Sat Jun 26 12:37:59 2004
-+++ man/Makefile	Sat Jun 26 12:38:14 2004
-@@ -20,8 +20,8 @@
- 
- 
- install: all
--	install -d  $(PREFIX)/share/man/man1
--	install -m 644 $(TARGET) $(PREFIX)/share/man/man1
-+	install -d  $(PREFIX)/man/man1
-+	install -m 644 $(TARGET) $(PREFIX)/man/man1
- 
- uninstall:
- 	rm -f $(PREFIX)/share/man/man1/$(TARGET)
diff --git a/x11/fbpanel/files/patch-Makefile.common b/x11/fbpanel/files/patch-Makefile.common
index 2c332a3f8530..72f239eeef85 100644
--- a/x11/fbpanel/files/patch-Makefile.common
+++ b/x11/fbpanel/files/patch-Makefile.common
@@ -1,17 +1,18 @@
---- Makefile.common.orig	Sat Nov  6 07:36:35 2004
-+++ Makefile.common	Sat Dec 18 17:35:28 2004
-@@ -15,12 +15,9 @@
- endif
- endif
+--- Makefile.common.orig	Thu Jul 28 22:35:08 2005
++++ Makefile.common	Thu Jul 28 22:36:06 2005
+@@ -83,13 +83,11 @@
+ # compile flags
  
--CC = gcc
-+CC ?= gcc
- LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
--INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
--INCS := $(INCS2:-I%=-isystem%)
--# first = may be overwriten by command line or env. variable	
--CFLAGS = -O2
+ RM      = rm -f
+-CC      = gcc
++CC      ?= gcc
+ AR      = ar
+ LIBS    = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
+-INCS2   = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
+-INCS   := $(INCS2:-I%=-isystem %)
 +INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
- # this one always applays
- CFLAGS += -Wall
- ifneq (,$(DEVEL))
+ 
+-CFLAGS = -O2
+ ifeq (1,$(DEVEL))
+ override CFLAGS += -g
+ endif
diff --git a/x11/fbpanel/files/patch-plugins-deskno.c b/x11/fbpanel/files/patch-plugins-deskno.c
deleted file mode 100644
index 330c01c67f74..000000000000
--- a/x11/fbpanel/files/patch-plugins-deskno.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/deskno.c~	Sat Dec 18 17:37:12 2004
-+++ plugins/deskno.c	Sat Dec 18 17:37:30 2004
-@@ -25,10 +25,10 @@
- static  void
- clicked( GtkWidget *widget, gpointer data)
- {
--    ENTER;
-     int desknum = get_net_current_desktop();
-     int desks = get_net_number_of_desktops();
-     int newdesk;
-+    ENTER;
-     if(desknum == (desks - 1))
- 	newdesk = 0;
-     else