81 files changed, 20 insertions, 33 deletions
diff --git a/x11-clocks/abclock/files/patch-ab b/x11-clocks/abclock/files/patch-abclock.c
index cda70d8b44f7..cda70d8b44f7 100644
--- a/x11-clocks/abclock/files/patch-ab
+++ b/x11-clocks/abclock/files/patch-abclock.c
diff --git a/x11-clocks/asclock-gtk/files/patch-aa b/x11-clocks/asclock-gtk/files/patch-Makefile
index 2fce2ef50671..2fce2ef50671 100644
--- a/x11-clocks/asclock-gtk/files/patch-aa
+++ b/x11-clocks/asclock-gtk/files/patch-Makefile
diff --git a/x11-clocks/asclock-gtk/files/patch-ac b/x11-clocks/asclock-gtk/files/patch-config.c
index 1e591468b1ce..1e591468b1ce 100644
--- a/x11-clocks/asclock-gtk/files/patch-ac
+++ b/x11-clocks/asclock-gtk/files/patch-config.c
diff --git a/x11-clocks/asclock-gtk/files/patch-ab b/x11-clocks/asclock-gtk/files/patch-configure
index 46304a114798..46304a114798 100644
--- a/x11-clocks/asclock-gtk/files/patch-ab
+++ b/x11-clocks/asclock-gtk/files/patch-configure
diff --git a/x11-clocks/asclock-gtk/files/patch-led.xpm b/x11-clocks/asclock-gtk/files/patch-themes__classic__led.xpm
index bfcdb79c9a57..bfcdb79c9a57 100644
--- a/x11-clocks/asclock-gtk/files/patch-led.xpm
+++ b/x11-clocks/asclock-gtk/files/patch-themes__classic__led.xpm
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index ab5e6774bb2c..bc7a58434384 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://ftp.vector.co.jp/pack/unix/personal/tokei/
 DISTNAME=	eyeclk20
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clock with eyes following the mouse pointer
@@ -15,6 +14,7 @@ COMMENT=	Clock with eyes following the mouse pointer
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ENV=	X11BASE=${LOCALBASE}
 USE_XORG=	x11 xau xdmcp xpm xt ice
+USES=		tar:tgz
 
 post-patch:
 	@${REINPLACE_CMD} -e "s#gcc#${CC}#" ${WRKSRC}/Makefile
diff --git a/x11-clocks/eyeclock/files/patch-aa b/x11-clocks/eyeclock/files/patch-Makefile
index c8327404ade1..c8327404ade1 100644
--- a/x11-clocks/eyeclock/files/patch-aa
+++ b/x11-clocks/eyeclock/files/patch-Makefile
diff --git a/x11-clocks/eyeclock/files/patch-ab b/x11-clocks/eyeclock/files/patch-main.c
index 82004a1beba9..82004a1beba9 100644
--- a/x11-clocks/eyeclock/files/patch-ab
+++ b/x11-clocks/eyeclock/files/patch-main.c
diff --git a/x11-clocks/mouseclock/files/patch-01 b/x11-clocks/mouseclock/files/patch-mouseclock.c
index 00b230a5ac00..00b230a5ac00 100644
--- a/x11-clocks/mouseclock/files/patch-01
+++ b/x11-clocks/mouseclock/files/patch-mouseclock.c
diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile
index 63dcfec05e03..d87e2bf0ca6d 100644
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	0.06
 PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Swiss railway clock emulation, and a fancy default appearance
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	ice sm x11 xext xmu xt
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/swisswatch/files/patch-aa b/x11-clocks/swisswatch/files/patch-Imakefile
index add8b9947a2c..add8b9947a2c 100644
--- a/x11-clocks/swisswatch/files/patch-aa
+++ b/x11-clocks/swisswatch/files/patch-Imakefile
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index c85371dea1b9..0b7704986c3f 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -7,13 +7,12 @@ PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.linta.de/distfiles/ \
 		ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	aehlig@linta.de
 COMMENT=	Transparent analog clock for x11
 
 NO_WRKSUBDIR=	yes
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	x11 xext
 PLIST_FILES=	bin/tclock man/man1/${PORTNAME}.1.gz
 
diff --git a/x11-clocks/tclock/files/patch-aa b/x11-clocks/tclock/files/patch-tclock.c
index f00126bca744..f00126bca744 100644
--- a/x11-clocks/tclock/files/patch-aa
+++ b/x11-clocks/tclock/files/patch-tclock.c
diff --git a/x11-clocks/wmtime/files/patch-ab b/x11-clocks/wmtime/files/patch-Imakefile
index 626fd85c6236..626fd85c6236 100644
--- a/x11-clocks/wmtime/files/patch-ab
+++ b/x11-clocks/wmtime/files/patch-Imakefile
diff --git a/x11-clocks/wmtime/files/patch-aa b/x11-clocks/wmtime/files/patch-wmtime.c2
index b60722ad0c97..b60722ad0c97 100644
--- a/x11-clocks/wmtime/files/patch-aa
+++ b/x11-clocks/wmtime/files/patch-wmtime.c2
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 84b0d408b666..b70d72c774e3 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	7
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 DISTNAME=	EZFM-${PORTVERSION:R}-src
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	EZWGL-based file manager for X Window System
@@ -17,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libEZ.so:${PORTSDIR}/graphics/EZWGL
 
-USES=		gmake
+USES=		gmake tar:tgz
 
 WRKSRC=		${WRKDIR}/EZFM-${PORTVERSION}
 
@@ -28,7 +27,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/ezfmIcons
-	cd ${WRKSRC}/ezfmIcons && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/ezfmIcons
+	(cd ${WRKSRC}/ezfmIcons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ezfmIcons)
 	${INSTALL_MAN} ${WRKSRC}/ezfm.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-Makefile
index 26db3fffd662..26db3fffd662 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-Makefile
diff --git a/x11-fm/ezfm/files/patch-ag b/x11-fm/ezfm/files/patch-aboutEZFM.h
index c750d6555089..c750d6555089 100644
--- a/x11-fm/ezfm/files/patch-ag
+++ b/x11-fm/ezfm/files/patch-aboutEZFM.h
diff --git a/x11-fm/ezfm/files/patch-ab b/x11-fm/ezfm/files/patch-ezfm.h
index be90c290476f..be90c290476f 100644
--- a/x11-fm/ezfm/files/patch-ab
+++ b/x11-fm/ezfm/files/patch-ezfm.h
diff --git a/x11-fm/ezfm/files/patch-af b/x11-fm/ezfm/files/patch-ezfmrc
index fc17fbfce2ff..fc17fbfce2ff 100644
--- a/x11-fm/ezfm/files/patch-af
+++ b/x11-fm/ezfm/files/patch-ezfmrc
diff --git a/x11-fm/ezfm/files/patch-ac b/x11-fm/ezfm/files/patch-infoBtn.c
index 405f27262277..405f27262277 100644
--- a/x11-fm/ezfm/files/patch-ac
+++ b/x11-fm/ezfm/files/patch-infoBtn.c
diff --git a/x11-fm/ezfm/files/patch-ae b/x11-fm/ezfm/files/patch-libfile__Makefile
index 924d1ebb92a2..924d1ebb92a2 100644
--- a/x11-fm/ezfm/files/patch-ae
+++ b/x11-fm/ezfm/files/patch-libfile__Makefile
diff --git a/x11-fm/ezfm/files/patch-ad b/x11-fm/ezfm/files/patch-main.c
index 8c834c523fd6..8c834c523fd6 100644
--- a/x11-fm/ezfm/files/patch-ad
+++ b/x11-fm/ezfm/files/patch-main.c
diff --git a/x11-fm/ezfm/files/patch-ah b/x11-fm/ezfm/files/patch-transparent.c
index 6af883fac470..6af883fac470 100644
--- a/x11-fm/ezfm/files/patch-ah
+++ b/x11-fm/ezfm/files/patch-transparent.c
diff --git a/x11-fm/xcruise/files/patch-aa b/x11-fm/xcruise/files/patch-Imakefile
index 3ced30cbe393..3ced30cbe393 100644
--- a/x11-fm/xcruise/files/patch-aa
+++ b/x11-fm/xcruise/files/patch-Imakefile
diff --git a/x11-fonts/bdfresize/files/patch-aa b/x11-fonts/bdfresize/files/patch-charresize.c
index 779f112a7426..779f112a7426 100644
--- a/x11-fonts/bdfresize/files/patch-aa
+++ b/x11-fonts/bdfresize/files/patch-charresize.c
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 9ae683b66a79..435ae80da9a6 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
 PKGNAMESUFFIX=	-x11
 DISTNAME=	x-koi8u
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
@@ -18,7 +17,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USES=		perl5
+USES=		perl5 tar:tgz
 USE_PERL5=	build
 USE_XORG=	x11
 NO_WRKSUBDIR=	yes
@@ -30,9 +29,6 @@ post-patch:
 	    -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \
 	${WRKSRC}/Makefile
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 # This will  allow one to  use just this  fonts for both,  the Ukrainian
 # koi8-u and the Russian koi8-r encodings. Since koi8-u is a superset of
 # koi8-r, there  is not need to  load both sets into  X-server, but some
diff --git a/x11-fonts/geminifonts/files/patch-gz b/x11-fonts/geminifonts/files/patch-Makefile
index a5589cd13926..a5589cd13926 100644
--- a/x11-fonts/geminifonts/files/patch-gz
+++ b/x11-fonts/geminifonts/files/patch-Makefile
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 467d33fc9b9c..5cbc83a05f12 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -59,16 +59,14 @@ do-build:
 
 
 do-install:
-	(cd ${WRKSRC}; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
-	  for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
-	  	${INSTALL_DATA} $$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR} ; \
-	  done; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}; \
-	  ${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR} ; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}; \
-	  ${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR} ; \
-	)
+.for d in ${FONTSDIR} ${T1_FONTSDIR} ${TT_FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/$d
+.endfor
+	for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
+	done
+	${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}
+	${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \
 		${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/intlfonts/files/patch-aa b/x11-fonts/intlfonts/files/patch-Chinese__taipei16.bdf
index 396f53b7b1c3..396f53b7b1c3 100644
--- a/x11-fonts/intlfonts/files/patch-aa
+++ b/x11-fonts/intlfonts/files/patch-Chinese__taipei16.bdf
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index cf919d516064..66633c9c1e15 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -25,11 +25,9 @@ OPTIONS_DEFAULT=X11
 X11_RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 			${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-.include <bsd.port.options.mk>
-
 do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
-		${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
+		${STAGEDIR}${PREFIX}/bin)
 	${INSTALL_MAN} ${WRKSRC}/type1inst.man \
 		${STAGEDIR}${PREFIX}/man/man1/type1inst.1
 
diff --git a/x11-fonts/p5-type1inst/files/patch-aa b/x11-fonts/p5-type1inst/files/patch-type1inst.man
index fb08866d78aa..fb08866d78aa 100644
--- a/x11-fonts/p5-type1inst/files/patch-aa
+++ b/x11-fonts/p5-type1inst/files/patch-type1inst.man
diff --git a/x11-fonts/tkfont/files/patch-aa b/x11-fonts/tkfont/files/patch-tkfont
index 7ba658346e40..7ba658346e40 100644
--- a/x11-fonts/tkfont/files/patch-aa
+++ b/x11-fonts/tkfont/files/patch-tkfont
diff --git a/x11-themes/murrine-configurator/Makefile b/x11-themes/murrine-configurator/Makefile
index 3dac069661d5..8e8abe9770ca 100644
--- a/x11-themes/murrine-configurator/Makefile
+++ b/x11-themes/murrine-configurator/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.5
 PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/murrine/
-DISTNAME=	murrine-configurator-${PORTVERSION}
 
 MAINTAINER=	tstodgell@gmail.com
 COMMENT=	GUI gtkrc configuration tool for the Murrine GTK engine
@@ -20,10 +19,10 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/files/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.png \
+	${INSTALL_SCRIPT} ${WRKSRC}/files/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.desktop \
+	${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/x11-themes/murrine-configurator/files/patch-aa b/x11-themes/murrine-configurator/files/patch-files__murrine-configurator
index d4d1588d2ea7..d4d1588d2ea7 100644
--- a/x11-themes/murrine-configurator/files/patch-aa
+++ b/x11-themes/murrine-configurator/files/patch-files__murrine-configurator
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-Makefile.in
index 6555fe4ac75a..6555fe4ac75a 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-Makefile.in
index 258db13435f7..258db13435f7 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-configure
index c29a6955e4e4..c29a6955e4e4 100644
--- a/x11-toolkits/gtk12/files/patch-ae
+++ b/x11-toolkits/gtk12/files/patch-configure
diff --git a/x11-toolkits/gtk12/files/patch-ah b/x11-toolkits/gtk12/files/patch-docs__Makefile.in
index fe8134b8f217..fe8134b8f217 100644
--- a/x11-toolkits/gtk12/files/patch-ah
+++ b/x11-toolkits/gtk12/files/patch-docs__Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-gdk::Makefile.in b/x11-toolkits/gtk12/files/patch-gdk__Makefile.in
index c9887ad4ae65..c9887ad4ae65 100644
--- a/x11-toolkits/gtk12/files/patch-gdk::Makefile.in
+++ b/x11-toolkits/gtk12/files/patch-gdk__Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-gdk::gdkimage.c b/x11-toolkits/gtk12/files/patch-gdk__gdkimage.c
index ba18a62305b7..ba18a62305b7 100644
--- a/x11-toolkits/gtk12/files/patch-gdk::gdkimage.c
+++ b/x11-toolkits/gtk12/files/patch-gdk__gdkimage.c
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-gtk-config.in
index 5ef60b088b4d..5ef60b088b4d 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-gtk-config.in
diff --git a/x11-toolkits/gtk12/files/patch-ag b/x11-toolkits/gtk12/files/patch-gtk__Makefile.in
index ce3ac1f0c307..ce3ac1f0c307 100644
--- a/x11-toolkits/gtk12/files/patch-ag
+++ b/x11-toolkits/gtk12/files/patch-gtk__Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c
index 71121eda4feb..71121eda4feb 100644
--- a/x11-toolkits/gtk12/files/patch-ad
+++ b/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c
diff --git a/x11-toolkits/gtk12/files/patch-af b/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru
index 8c6d078a9da2..8c6d078a9da2 100644
--- a/x11-toolkits/gtk12/files/patch-af
+++ b/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-docs_Makefile.in
index cc9e4c46a65a..cc9e4c46a65a 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-docs_Makefile.in
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in
index a9d1d5f214c3..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-gdk_Makefile.in
index 7f8e0eb0c02d..7f8e0eb0c02d 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-gdk_Makefile.in
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-makefile
index cd5b51477d0c..cd5b51477d0c 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-makefile
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index a8a0d6504a45..e59780925d7c 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 MASTER_SITE_SUBDIR=     cy
 
 DISTNAME=	SlingShot${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Supplemental Libraries to extend Xview
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake tar:Z
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	OPENWINHOME=${LOCALBASE}
 
diff --git a/x11-toolkits/slingshot/files/patch-aa b/x11-toolkits/slingshot/files/patch-Makefile
index 43af6bca1a09..43af6bca1a09 100644
--- a/x11-toolkits/slingshot/files/patch-aa
+++ b/x11-toolkits/slingshot/files/patch-Makefile
diff --git a/x11-toolkits/slingshot/files/patch-ca b/x11-toolkits/slingshot/files/patch-examples-Makefile
index 1ca1ae1d2c9b..1ca1ae1d2c9b 100644
--- a/x11-toolkits/slingshot/files/patch-ca
+++ b/x11-toolkits/slingshot/files/patch-examples-Makefile
diff --git a/x11-toolkits/slingshot/files/patch-da b/x11-toolkits/slingshot/files/patch-include-sspkg-Makefile
index 094a41ceb258..094a41ceb258 100644
--- a/x11-toolkits/slingshot/files/patch-da
+++ b/x11-toolkits/slingshot/files/patch-include-sspkg-Makefile
diff --git a/x11-toolkits/slingshot/files/patch-ba b/x11-toolkits/slingshot/files/patch-src-Makefile
index a5aaca885d84..a5aaca885d84 100644
--- a/x11-toolkits/slingshot/files/patch-ba
+++ b/x11-toolkits/slingshot/files/patch-src-Makefile
diff --git a/x11-toolkits/slingshot/files/patch-bc b/x11-toolkits/slingshot/files/patch-src-tacho.c
index 66fe77a6917f..66fe77a6917f 100644
--- a/x11-toolkits/slingshot/files/patch-bc
+++ b/x11-toolkits/slingshot/files/patch-src-tacho.c
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-Makefile.in
index 7500fba36868..7500fba36868 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-Makefile.in
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-configure
index 75a1b42619c0..75a1b42619c0 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-configure
diff --git a/x11-wm/afterstep/files/patch-ac b/x11-wm/afterstep/files/patch-Imakefile
index b5597be33a39..b5597be33a39 100644
--- a/x11-wm/afterstep/files/patch-ac
+++ b/x11-wm/afterstep/files/patch-Imakefile
diff --git a/x11-wm/afterstep/files/patch-ad b/x11-wm/afterstep/files/patch-afterstep__alpha_header.h
index 8b4260bcd8c0..8b4260bcd8c0 100644
--- a/x11-wm/afterstep/files/patch-ad
+++ b/x11-wm/afterstep/files/patch-afterstep__alpha_header.h
diff --git a/x11-wm/afterstep/files/patch-icons.c b/x11-wm/afterstep/files/patch-afterstep__icons.c
index 04bd11ae88a1..04bd11ae88a1 100644
--- a/x11-wm/afterstep/files/patch-icons.c
+++ b/x11-wm/afterstep/files/patch-afterstep__icons.c
diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-configure.h
index 600754d7e578..600754d7e578 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-configure.h
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-sample.steprc
index 2f9a5cb43737..2f9a5cb43737 100644
--- a/x11-wm/afterstep/files/patch-ab
+++ b/x11-wm/afterstep/files/patch-sample.steprc
diff --git a/x11-wm/fvwm/files/patch-ad b/x11-wm/fvwm/files/patch-Imakefiles
index f5f8a3077242..f5f8a3077242 100644
--- a/x11-wm/fvwm/files/patch-ad
+++ b/x11-wm/fvwm/files/patch-Imakefiles
diff --git a/x11-wm/fvwm/files/patch-ab b/x11-wm/fvwm/files/patch-configure.h
index 6fd353db208d..6fd353db208d 100644
--- a/x11-wm/fvwm/files/patch-ab
+++ b/x11-wm/fvwm/files/patch-configure.h
diff --git a/x11-wm/fvwm/files/patch-ac b/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc
index ac93128be13e..ac93128be13e 100644
--- a/x11-wm/fvwm/files/patch-ac
+++ b/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc
diff --git a/x11-wm/piewm/files/patch-ad b/x11-wm/piewm/files/patch-Imakefile
index 6dea3d7e442f..6dea3d7e442f 100644
--- a/x11-wm/piewm/files/patch-ad
+++ b/x11-wm/piewm/files/patch-Imakefile
diff --git a/x11-wm/piewm/files/patch-ae b/x11-wm/piewm/files/patch-gram.y
index a9ad7d239096..a9ad7d239096 100644
--- a/x11-wm/piewm/files/patch-ae
+++ b/x11-wm/piewm/files/patch-gram.y
diff --git a/x11-wm/piewm/files/patch-ag b/x11-wm/piewm/files/patch-parse.c
index 6319181d3584..6319181d3584 100644
--- a/x11-wm/piewm/files/patch-ag
+++ b/x11-wm/piewm/files/patch-parse.c
diff --git a/x11-wm/tvtwm/files/patch-ac b/x11-wm/tvtwm/files/patch-Imakefile
index a8601c670ae0..a8601c670ae0 100644
--- a/x11-wm/tvtwm/files/patch-ac
+++ b/x11-wm/tvtwm/files/patch-Imakefile
diff --git a/x11-wm/tvtwm/files/patch-aa b/x11-wm/tvtwm/files/patch-gram.y
index c3d33454903c..c3d33454903c 100644
--- a/x11-wm/tvtwm/files/patch-aa
+++ b/x11-wm/tvtwm/files/patch-gram.y
diff --git a/x11-wm/tvtwm/files/patch-ab b/x11-wm/tvtwm/files/patch-lex.l
index ce4b522b7d6c..ce4b522b7d6c 100644
--- a/x11-wm/tvtwm/files/patch-ab
+++ b/x11-wm/tvtwm/files/patch-lex.l
diff --git a/x11-wm/weewm/files/patch-aa b/x11-wm/weewm/files/patch-src__info.c
index 0015f7f072e8..0015f7f072e8 100644
--- a/x11-wm/weewm/files/patch-aa
+++ b/x11-wm/weewm/files/patch-src__info.c
diff --git a/x11-wm/wm2/files/patch-ad b/x11-wm/wm2/files/patch-General.h
index d6632c8b28f7..d6632c8b28f7 100644
--- a/x11-wm/wm2/files/patch-ad
+++ b/x11-wm/wm2/files/patch-General.h
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-Makefile
index 819ef9e6114c..819ef9e6114c 100644
--- a/x11-wm/wm2/files/patch-aa
+++ b/x11-wm/wm2/files/patch-Makefile
diff --git a/x11-wm/wm2/files/patch-ab b/x11-wm/wm2/files/patch-Manager.C
index cf52d5530163..cf52d5530163 100644
--- a/x11-wm/wm2/files/patch-ab
+++ b/x11-wm/wm2/files/patch-Manager.C
diff --git a/x11-wm/wm2/files/patch-ac b/x11-wm/wm2/files/patch-Manager.h
index 0b827910c4f6..0b827910c4f6 100644
--- a/x11-wm/wm2/files/patch-ac
+++ b/x11-wm/wm2/files/patch-Manager.h
diff --git a/x11-wm/wmakerconf/files/patch-aa b/x11-wm/wmakerconf/files/patch-scripts__wget.pl
index 1956f065fd1a..1956f065fd1a 100644
--- a/x11-wm/wmakerconf/files/patch-aa
+++ b/x11-wm/wmakerconf/files/patch-scripts__wget.pl
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-Makefile
index 6dfbf13c58ae..6dfbf13c58ae 100644
--- a/x11-wm/wmanager/files/patch-aa
+++ b/x11-wm/wmanager/files/patch-Makefile
diff --git a/x11-wm/wmanager/files/patch-inc::WManager.H b/x11-wm/wmanager/files/patch-inc__WManager.H
index 0588a68b898b..0588a68b898b 100644
--- a/x11-wm/wmanager/files/patch-inc::WManager.H
+++ b/x11-wm/wmanager/files/patch-inc__WManager.H
diff --git a/x11-wm/wmanager/files/patch-src::Interface.cc b/x11-wm/wmanager/files/patch-src__Interface.cc
index ed16135d60c8..ed16135d60c8 100644
--- a/x11-wm/wmanager/files/patch-src::Interface.cc
+++ b/x11-wm/wmanager/files/patch-src__Interface.cc
diff --git a/x11-wm/wmanager/files/patch-ab b/x11-wm/wmanager/files/patch-src__WManager.cc
index 1866ad3a1155..1866ad3a1155 100644
--- a/x11-wm/wmanager/files/patch-ab
+++ b/x11-wm/wmanager/files/patch-src__WManager.cc