3 files changed, 35 insertions, 30 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index aefe3cd849db..751af33f2fa3 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.9
+PORTVERSION=	1.2.10
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--disable-xfreetype \
+CONFIGURE_ARGS=	--enable-shaped-decorations \
 		--with-cfgdir=${DATADIR} \
 		--with-libdir=${DATADIR} \
 		--with-kdedatadir=${LOCALBASE}/share \
@@ -34,8 +34,8 @@ CONFIGURE_ARGS=	--disable-xfreetype \
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomedesktop}!=""
-USE_GNOME+=	gnomedesktop
-CONFIGURE_ARGS+=	--with-imlib --without-xpm --enable-menus-gnome \
+USE_GNOME+=	gnomedesktop imlib
+CONFIGURE_ARGS+=	--with-imlib --without-xpm --enable-menus-gnome2 \
 			--enable-guievents --with-icesound=esound
 INSTALL_TARGET=		install install-gnome
 PLIST_SUB+=	ESOUND="" GNOMEDESKTOP=""
@@ -48,10 +48,14 @@ USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-guievents --with-icesound=esound
 PLIST_SUB+=	ESOUND="" GNOMEDESKTOP="@comment "
 .else
-PLIST_SUB+=	ESOUND="@comment " GNOMEDESKTOP="@comment " 
+PLIST_SUB+=	ESOUND="@comment " GNOMEDESKTOP="@comment "
 .endif
 .endif
 
+.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT)
+CONFIGURE_ARGS+=	--enable-corefonts --disable-xfreetype
+.endif
+
 post-patch:
 .for file in src/gnome2.cc
 	@${REINPLACE_CMD} -e \
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 0ba030aed313..086564cf7b37 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.2.9.tar.gz) = fe8ff73efc80a6c9eea34c26c66e0c53
+MD5 (icewm-1.2.10.tar.gz) = 3c6835d0e17ad158922ea1ddd0cb60de
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index bbb0d4f246dc..d408b842f065 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -7,29 +7,30 @@ bin/icewm
 bin/icewmbg
 bin/icewmhint
 bin/icewmtray
-%%PORTDOCS%%share/doc/icewm/CHANGES
-%%PORTDOCS%%share/doc/icewm/INSTALL
-%%PORTDOCS%%share/doc/icewm/README
-%%PORTDOCS%%share/doc/icewm/TODO
-%%PORTDOCS%%share/doc/icewm/icewm-1.html
-%%PORTDOCS%%share/doc/icewm/icewm-10.html
-%%PORTDOCS%%share/doc/icewm/icewm-11.html
-%%PORTDOCS%%share/doc/icewm/icewm-12.html
-%%PORTDOCS%%share/doc/icewm/icewm-13.html
-%%PORTDOCS%%share/doc/icewm/icewm-14.html
-%%PORTDOCS%%share/doc/icewm/icewm-15.html
-%%PORTDOCS%%share/doc/icewm/icewm-16.html
-%%PORTDOCS%%share/doc/icewm/icewm-17.html
-%%PORTDOCS%%share/doc/icewm/icewm-18.html
-%%PORTDOCS%%share/doc/icewm/icewm-2.html
-%%PORTDOCS%%share/doc/icewm/icewm-3.html
-%%PORTDOCS%%share/doc/icewm/icewm-4.html
-%%PORTDOCS%%share/doc/icewm/icewm-5.html
-%%PORTDOCS%%share/doc/icewm/icewm-6.html
-%%PORTDOCS%%share/doc/icewm/icewm-7.html
-%%PORTDOCS%%share/doc/icewm/icewm-8.html
-%%PORTDOCS%%share/doc/icewm/icewm-9.html
-%%PORTDOCS%%share/doc/icewm/icewm.html
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/icewm-1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-10.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-11.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-12.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-13.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-14.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-15.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-16.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-17.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-18.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-19.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-2.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-3.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-4.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-6.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-7.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-8.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-9.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm.html
 %%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
 share/icewm/icons/app_16x16.xpm
 share/icewm/icons/app_32x32.xpm
@@ -361,4 +362,4 @@ share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm share/icewm/ledclock
 @dirrm share/icewm/icons
 @dirrm share/icewm
-%%PORTDOCS%%@dirrm share/doc/icewm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%