Index: x11-wm/sawfish/Makefile
===================================================================
--- x11-wm/sawfish/Makefile	(revision 323833)
+++ x11-wm/sawfish/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sawfish
 PORTVERSION=	1.9.1
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://download.tuxfamily.org/sawfish/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Archive
@@ -15,20 +15,17 @@
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
-LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
-		rep:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep:${PORTSDIR}/lang/librep
 RUN_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst
-USE_GNOME=	gnomehier gtk20
-USE_GMAKE=	yes
+USE_GNOME=	cairo gnomehier gtk20 pangox-compat
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 INSTALLS_ICONS=	yes
-MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: chinese/fcitx/Makefile
===================================================================
--- chinese/fcitx/Makefile	(revision 323833)
+++ chinese/fcitx/Makefile	(working copy)
@@ -4,7 +4,7 @@
 PORTNAME=	fcitx
 PORTVERSION=	4.2.6.1
 CATEGORIES=	chinese x11
-PORTREVISION=	1
+PORTREVISION=	2
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz
@@ -30,10 +30,10 @@
 CONFLICTS=	zh-scim-fcitx-3.*
 
 USE_XZ=		yes
-USE_GNOME=	pango intltool libxml2 gnomehack
+USE_GNOME=	pango intltool libxml2 introspection
 USE_XORG=	x11 xext xkbfile
 USE_LDCONFIG=	yes
-USES=		cmake gettext
+USES=		cmake gettext pathfix
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC