diff --git a/x11-clocks/abclock/files/patch-ab b/x11-clocks/abclock/files/patch-abclock.c
similarity index 100%
rename from x11-clocks/abclock/files/patch-ab
rename to 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
similarity index 100%
rename from x11-clocks/asclock-gtk/files/patch-aa
rename to 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
similarity index 100%
rename from x11-clocks/asclock-gtk/files/patch-ac
rename to 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
similarity index 100%
rename from x11-clocks/asclock-gtk/files/patch-ab
rename to 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
similarity index 100%
rename from x11-clocks/asclock-gtk/files/patch-led.xpm
rename to 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
similarity index 100%
rename from x11-clocks/eyeclock/files/patch-aa
rename to x11-clocks/eyeclock/files/patch-Makefile
diff --git a/x11-clocks/eyeclock/files/patch-ab b/x11-clocks/eyeclock/files/patch-main.c
similarity index 100%
rename from x11-clocks/eyeclock/files/patch-ab
rename to x11-clocks/eyeclock/files/patch-main.c
diff --git a/x11-clocks/mouseclock/files/patch-01 b/x11-clocks/mouseclock/files/patch-mouseclock.c
similarity index 100%
rename from x11-clocks/mouseclock/files/patch-01
rename to 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
similarity index 100%
rename from x11-clocks/swisswatch/files/patch-aa
rename to 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
similarity index 100%
rename from x11-clocks/tclock/files/patch-aa
rename to x11-clocks/tclock/files/patch-tclock.c
diff --git a/x11-clocks/wmtime/files/patch-ab b/x11-clocks/wmtime/files/patch-Imakefile
similarity index 100%
rename from x11-clocks/wmtime/files/patch-ab
rename to x11-clocks/wmtime/files/patch-Imakefile
diff --git a/x11-clocks/wmtime/files/patch-aa b/x11-clocks/wmtime/files/patch-wmtime.c2
similarity index 100%
rename from x11-clocks/wmtime/files/patch-aa
rename to 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
similarity index 100%
rename from x11-fm/ezfm/files/patch-aa
rename to x11-fm/ezfm/files/patch-Makefile
diff --git a/x11-fm/ezfm/files/patch-ag b/x11-fm/ezfm/files/patch-aboutEZFM.h
similarity index 100%
rename from x11-fm/ezfm/files/patch-ag
rename to x11-fm/ezfm/files/patch-aboutEZFM.h
diff --git a/x11-fm/ezfm/files/patch-ab b/x11-fm/ezfm/files/patch-ezfm.h
similarity index 100%
rename from x11-fm/ezfm/files/patch-ab
rename to x11-fm/ezfm/files/patch-ezfm.h
diff --git a/x11-fm/ezfm/files/patch-af b/x11-fm/ezfm/files/patch-ezfmrc
similarity index 100%
rename from x11-fm/ezfm/files/patch-af
rename to x11-fm/ezfm/files/patch-ezfmrc
diff --git a/x11-fm/ezfm/files/patch-ac b/x11-fm/ezfm/files/patch-infoBtn.c
similarity index 100%
rename from x11-fm/ezfm/files/patch-ac
rename to x11-fm/ezfm/files/patch-infoBtn.c
diff --git a/x11-fm/ezfm/files/patch-ae b/x11-fm/ezfm/files/patch-libfile__Makefile
similarity index 100%
rename from x11-fm/ezfm/files/patch-ae
rename to x11-fm/ezfm/files/patch-libfile__Makefile
diff --git a/x11-fm/ezfm/files/patch-ad b/x11-fm/ezfm/files/patch-main.c
similarity index 100%
rename from x11-fm/ezfm/files/patch-ad
rename to x11-fm/ezfm/files/patch-main.c
diff --git a/x11-fm/ezfm/files/patch-ah b/x11-fm/ezfm/files/patch-transparent.c
similarity index 100%
rename from x11-fm/ezfm/files/patch-ah
rename to x11-fm/ezfm/files/patch-transparent.c
diff --git a/x11-fm/xcruise/files/patch-aa b/x11-fm/xcruise/files/patch-Imakefile
similarity index 100%
rename from x11-fm/xcruise/files/patch-aa
rename to x11-fm/xcruise/files/patch-Imakefile
diff --git a/x11-fonts/bdfresize/files/patch-aa b/x11-fonts/bdfresize/files/patch-charresize.c
similarity index 100%
rename from x11-fonts/bdfresize/files/patch-aa
rename to 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
similarity index 100%
rename from x11-fonts/geminifonts/files/patch-gz
rename to 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
similarity index 100%
rename from x11-fonts/intlfonts/files/patch-aa
rename to 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
similarity index 100%
rename from x11-fonts/p5-type1inst/files/patch-aa
rename to x11-fonts/p5-type1inst/files/patch-type1inst.man
diff --git a/x11-fonts/tkfont/files/patch-aa b/x11-fonts/tkfont/files/patch-tkfont
similarity index 100%
rename from x11-fonts/tkfont/files/patch-aa
rename to 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
similarity index 100%
rename from x11-themes/murrine-configurator/files/patch-aa
rename to 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
similarity index 100%
rename from x11-toolkits/gal2/files/patch-ab
rename to x11-toolkits/gal2/files/patch-Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-Makefile.in
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-aa
rename to x11-toolkits/gtk12/files/patch-Makefile.in
diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-configure
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-ae
rename to x11-toolkits/gtk12/files/patch-configure
diff --git a/x11-toolkits/gtk12/files/patch-ah b/x11-toolkits/gtk12/files/patch-docs__Makefile.in
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-ah
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-gdk::Makefile.in
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-gdk::gdkimage.c
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-ab
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-ag
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-ad
rename to 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
similarity index 100%
rename from x11-toolkits/gtk12/files/patch-af
rename to 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
similarity index 100%
rename from x11-toolkits/gtk20/files/patch-ah
rename to 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
similarity index 100%
rename from x11-toolkits/gtk20/files/patch-ai
rename to 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
similarity index 100%
rename from x11-toolkits/gtk20/files/patch-ak
rename to x11-toolkits/gtk20/files/patch-gdk_Makefile.in
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-makefile
similarity index 100%
rename from x11-toolkits/scintilla/files/patch-aa
rename to 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
similarity index 100%
rename from x11-toolkits/slingshot/files/patch-aa
rename to x11-toolkits/slingshot/files/patch-Makefile
diff --git a/x11-toolkits/slingshot/files/patch-ca b/x11-toolkits/slingshot/files/patch-examples-Makefile
similarity index 100%
rename from x11-toolkits/slingshot/files/patch-ca
rename to 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
similarity index 100%
rename from x11-toolkits/slingshot/files/patch-da
rename to 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
similarity index 100%
rename from x11-toolkits/slingshot/files/patch-ba
rename to 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
similarity index 100%
rename from x11-toolkits/slingshot/files/patch-bc
rename to 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
similarity index 100%
rename from x11-toolkits/tk84/files/patch-ab
rename to x11-toolkits/tk84/files/patch-Makefile.in
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-configure
similarity index 100%
rename from x11-toolkits/tk84/files/patch-aa
rename to x11-toolkits/tk84/files/patch-configure
diff --git a/x11-wm/afterstep/files/patch-ac b/x11-wm/afterstep/files/patch-Imakefile
similarity index 100%
rename from x11-wm/afterstep/files/patch-ac
rename to 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
similarity index 100%
rename from x11-wm/afterstep/files/patch-ad
rename to 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
similarity index 100%
rename from x11-wm/afterstep/files/patch-icons.c
rename to 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
similarity index 100%
rename from x11-wm/afterstep/files/patch-aa
rename to x11-wm/afterstep/files/patch-configure.h
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-sample.steprc
similarity index 100%
rename from x11-wm/afterstep/files/patch-ab
rename to x11-wm/afterstep/files/patch-sample.steprc
diff --git a/x11-wm/fvwm/files/patch-ad b/x11-wm/fvwm/files/patch-Imakefiles
similarity index 100%
rename from x11-wm/fvwm/files/patch-ad
rename to x11-wm/fvwm/files/patch-Imakefiles
diff --git a/x11-wm/fvwm/files/patch-ab b/x11-wm/fvwm/files/patch-configure.h
similarity index 100%
rename from x11-wm/fvwm/files/patch-ab
rename to 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
similarity index 100%
rename from x11-wm/fvwm/files/patch-ac
rename to 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
similarity index 100%
rename from x11-wm/piewm/files/patch-ad
rename to x11-wm/piewm/files/patch-Imakefile
diff --git a/x11-wm/piewm/files/patch-ae b/x11-wm/piewm/files/patch-gram.y
similarity index 100%
rename from x11-wm/piewm/files/patch-ae
rename to x11-wm/piewm/files/patch-gram.y
diff --git a/x11-wm/piewm/files/patch-ag b/x11-wm/piewm/files/patch-parse.c
similarity index 100%
rename from x11-wm/piewm/files/patch-ag
rename to x11-wm/piewm/files/patch-parse.c
diff --git a/x11-wm/tvtwm/files/patch-ac b/x11-wm/tvtwm/files/patch-Imakefile
similarity index 100%
rename from x11-wm/tvtwm/files/patch-ac
rename to x11-wm/tvtwm/files/patch-Imakefile
diff --git a/x11-wm/tvtwm/files/patch-aa b/x11-wm/tvtwm/files/patch-gram.y
similarity index 100%
rename from x11-wm/tvtwm/files/patch-aa
rename to x11-wm/tvtwm/files/patch-gram.y
diff --git a/x11-wm/tvtwm/files/patch-ab b/x11-wm/tvtwm/files/patch-lex.l
similarity index 100%
rename from x11-wm/tvtwm/files/patch-ab
rename to 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
similarity index 100%
rename from x11-wm/weewm/files/patch-aa
rename to 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
similarity index 100%
rename from x11-wm/wm2/files/patch-ad
rename to x11-wm/wm2/files/patch-General.h
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-Makefile
similarity index 100%
rename from x11-wm/wm2/files/patch-aa
rename to x11-wm/wm2/files/patch-Makefile
diff --git a/x11-wm/wm2/files/patch-ab b/x11-wm/wm2/files/patch-Manager.C
similarity index 100%
rename from x11-wm/wm2/files/patch-ab
rename to x11-wm/wm2/files/patch-Manager.C
diff --git a/x11-wm/wm2/files/patch-ac b/x11-wm/wm2/files/patch-Manager.h
similarity index 100%
rename from x11-wm/wm2/files/patch-ac
rename to 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
similarity index 100%
rename from x11-wm/wmakerconf/files/patch-aa
rename to x11-wm/wmakerconf/files/patch-scripts__wget.pl
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-Makefile
similarity index 100%
rename from x11-wm/wmanager/files/patch-aa
rename to 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
similarity index 100%
rename from x11-wm/wmanager/files/patch-inc::WManager.H
rename to 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
similarity index 100%
rename from x11-wm/wmanager/files/patch-src::Interface.cc
rename to 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
similarity index 100%
rename from x11-wm/wmanager/files/patch-ab
rename to x11-wm/wmanager/files/patch-src__WManager.cc