Index: head/x11/fbdesk/files/patch-src-FbTk-Font.cc
===================================================================
--- head/x11/fbdesk/files/patch-src-FbTk-Font.cc	(revision 202186)
+++ head/x11/fbdesk/files/patch-src-FbTk-Font.cc	(nonexistent)
@@ -1,12 +0,0 @@
---- src/FbTk/Font.cc.orig	Mon Sep 20 12:45:01 2004
-+++ src/FbTk/Font.cc	Fri Oct 15 18:04:48 2004
-@@ -89,9 +89,7 @@
- 
- namespace {
- 
--#ifdef HAVE_SETLOCALE
- #include <locale.h>
--#endif //HAVE_SETLOCALE
- 
- #ifdef HAVE_ICONV
- /**

Property changes on: head/x11/fbdesk/files/patch-src-FbTk-Font.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc
===================================================================
--- head/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc	(revision 202186)
+++ head/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc	(nonexistent)
@@ -1,10 +0,0 @@
---- src/FbTk/FbPixmap.cc.orig	Wed Jul 12 02:27:17 2006
-+++ src/FbTk/FbPixmap.cc	Wed Jul 12 02:27:47 2006
-@@ -29,6 +29,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <iostream>
-+#include <stdio.h>
- #include <string>
- 
- using namespace std;

Property changes on: head/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11/fbdesk/Makefile
===================================================================
--- head/x11/fbdesk/Makefile	(revision 202186)
+++ head/x11/fbdesk/Makefile	(revision 202187)
@@ -1,43 +1,47 @@
 # New ports collection makefile for:    fbdesk
 # Date created: 16 January 2003
 # Whom: Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fbdesk
-PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTVERSION=	1.4.1
 CATEGORIES=	x11
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/ \
 		${MASTER_SITE_GENTOO} \
 		http://dl.fkb.wormulon.net/fbdesk/ \
 		http://dl.kel.wormulon.net/fbdesk/
 MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Fluxbox utility to create and manage icons on the desktop
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-PLIST_FILES=	bin/fbdesk
-USE_X_PREFIX=	yes
+OPTIONS=	IMLIB2 "Imlib2 (pixmap themes) support" On
+
+USE_XORG=	xext xft xpm xrender
+USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
-PORTDOCS=	COPYING ChangeLog INSTALL README
+PORTDOCS=	ChangeLog INSTALL README
+PLIST_FILES=	bin/fbdesk
 
-post-patch:
-	${REINPLACE_CMD} -e "s/inttypes\.h/stdint\.h/" \
-		${WRKSRC}/src/FbTk/Timer.hh
+.include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_IMLIB2)
+CONFIGURE_ARGS+=	--disable-imlib2
+.else
+LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+.endif
+
 post-install:
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/x11/fbdesk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/x11/fbdesk/distinfo
===================================================================
--- head/x11/fbdesk/distinfo	(revision 202186)
+++ head/x11/fbdesk/distinfo	(revision 202187)
@@ -1,3 +1,3 @@
-MD5 (fbdesk-1.4.0.tar.gz) = c52a5c2524d90c0613394478dce39156
-SHA256 (fbdesk-1.4.0.tar.gz) = a30fe27818470b3326be4f2806cd9d4ba0e3bc27decf236663ac820a3ce5ee83
-SIZE (fbdesk-1.4.0.tar.gz) = 418889
+MD5 (fbdesk-1.4.1.tar.gz) = b65136d2d52524492c8a5bc233b7f34b
+SHA256 (fbdesk-1.4.1.tar.gz) = ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c
+SIZE (fbdesk-1.4.1.tar.gz) = 426550

Property changes on: head/x11/fbdesk/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property