84 files changed, 13 insertions, 30 deletions

diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index ad6e36cedb3f..cb338b3b7053 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -7,14 +7,13 @@ DISTVERSIONPREFIX=	athena-
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	XCONTRIB/../R5contrib
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quick start up utility for applications on an X display
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		imake perl5
+USES=		imake perl5 tar:Z
 USE_PERL5=	build
 USE_XORG=	xaw
 
diff --git a/x11/bricons/files/patch-aa b/x11/bricons/files/patch-Imakefile
index a559725121f7..a559725121f7 100644
--- a/x11/bricons/files/patch-aa
+++ b/x11/bricons/files/patch-Imakefile
diff --git a/x11/bricons/files/patch-ac b/x11/bricons/files/patch-Xbricons
index ba87b18d4bc4..ba87b18d4bc4 100644
--- a/x11/bricons/files/patch-ac
+++ b/x11/bricons/files/patch-Xbricons
diff --git a/x11/dgs/files/patch-ah b/x11/dgs/files/patch-configure
index e14d0a37eb93..e14d0a37eb93 100644
--- a/x11/dgs/files/patch-ah
+++ b/x11/dgs/files/patch-configure
diff --git a/x11/gmessage/files/patch-aa b/x11/gmessage/files/patch-Makefile
index ee720e257893..ee720e257893 100644
--- a/x11/gmessage/files/patch-aa
+++ b/x11/gmessage/files/patch-Makefile
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-configure
index 8a9822d48f15..8a9822d48f15 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-configure
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 3a846faa78d5..0cef3430d75c 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -16,12 +16,8 @@ USES=		gmake
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR}/README
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-theme-switch/files/patch-aa b/x11/gtk-theme-switch/files/patch-Makefile
index 6bf39f4ad6c3..6bf39f4ad6c3 100644
--- a/x11/gtk-theme-switch/files/patch-aa
+++ b/x11/gtk-theme-switch/files/patch-Makefile
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index b90f0ae20252..e0aee428b295 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -20,17 +20,13 @@ CONFIGURE_ARGS=	--disable-gpm
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 .for i in imwheel.1 util.c
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
 .endfor
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/imwheel/files/patch-ae b/x11/imwheel/files/patch-imwheel.1
index b8dad75d9412..b8dad75d9412 100644
--- a/x11/imwheel/files/patch-ae
+++ b/x11/imwheel/files/patch-imwheel.1
diff --git a/x11/imwheel/files/patch-af b/x11/imwheel/files/patch-imwheelrc
index 8aa449a9517e..8aa449a9517e 100644
--- a/x11/imwheel/files/patch-af
+++ b/x11/imwheel/files/patch-imwheelrc
diff --git a/x11/kb2mb2/files/patch-aa b/x11/kb2mb2/files/patch-Imakefile
index e2b40d26aaec..e2b40d26aaec 100644
--- a/x11/kb2mb2/files/patch-aa
+++ b/x11/kb2mb2/files/patch-Imakefile
diff --git a/x11/kb2mb2/files/patch-ab b/x11/kb2mb2/files/patch-kb2mb2.c
index 20283f89c1be..20283f89c1be 100644
--- a/x11/kb2mb2/files/patch-ab
+++ b/x11/kb2mb2/files/patch-kb2mb2.c
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index a991282a55af..b497300f5226 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -7,11 +7,11 @@ PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://leb.net/offix/
 DISTNAME=	dnd.${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drag and drop library
 
+USES=		tar:tgz
 USE_XORG=	x11 xmu ice xaw
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/DND/DNDlib
@@ -22,12 +22,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/libdnd
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11/libdnd/files/patch-aa b/x11/libdnd/files/patch-DragAndDrop.c
index b00afd5333d9..b00afd5333d9 100644
--- a/x11/libdnd/files/patch-aa
+++ b/x11/libdnd/files/patch-DragAndDrop.c
diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-Makefile.in
index 0fbdb3549d4f..0fbdb3549d4f 100644
--- a/x11/libdnd/files/patch-ab
+++ b/x11/libdnd/files/patch-Makefile.in
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 9eb9e2588a1f..d160a349d9f6 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -8,13 +8,13 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	libraries
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple X11 library
 
 LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
 
+USES=		tar:Z
 USE_XORG=	x11 xaw xext xmu xt
 ALL_TARGET=	src freq
 MAKE_JOBS_UNSAFE=	yes
diff --git a/x11/libsx/files/patch-ab b/x11/libsx/files/patch-freq-dirlist.c
index d297c2dedb32..d297c2dedb32 100644
--- a/x11/libsx/files/patch-ab
+++ b/x11/libsx/files/patch-freq-dirlist.c
diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-libsx_defs
index f412ab17ba0c..f412ab17ba0c 100644
--- a/x11/libsx/files/patch-aa
+++ b/x11/libsx/files/patch-libsx_defs
diff --git a/x11/p5-X11-IdleTime/files/patch-aa b/x11/p5-X11-IdleTime/files/patch-IdleTime.pm
index 1e35f2ea03a5..1e35f2ea03a5 100644
--- a/x11/p5-X11-IdleTime/files/patch-aa
+++ b/x11/p5-X11-IdleTime/files/patch-IdleTime.pm
diff --git a/x11/props/files/patch-aa b/x11/props/files/patch-l10n_props.h
index fe1c81f27fd8..fe1c81f27fd8 100644
--- a/x11/props/files/patch-aa
+++ b/x11/props/files/patch-l10n_props.h
diff --git a/x11/props/files/patch-ab b/x11/props/files/patch-l10n_read.c
index cad9fb899fda..cad9fb899fda 100644
--- a/x11/props/files/patch-ab
+++ b/x11/props/files/patch-l10n_read.c
diff --git a/x11/props/files/patch-ac b/x11/props/files/patch-props.c
index a2a8838bed5d..a2a8838bed5d 100644
--- a/x11/props/files/patch-ac
+++ b/x11/props/files/patch-props.c
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-Makefile.in
index f07f98d8a4d8..f07f98d8a4d8 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-Makefile.in
diff --git a/x11/rxvt-devel/files/patch-ad b/x11/rxvt-devel/files/patch-autoconf__config.h.in
index 6dc47b63b56e..6dc47b63b56e 100644
--- a/x11/rxvt-devel/files/patch-ad
+++ b/x11/rxvt-devel/files/patch-autoconf__config.h.in
diff --git a/x11/rxvt-devel/files/patch-ac b/x11/rxvt-devel/files/patch-doc__Makefile.in
index 6dc0d7630cb4..6dc0d7630cb4 100644
--- a/x11/rxvt-devel/files/patch-ac
+++ b/x11/rxvt-devel/files/patch-doc__Makefile.in
diff --git a/x11/rxvt-devel/files/patch-src::command.c b/x11/rxvt-devel/files/patch-src__command.c
index 3aa7b9478e6e..3aa7b9478e6e 100644
--- a/x11/rxvt-devel/files/patch-src::command.c
+++ b/x11/rxvt-devel/files/patch-src__command.c
diff --git a/x11/rxvt-devel/files/patch-src::init.c b/x11/rxvt-devel/files/patch-src__init.c
index 262158bd0e6b..262158bd0e6b 100644
--- a/x11/rxvt-devel/files/patch-src::init.c
+++ b/x11/rxvt-devel/files/patch-src__init.c
diff --git a/x11/rxvt-devel/files/patch-src::rxvt.h b/x11/rxvt-devel/files/patch-src__rxvt.h
index c3c5b44495c5..c3c5b44495c5 100644
--- a/x11/rxvt-devel/files/patch-src::rxvt.h
+++ b/x11/rxvt-devel/files/patch-src__rxvt.h
diff --git a/x11/rxvt-devel/files/patch-src-screen.c b/x11/rxvt-devel/files/patch-src__screen.c
index 1691e3704745..1691e3704745 100644
--- a/x11/rxvt-devel/files/patch-src-screen.c
+++ b/x11/rxvt-devel/files/patch-src__screen.c
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-Makefile.in
index e90f485112ef..e90f485112ef 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-Makefile.in
diff --git a/x11/rxvt/files/patch-ac b/x11/rxvt/files/patch-autoconf__config.h.in
index 5e70c833507b..5e70c833507b 100644
--- a/x11/rxvt/files/patch-ac
+++ b/x11/rxvt/files/patch-autoconf__config.h.in
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-doc__Makefile.in
index a2c62c26ff94..a2c62c26ff94 100644
--- a/x11/rxvt/files/patch-ab
+++ b/x11/rxvt/files/patch-doc__Makefile.in
diff --git a/x11/rxvt/files/patch-ad b/x11/rxvt/files/patch-src__command.c
index fa962bd1fd41..fa962bd1fd41 100644
--- a/x11/rxvt/files/patch-ad
+++ b/x11/rxvt/files/patch-src__command.c
diff --git a/x11/rxvt/files/patch-grkelot.c b/x11/rxvt/files/patch-src__grkelot.c
index c5824b44e0a1..c5824b44e0a1 100644
--- a/x11/rxvt/files/patch-grkelot.c
+++ b/x11/rxvt/files/patch-src__grkelot.c
diff --git a/x11/rxvt/files/patch-logging.c b/x11/rxvt/files/patch-src__logging.c
index 63bc9440d194..63bc9440d194 100644
--- a/x11/rxvt/files/patch-logging.c
+++ b/x11/rxvt/files/patch-src__logging.c
diff --git a/x11/rxvt/files/patch-screen.c b/x11/rxvt/files/patch-src__screen.c
index 87eb488ceed3..87eb488ceed3 100644
--- a/x11/rxvt/files/patch-screen.c
+++ b/x11/rxvt/files/patch-src__screen.c
diff --git a/x11/sxpc/files/patch-aa b/x11/sxpc/files/patch-sxpc.c
index ca67df3576c3..ca67df3576c3 100644
--- a/x11/sxpc/files/patch-aa
+++ b/x11/sxpc/files/patch-sxpc.c
diff --git a/x11/tycoon/files/patch-ae b/x11/tycoon/files/patch-fclock__Imakefile
index 051828969862..051828969862 100644
--- a/x11/tycoon/files/patch-ae
+++ b/x11/tycoon/files/patch-fclock__Imakefile
diff --git a/x11/tycoon/files/patch-ab b/x11/tycoon/files/patch-tycoon__Imakefile
index 9b7852d76641..9b7852d76641 100644
--- a/x11/tycoon/files/patch-ab
+++ b/x11/tycoon/files/patch-tycoon__Imakefile
diff --git a/x11/tycoon/files/patch-af b/x11/tycoon/files/patch-tyman__Imakefile
index ca60cc1153e4..ca60cc1153e4 100644
--- a/x11/tycoon/files/patch-af
+++ b/x11/tycoon/files/patch-tyman__Imakefile
diff --git a/x11/tycoon/files/patch-ac b/x11/tycoon/files/patch-xbackdrop__Imakefile
index ea9b55dc277b..ea9b55dc277b 100644
--- a/x11/tycoon/files/patch-ac
+++ b/x11/tycoon/files/patch-xbackdrop__Imakefile
diff --git a/x11/tycoon/files/patch-ad b/x11/tycoon/files/patch-xchooser__Imakefile
index 47aa2a19c484..47aa2a19c484 100644
--- a/x11/tycoon/files/patch-ad
+++ b/x11/tycoon/files/patch-xchooser__Imakefile
diff --git a/x11/tycoon/files/patch-aa b/x11/tycoon/files/patch-xprompt__Imakefile
index 15122fe8a0a5..15122fe8a0a5 100644
--- a/x11/tycoon/files/patch-aa
+++ b/x11/tycoon/files/patch-xprompt__Imakefile
diff --git a/x11/wmmatrix/files/patch-aa b/x11/wmmatrix/files/patch-Makefile
index 15e9328637a6..15e9328637a6 100644
--- a/x11/wmmatrix/files/patch-aa
+++ b/x11/wmmatrix/files/patch-Makefile
diff --git a/x11/xantfarm/files/patch-aa b/x11/xantfarm/files/patch-xantfarm.c
index 1b9233617dc7..1b9233617dc7 100644
--- a/x11/xantfarm/files/patch-aa
+++ b/x11/xantfarm/files/patch-xantfarm.c
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index e619c9443156..9e60a5a22bb2 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -7,16 +7,15 @@ PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/screensavers
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Activate xlock after a user defined time of inactivity
 
-USES=		imake gmake		# gmake is needed for -jX builds
+USES=		tar:tgz imake gmake		# gmake is needed for -jX builds
 USE_XORG=	x11 xext xscrnsaver
 
 OPTIONS_DEFINE=	XLOCK
-OPTIONS_DEFAULT=	XLOCK
+OPTIONS_DEFAULT=XLOCK
 XLOCK_DESC=	Force dependency on x11/xlockmore
 
 XLOCK_RUN_DEPENDS=	xlock:${PORTSDIR}/x11/xlockmore
diff --git a/x11/xautolock/files/patch-ab b/x11/xautolock/files/patch-include__options.h
index 1e5c5f918440..1e5c5f918440 100644
--- a/x11/xautolock/files/patch-ab
+++ b/x11/xautolock/files/patch-include__options.h
diff --git a/x11/xautolock/files/patch-aa b/x11/xautolock/files/patch-src__engine.c
index eba24b2eb563..eba24b2eb563 100644
--- a/x11/xautolock/files/patch-aa
+++ b/x11/xautolock/files/patch-src__engine.c
diff --git a/x11/xautolock/files/patch-ac b/x11/xautolock/files/patch-src__message.c
index c60f93893974..c60f93893974 100644
--- a/x11/xautolock/files/patch-ac
+++ b/x11/xautolock/files/patch-src__message.c
diff --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-Makefile
index 231e7a92c1cc..231e7a92c1cc 100644
--- a/x11/xbanner/files/patch-aa
+++ b/x11/xbanner/files/patch-Makefile
diff --git a/x11/xbanner/files/patch-ad b/x11/xbanner/files/patch-headers
index 65867854f820..65867854f820 100644
--- a/x11/xbanner/files/patch-ad
+++ b/x11/xbanner/files/patch-headers
diff --git a/x11/xbanner/files/patch-ae b/x11/xbanner/files/patch-samples__XBanner.ad
index 8363c175e201..8363c175e201 100644
--- a/x11/xbanner/files/patch-ae
+++ b/x11/xbanner/files/patch-samples__XBanner.ad
diff --git a/x11/xbanner/files/patch-ab b/x11/xbanner/files/patch-xb_check.c
index 48705ce3cfff..48705ce3cfff 100644
--- a/x11/xbanner/files/patch-ab
+++ b/x11/xbanner/files/patch-xb_check.c
diff --git a/x11/xbanner/files/patch-ac b/x11/xbanner/files/patch-xres.c
index e6ff71c417c0..e6ff71c417c0 100644
--- a/x11/xbanner/files/patch-ac
+++ b/x11/xbanner/files/patch-xres.c
diff --git a/x11/xcolors/files/patch-aa b/x11/xcolors/files/patch-Imakefile
index f4503402ba48..f4503402ba48 100644
--- a/x11/xcolors/files/patch-aa
+++ b/x11/xcolors/files/patch-Imakefile
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 5b6f208a8c1a..e8b23814a6c8 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://acsys.anu.edu.au/~tpot/%SUBDIR%/
 
-
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manipulate X cut buffers from the commandline
 
diff --git a/x11/xcut/files/patch-aa b/x11/xcut/files/patch-Imakefile
index 1ac717af3517..1ac717af3517 100644
--- a/x11/xcut/files/patch-aa
+++ b/x11/xcut/files/patch-Imakefile
diff --git a/x11/xfishtank/files/patch-ab b/x11/xfishtank/files/patch-Imakefile
index 77e934fa36d6..77e934fa36d6 100644
--- a/x11/xfishtank/files/patch-ab
+++ b/x11/xfishtank/files/patch-Imakefile
diff --git a/x11/xfishtank/files/patch-aa b/x11/xfishtank/files/patch-xfish.c
index 6dfc69d767f3..6dfc69d767f3 100644
--- a/x11/xfishtank/files/patch-aa
+++ b/x11/xfishtank/files/patch-xfish.c
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 02421e49658a..e6d968098fdc 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -8,14 +8,13 @@ CATEGORIES=	x11
 MASTER_SITES=	XCONTRIB
 MASTER_SITE_SUBDIR=	applications
 DISTNAME=	${PORTNAME}sc.2_41
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 image grabber
 
 BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
-USES=		display:build imake:notall
+USES=		display:build imake:notall tar:Z
 USE_XORG=	x11
 
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
diff --git a/x11/xgrab/files/patch-aa b/x11/xgrab/files/patch-Imakefile
index 76c0747ac4c2..76c0747ac4c2 100644
--- a/x11/xgrab/files/patch-aa
+++ b/x11/xgrab/files/patch-Imakefile
diff --git a/x11/xgrab/files/patch-ab b/x11/xgrab/files/patch-xgrabsc.c
index d0d0449d5a31..d0d0449d5a31 100644
--- a/x11/xgrab/files/patch-ab
+++ b/x11/xgrab/files/patch-xgrabsc.c
diff --git a/x11/xkbctrl/files/patch-aa b/x11/xkbctrl/files/patch-Imakefile
index 60aec48104e4..60aec48104e4 100644
--- a/x11/xkbctrl/files/patch-aa
+++ b/x11/xkbctrl/files/patch-Imakefile
diff --git a/x11/xkbctrl/files/patch-ab b/x11/xkbctrl/files/patch-xkbctrl.c
index fbc6774de8c8..fbc6774de8c8 100644
--- a/x11/xkbctrl/files/patch-ab
+++ b/x11/xkbctrl/files/patch-xkbctrl.c
diff --git a/x11/xkeywrap/files/patch-aa b/x11/xkeywrap/files/patch-Makefile
index 4f6e9f18c458..4f6e9f18c458 100644
--- a/x11/xkeywrap/files/patch-aa
+++ b/x11/xkeywrap/files/patch-Makefile
diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-xlock-XLock.ad
index dcdd5974be42..dcdd5974be42 100644
--- a/x11/xlockmore/files/patch-aa
+++ b/x11/xlockmore/files/patch-xlock-XLock.ad
diff --git a/x11/xmascot/files/patch-aa b/x11/xmascot/files/patch-config.tmpl
index eafaddf1910e..eafaddf1910e 100644
--- a/x11/xmascot/files/patch-aa
+++ b/x11/xmascot/files/patch-config.tmpl
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index f590f8985002..6660a4157b69 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -6,12 +6,12 @@ PORTVERSION=	1.1
 PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X protocol multiplexor
 
 USE_XORG=	x11
+USES=		tar:Z
 
 PLIST_FILES=	bin/xmx man/man1/xmx.1.gz
 
diff --git a/x11/xmx/files/patch-aa b/x11/xmx/files/patch-Makefile
index d8ac3b0afbcb..d8ac3b0afbcb 100644
--- a/x11/xmx/files/patch-aa
+++ b/x11/xmx/files/patch-Makefile
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index eb25952a960f..9f10061c3097 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -20,4 +20,5 @@ NO_WRKSUBDIR=	yes
 USES=		imake
 USE_XORG=	x11
 PLIST_FILES=	bin/xskyroot
+
 .include <bsd.port.mk>
diff --git a/x11/xskyroot/files/patch-ac b/x11/xskyroot/files/patch-Imakefile
index 571af377cb00..571af377cb00 100644
--- a/x11/xskyroot/files/patch-ac
+++ b/x11/xskyroot/files/patch-Imakefile
diff --git a/x11/xskyroot/files/patch-ab b/x11/xskyroot/files/patch-astro.c
index 16c3108c3ace..16c3108c3ace 100644
--- a/x11/xskyroot/files/patch-ab
+++ b/x11/xskyroot/files/patch-astro.c
diff --git a/x11/xskyroot/files/patch-aa b/x11/xskyroot/files/patch-xsyroot.c
index c2152bca70f1..c2152bca70f1 100644
--- a/x11/xskyroot/files/patch-aa
+++ b/x11/xskyroot/files/patch-xsyroot.c
diff --git a/x11/xtacy/files/patch-aa b/x11/xtacy/files/patch-Imakefile
index 3867bfb393a6..3867bfb393a6 100644
--- a/x11/xtacy/files/patch-aa
+++ b/x11/xtacy/files/patch-Imakefile
diff --git a/x11/xvkbd/files/patch-aa b/x11/xvkbd/files/patch-Imakefile
index 3938b9e01c95..3938b9e01c95 100644
--- a/x11/xvkbd/files/patch-aa
+++ b/x11/xvkbd/files/patch-Imakefile
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index 4124dbc2be3b..0970ae258451 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
 DISTNAME=	xwatchwin
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Watch a window on another X server
@@ -16,7 +15,7 @@ COMMENT=	Watch a window on another X server
 PLIST_FILES=	bin/xwatchwin \
 		man/man1/xwatchwin.1.gz
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	x11 xext
 
 .include <bsd.port.mk>
diff --git a/x11/xwatchwin/files/patch-aa b/x11/xwatchwin/files/patch-xwatchwin.c
index 29f23632a7fa..29f23632a7fa 100644
--- a/x11/xwatchwin/files/patch-aa
+++ b/x11/xwatchwin/files/patch-xwatchwin.c
diff --git a/x11/xwatchwin/files/patch-ab b/x11/xwatchwin/files/patch-xwatchwin.man
index 905497614b70..905497614b70 100644
--- a/x11/xwatchwin/files/patch-ab
+++ b/x11/xwatchwin/files/patch-xwatchwin.man
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 451ae024a069..17a0f94ae2c5 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -7,12 +7,11 @@ PORTREVISION=	2
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/X
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnify, rotate, mirror the image on the X screen
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	x11 xext
 PLIST_FILES=	bin/xzoom man/man1/xzoom.1.gz
 
diff --git a/x11/xzoom/files/patch-aa b/x11/xzoom/files/patch-Imakefile
index de8ccd7efd1e..de8ccd7efd1e 100644
--- a/x11/xzoom/files/patch-aa
+++ b/x11/xzoom/files/patch-Imakefile
diff --git a/x11/xzoom/files/patch-ab b/x11/xzoom/files/patch-scale.h
index 46728bbc46f1..46728bbc46f1 100644
--- a/x11/xzoom/files/patch-ab
+++ b/x11/xzoom/files/patch-scale.h
diff --git a/x11/xzoom/files/patch-ac b/x11/xzoom/files/patch-xzoom.c
index 0a5ed453d0f3..0a5ed453d0f3 100644
--- a/x11/xzoom/files/patch-ac
+++ b/x11/xzoom/files/patch-xzoom.c
diff --git a/x11/xzoom/files/patch-ad b/x11/xzoom/files/patch-xzoom.man
index e47b307f4a81..e47b307f4a81 100644
--- a/x11/xzoom/files/patch-ad
+++ b/x11/xzoom/files/patch-xzoom.man