Index: head/x11-wm/obconf/Makefile
===================================================================
--- head/x11-wm/obconf/Makefile	(revision 375283)
+++ head/x11-wm/obconf/Makefile	(revision 375284)
@@ -1,48 +1,49 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	obconf
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/obconf/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Preferences manager for the Openbox window manager
 
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libobrender.so:${PORTSDIR}/x11-wm/openbox
 
 USES=		pkgconfig desktop-file-utils shared-mime-info
-USE_GNOME=	gnomehier libglade2
+USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
 		OPENBOX_LIBS="`pkg-config --libs obrender-3.5 obt-3.5`"
 CONFIGURE_ARGS=	--sysconfdir=${STAGEDIR}${PREFIX}/etc/openbox
 MAKE_ARGS=	mkdir_p='${MKDIR}'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	ABOUT-NLS AUTHORS README TODO
 
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/x11-wm/sawfish/Makefile
===================================================================
--- head/x11-wm/sawfish/Makefile	(revision 375283)
+++ head/x11-wm/sawfish/Makefile	(revision 375284)
@@ -1,51 +1,52 @@
 # Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sawfish
 PORTVERSION=	1.11
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://download.tuxfamily.org/sawfish/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible window manager using Lisp-based scripting language
 
 LICENSE=	ART20 GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 LIB_DEPENDS=	librep.so:${PORTSDIR}/lang/librep
 RUN_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 USES=		gmake libtool makeinfo pathfix pkgconfig tar:xz
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst
-USE_GNOME=	cairo gnomehier gtk20
+USE_GNOME=	cairo gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		sawfish
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--without-nls
 
 post-extract:
 	@${RM} ${WRKSRC}/themes/StyleTab/Flat/.directory
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/dnsdomainname/d' ${WRKSRC}/build-info
 	@${REINPLACE_CMD} -e \
 		'/KDEDIR/s|^|#|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|prog_name|program_name|g' ${WRKSRC}/src/main.c
 
 .include <bsd.port.mk>