Index: head/x11-wm/icewm/Makefile
===================================================================
--- head/x11-wm/icewm/Makefile	(revision 472513)
+++ head/x11-wm/icewm/Makefile	(revision 472514)
@@ -1,90 +1,94 @@
 # Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	icewm
 PORTVERSION=	1.3.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Window Manager designed for speed, usability and consistency
 
-LICENSE=	GPLv2
+LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
 USES=		gmake iconv:translit localbase pkgconfig
-USE_XORG=	ice sm x11 xext
+USE_CXXSTD=	c++98
 USE_GNOME=	gdkpixbuf2
+USE_XORG=	ice sm x11 xext xrender
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-guievents \
 		--with-cfgdir=${DATADIR} \
 		--with-libdir=${DATADIR} \
 		--with-kdedatadir=${LOCALBASE}/share \
 		--with-docdir=${PREFIX}/share/doc \
 		--with-mkfontdir=${NONEXISTENT}
 
 OPTIONS_DEFINE=		BEASTIE ESOUND GNOME LITE MENUFIX NLS XFT XINERAMA \
 			XRANDR DOCS
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	BEASTIE MENUFIX XFT XINERAMA XRANDR
 OPTIONS_DEFAULT_i386=	ASM
 OPTIONS_SUB=		yes
 
 BEASTIE_DESC=		Use Beastie'fied startup button
 ESOUND_USE=		GNOME=esound
 ESOUND_CONFIGURE_ON=	--with-icesound=esound
 ESOUND_CONFIGURE_OFF=	--with-icesound=oss
 GNOME_DESC=		Display GNOME 2 menus
 GNOME_USE=		GNOME=gnomedesktop,libgnomeui
 GNOME_CONFIGURE_ENABLE=	menus-gnome2
 LITE_CONFIGURE_ENABLE=	lite
 MENUFIX_DESC=		MenuIconSize fix
 MENUFIX_EXTRA_PATCHES=	${FILESDIR}/extra-menu-icon-fix.patch
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 XFT_CONFIGURE_OFF=	--enable-corefonts --disable-xfreetype
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=	xinerama
 XRANDR_USE=		XORG=xrandr
 XRANDR_CONFIGURE_ENABLE=	xrandr
 ASM_CONFIGURE_ENABLE=	x86-asm
 BEASTIE_VARS=		STARTUP_PIXMAP=${DATADIR}/taskbar/bsd-daemon.xpm
 BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 
 post-extract:
 .for dir in taskbar themes/Infadel2/taskbar
 	@cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm
 .endfor
 	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/control|${LOCALBASE}/share/control|g ; \
 		 s|/usr/share/app|${LOCALBASE}/share/app|g ; \
 		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
 		 ${WRKSRC}/src/gnome2.cc
 	@${REINPLACE_CMD} -e \
 		's|SHELL=.*|SHELL=@SHELL@| ; \
 		 s|icewm-set-gnomewm||g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|icewm-$$(VERSION)|icewm| ; \
 		 s|`pkg-config fontconfig --cflags`|| ; \
 		 s|`pkg-config fontconfig --libs`|| ; \
 		 /@echo/s|^|#| ; \
 		 s|@$$(|$$(|' ${WRKSRC}/src/Makefile.in
 
 post-install:
 .for dir in taskbar themes/Infadel2/taskbar
 	@${LN} -s ${STARTUP_PIXMAP} ${STAGEDIR}${DATADIR}/${dir}/start.xpm
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES INSTALL README TODO doc/*.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/icewm/files/patch-src__wmapp.cc
===================================================================
--- head/x11-wm/icewm/files/patch-src__wmapp.cc	(revision 472513)
+++ head/x11-wm/icewm/files/patch-src__wmapp.cc	(revision 472514)
@@ -1,20 +1,29 @@
---- src/wmapp.cc.orig
+--- src/wmapp.cc.orig	2013-11-17 16:54:39 UTC
 +++ src/wmapp.cc
-@@ -337,7 +337,7 @@
+@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
+ #endif
+ 
+     long pid = getpid();
+-    const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
++    const char wmname[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
+ 
+ #ifdef GNOME1_HINTS
+     XChangeProperty(xapp->display(), xid, 
+@@ -337,7 +337,7 @@ static void initFontPath(IApp *app) {
              int ndirs; // ------------------- retrieve the old X's font path ---
              char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
  
 -            char ** newFontPath = new char *[ndirs + 1];
 +            const char ** newFontPath = new const char *[ndirs + 1];
              newFontPath[ndirs] = fontsdir;
  
              if (fontPath)
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ static void initFontPath(IApp *app) {
              XChangeProperty(xapp->display(), manager->handle(),
                              XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
                              (unsigned char *) fontsdir, strlen(fontsdir));
 -            XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
 +            XSetFontPath(xapp->display(), (char **) newFontPath, ndirs + 1);
  
              if (fontPath) XFreeFontPath(fontPath);
              delete[] fontsdir;