1. Update to version 4.12.

2. Remove now-spurious USE_X_PREFIX and CFLAGS variables
3. Remove leading A from COMMENT
4. Make CONFIGURE_ARGS += instead of = (this isn't GNU configure, but
it can't hurt just in case).
5. One hunk from patch-Makefile.common was adopted upstream.

GMTA by: Maintainer (ports@fsck.ch)

x11/fbpanel/Makefile

@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	fbpanel
-PORTVERSION=	4.9
+PORTVERSION=	4.12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@fsck.ch
-COMMENT=	A desktop panel that includes a taskbar, pager, launchbar and more
+COMMENT=	Desktop panel that includes a taskbar, pager, launchbar and more
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-CFLAGS+=	-I${WRKSRC}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 USE_GMAKE=	yes
 
 MAN1=		fbpanel.1

x11/fbpanel/distinfo

@@ -1,3 +1,3 @@
-MD5 (fbpanel-4.9.tgz) = 67a2a442a038ba80094c8cc06784dd08
-SHA256 (fbpanel-4.9.tgz) = 6d7f445885644988820119f51fb0728fbd2b8df0c26ca8d010c267b535d129de
-SIZE (fbpanel-4.9.tgz) = 169637
+MD5 (fbpanel-4.12.tgz) = 12528e7b2936a3548840fe01acaf39f5
+SHA256 (fbpanel-4.12.tgz) = 9f665777df5023e3d3c33598a0f5d81d0b79314b75a128c16c07126ef0fc607f
+SIZE (fbpanel-4.12.tgz) = 179131

x11/fbpanel/files/patch-Makefile.common

@@ -21,12 +21,3 @@
  ifeq (1,$(DEVEL))
  override CFLAGS += -g
  endif
-@@ -113,7 +111,7 @@
- 
- %.dep : %.c
- 	$(call summary,DEP ,$@)
--	$(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< | sed 's/\($*\).o[ :]*/\1.o $@ :/' > $@
-+	$(Q)$(CC) $(CPPFLAGS) $(INCS) -MM $< | sed 's/\($*\)\.o[ :]*/\1.o $@ :/' > $@
- 
- 
- #########################################

x11/fbpanel/pkg-plist

@@ -2,6 +2,7 @@ bin/fbpanel
 %%DATADIR%%/default
 %%DATADIR%%/images/bottom-left.xpm
 %%DATADIR%%/images/bottom-right.xpm
+%%DATADIR%%/images/dclock_glyphs.png
 %%DATADIR%%/images/default.xpm
 %%DATADIR%%/images/gnome-applications.png
 %%DATADIR%%/images/gnome-devel.svg