Rename sysutils/ patch-xy patches to reflect the files they modify.

100 files changed, 13 insertions, 15 deletions

diff --git a/sysutils/afio/files/patch-ab b/sysutils/afio/files/patch-afio.c
index cce0a343ebcc..cce0a343ebcc 100644
--- a/sysutils/afio/files/patch-ab
+++ b/sysutils/afio/files/patch-afio.c
diff --git a/sysutils/afio/files/patch-ac b/sysutils/afio/files/patch-afio.h
index efc88a9b950c..efc88a9b950c 100644
--- a/sysutils/afio/files/patch-ac
+++ b/sysutils/afio/files/patch-afio.h
diff --git a/sysutils/afio/files/patch-ad b/sysutils/afio/files/patch-compfile.c
index 53c760f3c328..53c760f3c328 100644
--- a/sysutils/afio/files/patch-ad
+++ b/sysutils/afio/files/patch-compfile.c
diff --git a/sysutils/asfsm/files/patch-aa b/sysutils/asfsm/files/patch-asfsm.c
index b25fc62dcf87..b25fc62dcf87 100644
--- a/sysutils/asfsm/files/patch-aa
+++ b/sysutils/asfsm/files/patch-asfsm.c
diff --git a/sysutils/bkpupsd/files/patch-ab b/sysutils/bkpupsd/files/patch-src__bkpupsd.c
index 2886a2d2012e..2886a2d2012e 100644
--- a/sysutils/bkpupsd/files/patch-ab
+++ b/sysutils/bkpupsd/files/patch-src__bkpupsd.c
diff --git a/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd b/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd
index 5e08bb8ff554..5e08bb8ff554 100644
--- a/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd
+++ b/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd
diff --git a/sysutils/cdrtools-devel/files/patch-ad b/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
index a5caa1855562..a5caa1855562 100644
--- a/sysutils/cdrtools-devel/files/patch-ad
+++ b/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
index c8b30d32f974..c8b30d32f974 100644
--- a/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1
+++ b/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi b/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi
index 9398843e937a..9398843e937a 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 b/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1
index 88dc6bf0398f..88dc6bf0398f 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl b/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl
index 859f92768c34..859f92768c34 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl
diff --git a/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h b/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h
index e93f886de086..e93f886de086 100644
--- a/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h
+++ b/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h
diff --git a/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 b/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8
index 26ae04ad8e71..26ae04ad8e71 100644
--- a/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8
+++ b/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8
diff --git a/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 b/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
index ebd5ae8842c3..ebd5ae8842c3 100644
--- a/sysutils/cdrtools-devel/files/patch-readcd::readcd.1
+++ b/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
diff --git a/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl b/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl
index edbd1340c469..edbd1340c469 100644
--- a/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl
+++ b/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl
diff --git a/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 b/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1
index d42f4c8c1c98..d42f4c8c1c98 100644
--- a/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1
+++ b/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1
diff --git a/sysutils/cdrtools/files/patch-ad b/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul
index ead64aaf1330..ead64aaf1330 100644
--- a/sysutils/cdrtools/files/patch-ad
+++ b/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul
diff --git a/sysutils/cdrtools/files/patch-btcflash::btcflash.1 b/sysutils/cdrtools/files/patch-btcflash__btcflash.1
index c8b30d32f974..c8b30d32f974 100644
--- a/sysutils/cdrtools/files/patch-btcflash::btcflash.1
+++ b/sysutils/cdrtools/files/patch-btcflash__btcflash.1
diff --git a/sysutils/cdrtools/files/patch-cdrecord::README.rscsi b/sysutils/cdrtools/files/patch-cdrecord__README.rscsi
index 9398843e937a..9398843e937a 100644
--- a/sysutils/cdrtools/files/patch-cdrecord::README.rscsi
+++ b/sysutils/cdrtools/files/patch-cdrecord__README.rscsi
diff --git a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1
index 88dc6bf0398f..88dc6bf0398f 100644
--- a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1
+++ b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1
diff --git a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl
index 859f92768c34..859f92768c34 100644
--- a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl
+++ b/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl
diff --git a/sysutils/cdrtools/files/patch-include::schily::sha2.h b/sysutils/cdrtools/files/patch-include__schily__sha2.h
index 90d22a32b4da..90d22a32b4da 100644
--- a/sysutils/cdrtools/files/patch-include::schily::sha2.h
+++ b/sysutils/cdrtools/files/patch-include__schily__sha2.h
diff --git a/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 b/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8
index 26ae04ad8e71..26ae04ad8e71 100644
--- a/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8
+++ b/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8
diff --git a/sysutils/cdrtools/files/patch-readcd::readcd.1 b/sysutils/cdrtools/files/patch-readcd__readcd.1
index ebd5ae8842c3..ebd5ae8842c3 100644
--- a/sysutils/cdrtools/files/patch-readcd::readcd.1
+++ b/sysutils/cdrtools/files/patch-readcd__readcd.1
diff --git a/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl b/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl
index edbd1340c469..edbd1340c469 100644
--- a/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl
+++ b/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl
diff --git a/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 b/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1
index d42f4c8c1c98..d42f4c8c1c98 100644
--- a/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1
+++ b/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1
diff --git a/sysutils/consolehm/files/patch-aa b/sysutils/consolehm/files/patch-chm.h
index 4e8dff97aba7..4e8dff97aba7 100644
--- a/sysutils/consolehm/files/patch-aa
+++ b/sysutils/consolehm/files/patch-chm.h
diff --git a/sysutils/consolehm/files/patch-ab b/sysutils/consolehm/files/patch-configure
index 5503ff231db1..5503ff231db1 100644
--- a/sysutils/consolehm/files/patch-ab
+++ b/sysutils/consolehm/files/patch-configure
diff --git a/sysutils/consolehm/files/patch-ac b/sysutils/consolehm/files/patch-configure.in
index 71dcf5599135..71dcf5599135 100644
--- a/sysutils/consolehm/files/patch-ac
+++ b/sysutils/consolehm/files/patch-configure.in
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 0fdf7758772d..8597c380b4e2 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_COMP_SOURCES}
 MASTER_SITE_SUBDIR=	unix/volume10
 DISTNAME=		copytape
-EXTRACT_SUFX=		.Z
 
 MAINTAINER=		sjroz@verizon.net
 COMMENT=		Program that is used to duplicate magtapes
@@ -20,18 +19,19 @@ EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| gunshar -d ${WRKDIR}
 
+USES=		tar:Z
 CFLAGS+=	-Wno-return-type
 # XXX upstream puts CFLAGS in CC
 MAKE_ARGS+=	CC="${CC} ${CFLAGS}"
-ALL_TARGET=		copytape
+ALL_TARGET=	copytape
 
 PLIST_FILES=	bin/copytape \
-				man/man1/copytape.1.gz \
-				man/man5/copytape.5.gz
+		man/man1/copytape.1.gz \
+		man/man5/copytape.5.gz
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/copytape ${STAGEDIR}${PREFIX}/bin/copytape
-	@${INSTALL_MAN} ${WRKSRC}/copytape.1 ${STAGEDIR}${PREFIX}/man/man1/copytape.1
-	@${INSTALL_MAN} ${WRKSRC}/copytape.5 ${STAGEDIR}${PREFIX}/man/man5/copytape.5
+	${INSTALL_PROGRAM} ${WRKSRC}/copytape ${STAGEDIR}${PREFIX}/bin/copytape
+	${INSTALL_MAN} ${WRKSRC}/copytape.1 ${STAGEDIR}${PREFIX}/man/man1/copytape.1
+	${INSTALL_MAN} ${WRKSRC}/copytape.5 ${STAGEDIR}${PREFIX}/man/man5/copytape.5
 
 .include <bsd.port.mk>
diff --git a/sysutils/copytape/files/patch-aa b/sysutils/copytape/files/patch-copytape.c_1
index 0be1bdc8d526..0be1bdc8d526 100644
--- a/sysutils/copytape/files/patch-aa
+++ b/sysutils/copytape/files/patch-copytape.c_1
diff --git a/sysutils/copytape/files/patch-ab b/sysutils/copytape/files/patch-copytape.c_2
index 8838843a4939..8838843a4939 100644
--- a/sysutils/copytape/files/patch-ab
+++ b/sysutils/copytape/files/patch-copytape.c_2
diff --git a/sysutils/detach/files/patch-aa b/sysutils/detach/files/patch-Makefile
index 8ec9643acc60..8ec9643acc60 100644
--- a/sysutils/detach/files/patch-aa
+++ b/sysutils/detach/files/patch-Makefile
diff --git a/sysutils/fetchlog/files/patch-aa b/sysutils/fetchlog/files/patch-Makefile
index 9139c6f706ad..9139c6f706ad 100644
--- a/sysutils/fetchlog/files/patch-aa
+++ b/sysutils/fetchlog/files/patch-Makefile
diff --git a/sysutils/fortunelock/Makefile b/sysutils/fortunelock/Makefile
index a48ba2187359..2687785cc7c5 100644
--- a/sysutils/fortunelock/Makefile
+++ b/sysutils/fortunelock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	dannyboy
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Locks a terminal while showing fortunes
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 PLIST_FILES=	bin/fortunelock man/man1/${PORTNAME}.1.gz
 
diff --git a/sysutils/fortunelock/files/patch-aa b/sysutils/fortunelock/files/patch-Makefile
index d6fdac07c8a0..d6fdac07c8a0 100644
--- a/sysutils/fortunelock/files/patch-aa
+++ b/sysutils/fortunelock/files/patch-Makefile
diff --git a/sysutils/gkrellm2/files/patch-af b/sysutils/gkrellm2/files/patch-gkrellm.1
index 769d113cfafe..769d113cfafe 100644
--- a/sysutils/gkrellm2/files/patch-af
+++ b/sysutils/gkrellm2/files/patch-gkrellm.1
diff --git a/sysutils/gkrellm2/files/patch-server::Makefile b/sysutils/gkrellm2/files/patch-server__Makefile
index 625bd2a7875a..625bd2a7875a 100644
--- a/sysutils/gkrellm2/files/patch-server::Makefile
+++ b/sysutils/gkrellm2/files/patch-server__Makefile
diff --git a/sysutils/gkrellm2/files/patch-server::gkrellmd.h b/sysutils/gkrellm2/files/patch-server__gkrellmd.h
index c5965b17449a..c5965b17449a 100644
--- a/sysutils/gkrellm2/files/patch-server::gkrellmd.h
+++ b/sysutils/gkrellm2/files/patch-server__gkrellmd.h
diff --git a/sysutils/gkrellm2/files/patch-src::configure b/sysutils/gkrellm2/files/patch-src__configure
index d022e120c478..d022e120c478 100644
--- a/sysutils/gkrellm2/files/patch-src::configure
+++ b/sysutils/gkrellm2/files/patch-src__configure
diff --git a/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c b/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c
index f99a994e7d6e..f99a994e7d6e 100644
--- a/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c
+++ b/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c
diff --git a/sysutils/hfsutils/files/patch-ab b/sysutils/hfsutils/files/patch-Makefile.in
index e703993a1dad..e703993a1dad 100644
--- a/sysutils/hfsutils/files/patch-ab
+++ b/sysutils/hfsutils/files/patch-Makefile.in
diff --git a/sysutils/ipsc/files/patch-ae b/sysutils/ipsc/files/patch-Makefile
index 8275baab7e32..8275baab7e32 100644
--- a/sysutils/ipsc/files/patch-ae
+++ b/sysutils/ipsc/files/patch-Makefile
diff --git a/sysutils/less/files/patch-aa b/sysutils/less/files/patch-Makefile.in
index 6cbbda212078..6cbbda212078 100644
--- a/sysutils/less/files/patch-aa
+++ b/sysutils/less/files/patch-Makefile.in
diff --git a/sysutils/less/files/patch-ab b/sysutils/less/files/patch-charset.c
index d234169bdba3..d234169bdba3 100644
--- a/sysutils/less/files/patch-ab
+++ b/sysutils/less/files/patch-charset.c
diff --git a/sysutils/linuxfdisk/Makefile b/sysutils/linuxfdisk/Makefile
index 5b3479d62ebb..b82f5468f2d6 100644
--- a/sysutils/linuxfdisk/Makefile
+++ b/sysutils/linuxfdisk/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://ftp.sunet.se/pub/Linux/kernel.org/linux/utils/util-linux/v2
 		http://ftp.be.debian.org/pub/linux/utils/util-linux/v2.11/ \
 		ftp://segfault.kiev.ua/pub/
 DISTNAME=	util-linux-${PORTVERSION}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	netch@netch.kiev.ua
 COMMENT=	Fdisk, a partition tables manipulator, from util-linux
diff --git a/sysutils/linuxfdisk/files/patch-aa b/sysutils/linuxfdisk/files/patch-FreeBSD
index 2d0152aa64ee..2d0152aa64ee 100644
--- a/sysutils/linuxfdisk/files/patch-aa
+++ b/sysutils/linuxfdisk/files/patch-FreeBSD
diff --git a/sysutils/lmmon/files/patch-aa b/sysutils/lmmon/files/patch-Makefile.in
index 0dcfe47b3c94..0dcfe47b3c94 100644
--- a/sysutils/lmmon/files/patch-aa
+++ b/sysutils/lmmon/files/patch-Makefile.in
diff --git a/sysutils/logtool/files/patch-ab b/sysutils/logtool/files/patch-src__includes.h
index 251d4cee729d..251d4cee729d 100644
--- a/sysutils/logtool/files/patch-ab
+++ b/sysutils/logtool/files/patch-src__includes.h
diff --git a/sysutils/mgeupsd/files/patch-ab b/sysutils/mgeupsd/files/patch-Makefile
index bddb25818bca..bddb25818bca 100644
--- a/sysutils/mgeupsd/files/patch-ab
+++ b/sysutils/mgeupsd/files/patch-Makefile
diff --git a/sysutils/mgeupsd/files/patch-aa b/sysutils/mgeupsd/files/patch-mgeupsd.c
index 1b73dbd127bd..1b73dbd127bd 100644
--- a/sysutils/mgeupsd/files/patch-aa
+++ b/sysutils/mgeupsd/files/patch-mgeupsd.c
diff --git a/sysutils/monitord/files/patch-ab b/sysutils/monitord/files/patch-monitord.c
index 6561b7ac9d79..6561b7ac9d79 100644
--- a/sysutils/monitord/files/patch-ab
+++ b/sysutils/monitord/files/patch-monitord.c
diff --git a/sysutils/most/files/patch-aa b/sysutils/most/files/patch-src__Makefile.in
index 28bd732f2b87..28bd732f2b87 100644
--- a/sysutils/most/files/patch-aa
+++ b/sysutils/most/files/patch-src__Makefile.in
diff --git a/sysutils/paicc/files/patch-aa b/sysutils/paicc/files/patch-Makefile
index 78d18b8b0ebe..78d18b8b0ebe 100644
--- a/sysutils/paicc/files/patch-aa
+++ b/sysutils/paicc/files/patch-Makefile
diff --git a/sysutils/paicc/files/patch-ab b/sysutils/paicc/files/patch-evap__evap.c
index 6dc57ead8831..6dc57ead8831 100644
--- a/sysutils/paicc/files/patch-ab
+++ b/sysutils/paicc/files/patch-evap__evap.c
diff --git a/sysutils/paicc/files/patch-ac b/sysutils/paicc/files/patch-paicc.c
index 8fb00da21d47..8fb00da21d47 100644
--- a/sysutils/paicc/files/patch-ac
+++ b/sysutils/paicc/files/patch-paicc.c
diff --git a/sysutils/pftop/files/patch-aa b/sysutils/pftop/files/patch-config.h
index c6dda1ccc16d..c6dda1ccc16d 100644
--- a/sysutils/pftop/files/patch-aa
+++ b/sysutils/pftop/files/patch-config.h
diff --git a/sysutils/rtty/files/patch-aa b/sysutils/rtty/files/patch-Makefile
index e57978227ce4..e57978227ce4 100644
--- a/sysutils/rtty/files/patch-aa
+++ b/sysutils/rtty/files/patch-Makefile
diff --git a/sysutils/rtty/files/patch-ab b/sysutils/rtty/files/patch-startsrv.sh
index e28073e3bc49..e28073e3bc49 100644
--- a/sysutils/rtty/files/patch-ab
+++ b/sysutils/rtty/files/patch-startsrv.sh
diff --git a/sysutils/screen-legacy/files/patch-Makefile.in b/sysutils/screen-legacy/files/patch-Makefile.in_1
index d5966dc1d1ab..d5966dc1d1ab 100644
--- a/sysutils/screen-legacy/files/patch-Makefile.in
+++ b/sysutils/screen-legacy/files/patch-Makefile.in_1
diff --git a/sysutils/screen-legacy/files/patch-aa b/sysutils/screen-legacy/files/patch-Makefile.in_2
index 66d9aa54793e..66d9aa54793e 100644
--- a/sysutils/screen-legacy/files/patch-aa
+++ b/sysutils/screen-legacy/files/patch-Makefile.in_2
diff --git a/sysutils/screen-legacy/files/patch-ad b/sysutils/screen-legacy/files/patch-configure
index 75cc40566f7d..75cc40566f7d 100644
--- a/sysutils/screen-legacy/files/patch-ad
+++ b/sysutils/screen-legacy/files/patch-configure
diff --git a/sysutils/screen-legacy/files/patch-ab b/sysutils/screen-legacy/files/patch-doc__Makefile.in
index ff1673015a5a..ff1673015a5a 100644
--- a/sysutils/screen-legacy/files/patch-ab
+++ b/sysutils/screen-legacy/files/patch-doc__Makefile.in
diff --git a/sysutils/screen-legacy/files/patch-af b/sysutils/screen-legacy/files/patch-termcap.c
index 426bb1516fd6..426bb1516fd6 100644
--- a/sysutils/screen-legacy/files/patch-af
+++ b/sysutils/screen-legacy/files/patch-termcap.c
diff --git a/sysutils/screen-legacy/files/patch-terminfo::checktc.c b/sysutils/screen-legacy/files/patch-terminfo__checktc.c
index d4ffb75cc0c1..d4ffb75cc0c1 100644
--- a/sysutils/screen-legacy/files/patch-terminfo::checktc.c
+++ b/sysutils/screen-legacy/files/patch-terminfo__checktc.c
diff --git a/sysutils/screen/files/patch-aa b/sysutils/screen/files/patch-Makefile.in
index 29be61cf8bae..29be61cf8bae 100644
--- a/sysutils/screen/files/patch-aa
+++ b/sysutils/screen/files/patch-Makefile.in
diff --git a/sysutils/screen/files/patch-ad b/sysutils/screen/files/patch-configure
index 557f71fe7eb5..557f71fe7eb5 100644
--- a/sysutils/screen/files/patch-ad
+++ b/sysutils/screen/files/patch-configure
diff --git a/sysutils/screen/files/patch-ab b/sysutils/screen/files/patch-doc__Makefile.in
index 8666be063fe5..8666be063fe5 100644
--- a/sysutils/screen/files/patch-ab
+++ b/sysutils/screen/files/patch-doc__Makefile.in
diff --git a/sysutils/screen/files/patch-af b/sysutils/screen/files/patch-termcap.c
index 426bb1516fd6..426bb1516fd6 100644
--- a/sysutils/screen/files/patch-af
+++ b/sysutils/screen/files/patch-termcap.c
diff --git a/sysutils/screen/files/patch-terminfo::checktc.c b/sysutils/screen/files/patch-terminfo__checktc.c
index d4ffb75cc0c1..d4ffb75cc0c1 100644
--- a/sysutils/screen/files/patch-terminfo::checktc.c
+++ b/sysutils/screen/files/patch-terminfo__checktc.c
diff --git a/sysutils/setquota/files/patch-aa b/sysutils/setquota/files/patch-Makefile
index 56f75ae80365..56f75ae80365 100644
--- a/sysutils/setquota/files/patch-aa
+++ b/sysutils/setquota/files/patch-Makefile
diff --git a/sysutils/setquota/files/patch-ab b/sysutils/setquota/files/patch-printquota.c
index 9657b54b3d45..9657b54b3d45 100644
--- a/sysutils/setquota/files/patch-ab
+++ b/sysutils/setquota/files/patch-printquota.c
diff --git a/sysutils/setquota/files/patch-ac b/sysutils/setquota/files/patch-setquota.c
index d50e038b8942..d50e038b8942 100644
--- a/sysutils/setquota/files/patch-ac
+++ b/sysutils/setquota/files/patch-setquota.c
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 21b0ad8c2cd9..2bd9c58af5f3 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -4,11 +4,12 @@
 PORTNAME=	skill
 PORTVERSION=	4.1.4
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.flux.utah.edu/pub/skill/	\
+MASTER_SITES=	ftp://ftp.flux.utah.edu/pub/skill/ \
 		ftp://fast.cs.utah.edu/pub/skill/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SuperKILL, kill, or renice processes by pid, name, tty, or uid
 
+USES=		tar:tgz
+
 .include <bsd.port.mk>
diff --git a/sysutils/skill/files/patch-aa b/sysutils/skill/files/patch-Makefile
index 9544c6b7ecc3..9544c6b7ecc3 100644
--- a/sysutils/skill/files/patch-aa
+++ b/sysutils/skill/files/patch-Makefile
diff --git a/sysutils/socket/files/patch-aa b/sysutils/socket/files/patch-Headerfix
index 6b0cc1de7048..6b0cc1de7048 100644
--- a/sysutils/socket/files/patch-aa
+++ b/sysutils/socket/files/patch-Headerfix
diff --git a/sysutils/socket/files/patch-Makefile b/sysutils/socket/files/patch-Makefile_1
index a18ee6e6370e..a18ee6e6370e 100644
--- a/sysutils/socket/files/patch-Makefile
+++ b/sysutils/socket/files/patch-Makefile_1
diff --git a/sysutils/socket/files/patch-ab b/sysutils/socket/files/patch-Makefile_2
index 0a502fc33141..0a502fc33141 100644
--- a/sysutils/socket/files/patch-ab
+++ b/sysutils/socket/files/patch-Makefile_2
diff --git a/sysutils/socket/files/patch-ad b/sysutils/socket/files/patch-globals.h
index f4f4ae6f79bf..f4f4ae6f79bf 100644
--- a/sysutils/socket/files/patch-ad
+++ b/sysutils/socket/files/patch-globals.h
diff --git a/sysutils/socket/files/patch-ae b/sysutils/socket/files/patch-socket.c
index fd723d216b80..fd723d216b80 100644
--- a/sysutils/socket/files/patch-ae
+++ b/sysutils/socket/files/patch-socket.c
diff --git a/sysutils/socket/files/patch-af b/sysutils/socket/files/patch-socketp.c
index b5822e2f5fd8..b5822e2f5fd8 100644
--- a/sysutils/socket/files/patch-af
+++ b/sysutils/socket/files/patch-socketp.c
diff --git a/sysutils/socket/files/patch-ag b/sysutils/socket/files/patch-utils.c
index 27fa1ef5585a..27fa1ef5585a 100644
--- a/sysutils/socket/files/patch-ag
+++ b/sysutils/socket/files/patch-utils.c
diff --git a/sysutils/su2/files/patch-aa b/sysutils/su2/files/patch-Makefile
index 8181b496d4a2..8181b496d4a2 100644
--- a/sysutils/su2/files/patch-aa
+++ b/sysutils/su2/files/patch-Makefile
diff --git a/sysutils/su2/files/patch-ab b/sysutils/su2/files/patch-su2.c_1
index a2c835efc1f2..a2c835efc1f2 100644
--- a/sysutils/su2/files/patch-ab
+++ b/sysutils/su2/files/patch-su2.c_1
diff --git a/sysutils/su2/files/patch-su2-c b/sysutils/su2/files/patch-su2.c_2
index 8dae9239b519..8dae9239b519 100644
--- a/sysutils/su2/files/patch-su2-c
+++ b/sysutils/su2/files/patch-su2.c_2
diff --git a/sysutils/su2/files/patch-ac b/sysutils/su2/files/patch-su2.man
index 0a952b95df73..0a952b95df73 100644
--- a/sysutils/su2/files/patch-ac
+++ b/sysutils/su2/files/patch-su2.man
diff --git a/sysutils/symlinks/files/patch-aa b/sysutils/symlinks/files/patch-symlinks.c
index ec92dade877d..ec92dade877d 100644
--- a/sysutils/symlinks/files/patch-aa
+++ b/sysutils/symlinks/files/patch-symlinks.c
diff --git a/sysutils/tcplist/files/patch-01 b/sysutils/tcplist/files/patch-Makefile
index 4d10f8a98f2f..4d10f8a98f2f 100644
--- a/sysutils/tcplist/files/patch-01
+++ b/sysutils/tcplist/files/patch-Makefile
diff --git a/sysutils/tcplist/files/patch-03 b/sysutils/tcplist/files/patch-lsof.c
index 66fef3d7788d..66fef3d7788d 100644
--- a/sysutils/tcplist/files/patch-03
+++ b/sysutils/tcplist/files/patch-lsof.c
diff --git a/sysutils/tcplist/files/patch-02 b/sysutils/tcplist/files/patch-tcplist.1
index c440e66785c4..c440e66785c4 100644
--- a/sysutils/tcplist/files/patch-02
+++ b/sysutils/tcplist/files/patch-tcplist.1
diff --git a/sysutils/webmin/files/patch-aa b/sysutils/webmin/files/patch-setup.sh
index 7040aca38b72..7040aca38b72 100644
--- a/sysutils/webmin/files/patch-aa
+++ b/sysutils/webmin/files/patch-setup.sh
diff --git a/sysutils/whowatch/files/patch-aa b/sysutils/whowatch/files/patch-Makefile.in
index 28e3c6ec6e86..28e3c6ec6e86 100644
--- a/sysutils/whowatch/files/patch-aa
+++ b/sysutils/whowatch/files/patch-Makefile.in
diff --git a/sysutils/wmtop/files/patch-aa b/sysutils/wmtop/files/patch-Makefile
index cd70faf7f654..cd70faf7f654 100644
--- a/sysutils/wmtop/files/patch-aa
+++ b/sysutils/wmtop/files/patch-Makefile
diff --git a/sysutils/wmtop/files/patch-la b/sysutils/wmtop/files/patch-wmtop.c
index 7ce361ad4045..7ce361ad4045 100644
--- a/sysutils/wmtop/files/patch-la
+++ b/sysutils/wmtop/files/patch-wmtop.c
diff --git a/sysutils/xbatt/files/patch-aa b/sysutils/xbatt/files/patch-Imakefile
index 2ca79c7a2ddd..2ca79c7a2ddd 100644
--- a/sysutils/xbatt/files/patch-aa
+++ b/sysutils/xbatt/files/patch-Imakefile
diff --git a/sysutils/xbattbar/files/patch-aa b/sysutils/xbattbar/files/patch-Imakefile
index 1db9be1cb6ce..1db9be1cb6ce 100644
--- a/sysutils/xbattbar/files/patch-aa
+++ b/sysutils/xbattbar/files/patch-Imakefile
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 9b94c938cb64..bef9343d6ce5 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -6,13 +6,12 @@ PORTVERSION=	3.0
 PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphically display output of du
 
 NO_WRKSUBDIR=	yes
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 PLIST_FILES=	bin/xdu lib/X11/app-defaults/XDu man/man1/xdu.1.gz
 
diff --git a/sysutils/xdu/files/patch-aa b/sysutils/xdu/files/patch-xdu.c
index 95380a6360ad..95380a6360ad 100644
--- a/sysutils/xdu/files/patch-aa
+++ b/sysutils/xdu/files/patch-xdu.c
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index e9edfc6ac1d6..91a57a76fb1a 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -7,12 +7,11 @@ PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/status/xstatus
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X File System Monitor
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	xbitmaps x11 xext
 MAKE_ARGS=	CC="${CC}" CCOPTIONS="-DFreeBSD"
 PLIST_FILES=	bin/xfsm man/man1/${PORTNAME}.1.gz
diff --git a/sysutils/xfsm/files/patch-ac b/sysutils/xfsm/files/patch-xfsm_util.c
index 3cbc2489196d..3cbc2489196d 100644
--- a/sysutils/xfsm/files/patch-ac
+++ b/sysutils/xfsm/files/patch-xfsm_util.c