diff --git a/german/dict/files/patch-aa b/german/dict/files/patch-Makefile
similarity index 100%
rename from german/dict/files/patch-aa
rename to german/dict/files/patch-Makefile
diff --git a/graphics/aalib/files/patch-ag b/graphics/aalib/files/patch-src_aafire.c
similarity index 100%
rename from graphics/aalib/files/patch-ag
rename to graphics/aalib/files/patch-src_aafire.c
diff --git a/graphics/aalib/files/patch-ai b/graphics/aalib/files/patch-src_aaprintf.c
similarity index 100%
rename from graphics/aalib/files/patch-ai
rename to graphics/aalib/files/patch-src_aaprintf.c
diff --git a/graphics/aalib/files/patch-ah b/graphics/aalib/files/patch-src_aarender.c
similarity index 100%
rename from graphics/aalib/files/patch-ah
rename to graphics/aalib/files/patch-src_aarender.c
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index c7402ef92329..fb6de2c80fc5 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -23,30 +23,19 @@ LDFLAGS+=	$$(libpng-config --L_opts) ${PTHREAD_LIBS}
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	IMAGEMAGICK MING PSTOEDIT
-OPTIONS_DEFAULT=	IMAGEMAGICK PSTOEDIT
+OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
-.include <bsd.port.options.mk>
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_CONFIGURE_OFF=	--without-magick
 
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
-.else
-CONFIGURE_ARGS+=	--without-magick
-.endif
+MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
+MING_CPPFLAGS=		-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
+MING_CONFIGURE_OFF=	ac_cv_header_ming_h=no
 
-.if ${PORT_OPTIONS:MMING}
-LIB_DEPENDS+=	libming.so:${PORTSDIR}/graphics/ming
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
-.else
-CONFIGURE_ENV+=	ac_cv_header_ming_h=no
-.endif
-
-.if ${PORT_OPTIONS:MPSTOEDIT}
-LIB_DEPENDS+=	libpstoedit.so:${PORTSDIR}/graphics/pstoedit
-.else
-CONFIGURE_ARGS+=	--without-pstoedit
-.endif
+PSTOEDIT_LIB_DEPENDS=	libpstoedit.so:${PORTSDIR}/graphics/pstoedit
+PSTOEDIT_CONFIGURE_OFF=	--without-pstoedit
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/graphics/autotrace/files/patch-ab b/graphics/autotrace/files/patch-output-swf.c
similarity index 100%
rename from graphics/autotrace/files/patch-ab
rename to graphics/autotrace/files/patch-output-swf.c
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index 4a473c7267c8..fe04ea9b8740 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -6,12 +6,12 @@ PORTVERSION=		1.0
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/capture
-EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		maurice@castro.aus.net
 COMMENT=	Digital camera control and download tool for Kodak DC20/25 camera
 
 WRKSRC=			${WRKDIR}
+USES=			tar:tgz
 
 post-extract:
 	for file in `${FIND} ${WRKSRC} -type f`; do \
diff --git a/graphics/dc20pack/files/patch-ab b/graphics/dc20pack/files/patch-Makefile
similarity index 100%
rename from graphics/dc20pack/files/patch-ab
rename to graphics/dc20pack/files/patch-Makefile
diff --git a/graphics/dc20pack/files/patch-aa b/graphics/dc20pack/files/patch-dc20_hif.c
similarity index 100%
rename from graphics/dc20pack/files/patch-aa
rename to graphics/dc20pack/files/patch-dc20_hif.c
diff --git a/graphics/dia/files/patch-ae b/graphics/dia/files/patch-app_main.c
similarity index 100%
rename from graphics/dia/files/patch-ae
rename to graphics/dia/files/patch-app_main.c
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-configure
similarity index 100%
rename from graphics/dia/files/patch-ad
rename to graphics/dia/files/patch-configure
diff --git a/graphics/g2/files/patch-aa b/graphics/g2/files/patch-Makefile.in
similarity index 100%
rename from graphics/g2/files/patch-aa
rename to graphics/g2/files/patch-Makefile.in
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in
similarity index 100%
rename from graphics/gdk-pixbuf/files/patch-ac
rename to graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in
diff --git a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S
similarity index 100%
rename from graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
rename to graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S
diff --git a/graphics/gkrellkam2/files/patch-ba b/graphics/gkrellkam2/files/patch-gkrellkam2.c
similarity index 100%
rename from graphics/gkrellkam2/files/patch-ba
rename to graphics/gkrellkam2/files/patch-gkrellkam2.c
diff --git a/graphics/gplot/files/patch-aa b/graphics/gplot/files/patch-Makefile
similarity index 100%
rename from graphics/gplot/files/patch-aa
rename to graphics/gplot/files/patch-Makefile
diff --git a/graphics/gplot/files/patch-ab b/graphics/gplot/files/patch-utils.c
similarity index 100%
rename from graphics/gplot/files/patch-ab
rename to graphics/gplot/files/patch-utils.c
diff --git a/graphics/gracula/files/patch-aa b/graphics/gracula/files/patch-Makefile
similarity index 100%
rename from graphics/gracula/files/patch-aa
rename to graphics/gracula/files/patch-Makefile
diff --git a/graphics/gtkgraph/files/patch-aa b/graphics/gtkgraph/files/patch-config.h.in
similarity index 100%
rename from graphics/gtkgraph/files/patch-aa
rename to graphics/gtkgraph/files/patch-config.h.in
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-Makefile
similarity index 100%
rename from graphics/jbigkit/files/patch-aa
rename to graphics/jbigkit/files/patch-Makefile
diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-libjbig_Makefile
similarity index 100%
rename from graphics/jbigkit/files/patch-ab
rename to graphics/jbigkit/files/patch-libjbig_Makefile
diff --git a/graphics/jbigkit/files/patch-ac b/graphics/jbigkit/files/patch-pbmtools_Makefile
similarity index 100%
rename from graphics/jbigkit/files/patch-ac
rename to graphics/jbigkit/files/patch-pbmtools_Makefile
diff --git a/graphics/jgraph/files/patch-ae b/graphics/jgraph/files/patch-ex2.jgr
similarity index 100%
rename from graphics/jgraph/files/patch-ae
rename to graphics/jgraph/files/patch-ex2.jgr
diff --git a/graphics/jgraph/files/patch-ad b/graphics/jgraph/files/patch-jgraph.1
similarity index 100%
rename from graphics/jgraph/files/patch-ad
rename to graphics/jgraph/files/patch-jgraph.1
diff --git a/graphics/jgraph/files/patch-ac b/graphics/jgraph/files/patch-jgraph.c
similarity index 100%
rename from graphics/jgraph/files/patch-ac
rename to graphics/jgraph/files/patch-jgraph.c
diff --git a/graphics/jgraph/files/patch-aa b/graphics/jgraph/files/patch-makefile
similarity index 100%
rename from graphics/jgraph/files/patch-aa
rename to graphics/jgraph/files/patch-makefile
diff --git a/graphics/jgraph/files/patch-ab b/graphics/jgraph/files/patch-token.c
similarity index 100%
rename from graphics/jgraph/files/patch-ab
rename to graphics/jgraph/files/patch-token.c
diff --git a/graphics/jslice/files/patch-aa b/graphics/jslice/files/patch-Makefile.new
similarity index 100%
rename from graphics/jslice/files/patch-aa
rename to graphics/jslice/files/patch-Makefile.new
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index 8598de5c17cd..b8417af55941 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	1.1a
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://hoshina.denpa.org/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphic viewer for Leaf products
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
 
diff --git a/graphics/lfview/files/patch-ab b/graphics/lfview/files/patch-Imakefile
similarity index 100%
rename from graphics/lfview/files/patch-ab
rename to graphics/lfview/files/patch-Imakefile
diff --git a/graphics/lfview/files/patch-aa b/graphics/lfview/files/patch-config.tmpl
similarity index 100%
rename from graphics/lfview/files/patch-aa
rename to graphics/lfview/files/patch-config.tmpl
diff --git a/graphics/lfview/files/patch-ac b/graphics/lfview/files/patch-plugins_Imakefile
similarity index 100%
rename from graphics/lfview/files/patch-ac
rename to graphics/lfview/files/patch-plugins_Imakefile
diff --git a/graphics/liblug/files/patch-aa b/graphics/liblug/files/patch-Makefile.linux
similarity index 100%
rename from graphics/liblug/files/patch-aa
rename to graphics/liblug/files/patch-Makefile.linux
diff --git a/graphics/liblug/files/patch-ab b/graphics/liblug/files/patch-convert_rla.c
similarity index 100%
rename from graphics/liblug/files/patch-ab
rename to graphics/liblug/files/patch-convert_rla.c
diff --git a/graphics/libmorph/files/patch-aa b/graphics/libmorph/files/patch-Makefile.in
similarity index 100%
rename from graphics/libmorph/files/patch-aa
rename to graphics/libmorph/files/patch-Makefile.in
diff --git a/graphics/p5-PGPLOT/files/patch-aa b/graphics/p5-PGPLOT/files/patch-PGPLOT.xs
similarity index 100%
rename from graphics/p5-PGPLOT/files/patch-aa
rename to graphics/p5-PGPLOT/files/patch-PGPLOT.xs
diff --git a/graphics/pgplot/files/patch-ab b/graphics/pgplot/files/patch-pgdispd_proccom.c
similarity index 100%
rename from graphics/pgplot/files/patch-ab
rename to graphics/pgplot/files/patch-pgdispd_proccom.c
diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile
index ab7fb0bc6e8e..fc097efe893f 100644
--- a/graphics/picturebook/Makefile
+++ b/graphics/picturebook/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://samba.org/picturebook/
 DISTNAME=	capture
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SONY VAIO camera capture utility
@@ -16,6 +15,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GNOME=	imlib
+USES=		tar:tgz
 
 PLIST_FILES=	bin/capture sbin/setbrightness sbin/vaiobat
 PORTDOCS=	README README.FreeBSD
diff --git a/graphics/picturebook/files/patch-aa b/graphics/picturebook/files/patch-Makefile
similarity index 100%
rename from graphics/picturebook/files/patch-aa
rename to graphics/picturebook/files/patch-Makefile
diff --git a/graphics/picturebook/files/patch-ab b/graphics/picturebook/files/patch-capture.c
similarity index 100%
rename from graphics/picturebook/files/patch-ab
rename to graphics/picturebook/files/patch-capture.c
diff --git a/graphics/picturebook/files/patch-ac b/graphics/picturebook/files/patch-capture.h
similarity index 100%
rename from graphics/picturebook/files/patch-ac
rename to graphics/picturebook/files/patch-capture.h
diff --git a/graphics/picturebook/files/patch-ah b/graphics/picturebook/files/patch-command.c
similarity index 100%
rename from graphics/picturebook/files/patch-ah
rename to graphics/picturebook/files/patch-command.c
diff --git a/graphics/picturebook/files/patch-ai b/graphics/picturebook/files/patch-mchip.c
similarity index 100%
rename from graphics/picturebook/files/patch-ai
rename to graphics/picturebook/files/patch-mchip.c
diff --git a/graphics/picturebook/files/patch-ad b/graphics/picturebook/files/patch-pci.h
similarity index 100%
rename from graphics/picturebook/files/patch-ad
rename to graphics/picturebook/files/patch-pci.h
diff --git a/graphics/picturebook/files/patch-ae b/graphics/picturebook/files/patch-pci_freebsd.c
similarity index 100%
rename from graphics/picturebook/files/patch-ae
rename to graphics/picturebook/files/patch-pci_freebsd.c
diff --git a/graphics/picturebook/files/patch-af b/graphics/picturebook/files/patch-ptable.c
similarity index 100%
rename from graphics/picturebook/files/patch-af
rename to graphics/picturebook/files/patch-ptable.c
diff --git a/graphics/picturebook/files/patch-ba b/graphics/picturebook/files/patch-setbrightness.c
similarity index 100%
rename from graphics/picturebook/files/patch-ba
rename to graphics/picturebook/files/patch-setbrightness.c
diff --git a/graphics/picturebook/files/patch-ag b/graphics/picturebook/files/patch-sonypi.c
similarity index 100%
rename from graphics/picturebook/files/patch-ag
rename to graphics/picturebook/files/patch-sonypi.c
diff --git a/graphics/picturebook/files/patch-bb b/graphics/picturebook/files/patch-vaiobat.c
similarity index 100%
rename from graphics/picturebook/files/patch-bb
rename to graphics/picturebook/files/patch-vaiobat.c
diff --git a/graphics/pixmap/files/patch-ac b/graphics/pixmap/files/patch-Imakefile
similarity index 100%
rename from graphics/pixmap/files/patch-ac
rename to graphics/pixmap/files/patch-Imakefile
diff --git a/graphics/pixmap/files/patch-aa b/graphics/pixmap/files/patch-Pixmap.h
similarity index 100%
rename from graphics/pixmap/files/patch-aa
rename to graphics/pixmap/files/patch-Pixmap.h
diff --git a/graphics/pixmap/files/patch-ab b/graphics/pixmap/files/patch-SelFile_SelFile.c
similarity index 100%
rename from graphics/pixmap/files/patch-ab
rename to graphics/pixmap/files/patch-SelFile_SelFile.c
diff --git a/graphics/png/files/patch-ac b/graphics/png/files/patch-scripts_libpng-config-body.in
similarity index 100%
rename from graphics/png/files/patch-ac
rename to graphics/png/files/patch-scripts_libpng-config-body.in
diff --git a/graphics/png2html/files/patch-aa b/graphics/png2html/files/patch-Makefile
similarity index 100%
rename from graphics/png2html/files/patch-aa
rename to graphics/png2html/files/patch-Makefile
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index 0ac99e39968c..9bc39b734eaa 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	5
 CATEGORIES=	graphics parallel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.1g2.tgz
 DISTNAME=	${PORTNAME}-3.1g2
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distributed rendering package for Persistence of Vision Ray Tracer
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	povray31:${PORTSDIR}/graphics/povray31 \
 		pvmd:${PORTSDIR}/net/pvm
 
-USES=		perl5
+USES=		perl5 tar:tgz
 USE_PERL5=	build
 USE_XORG=	x11
 
diff --git a/graphics/pvmpov/files/patch-aa b/graphics/pvmpov/files/patch-FreeBSD-strings
similarity index 100%
rename from graphics/pvmpov/files/patch-aa
rename to graphics/pvmpov/files/patch-FreeBSD-strings
diff --git a/graphics/pvmpov/files/patch-ab b/graphics/pvmpov/files/patch-povray31-source-pvm-Makefile.aimk
similarity index 100%
rename from graphics/pvmpov/files/patch-ab
rename to graphics/pvmpov/files/patch-povray31-source-pvm-Makefile.aimk
diff --git a/graphics/rayshade/files/patch-aa b/graphics/rayshade/files/patch-Configure
similarity index 100%
rename from graphics/rayshade/files/patch-aa
rename to graphics/rayshade/files/patch-Configure
diff --git a/graphics/rayshade/files/patch-ad b/graphics/rayshade/files/patch-libray_Makefile
similarity index 100%
rename from graphics/rayshade/files/patch-ad
rename to graphics/rayshade/files/patch-libray_Makefile
diff --git a/graphics/rayshade/files/patch-ac b/graphics/rayshade/files/patch-raypaint_Makefile.SH
similarity index 100%
rename from graphics/rayshade/files/patch-ac
rename to graphics/rayshade/files/patch-raypaint_Makefile.SH
diff --git a/graphics/sane-epkowa/files/patch-03 b/graphics/sane-epkowa/files/patch-backend_cfg-obj.c
similarity index 100%
rename from graphics/sane-epkowa/files/patch-03
rename to graphics/sane-epkowa/files/patch-backend_cfg-obj.c
diff --git a/graphics/sane-epkowa/files/patch-02 b/graphics/sane-epkowa/files/patch-frontend__pisa_main.cc
similarity index 100%
rename from graphics/sane-epkowa/files/patch-02
rename to graphics/sane-epkowa/files/patch-frontend__pisa_main.cc
diff --git a/graphics/sane-epkowa/files/patch-01 b/graphics/sane-epkowa/files/patch-headerfix
similarity index 100%
rename from graphics/sane-epkowa/files/patch-01
rename to graphics/sane-epkowa/files/patch-headerfix
diff --git a/graphics/stamp/files/patch-ab b/graphics/stamp/files/patch-lib_rcfile.c
similarity index 100%
rename from graphics/stamp/files/patch-ab
rename to graphics/stamp/files/patch-lib_rcfile.c
diff --git a/graphics/svgalib/files/patch-ae b/graphics/svgalib/files/patch-Makefile
similarity index 100%
rename from graphics/svgalib/files/patch-ae
rename to graphics/svgalib/files/patch-Makefile
diff --git a/graphics/svgalib/files/patch-aa b/graphics/svgalib/files/patch-Makefile.cfg
similarity index 100%
rename from graphics/svgalib/files/patch-aa
rename to graphics/svgalib/files/patch-Makefile.cfg
diff --git a/graphics/svgalib/files/patch-ar b/graphics/svgalib/files/patch-demos-Makefile
similarity index 100%
rename from graphics/svgalib/files/patch-ar
rename to graphics/svgalib/files/patch-demos-Makefile
diff --git a/graphics/svgalib/files/patch-as b/graphics/svgalib/files/patch-demos-accel.c
similarity index 100%
rename from graphics/svgalib/files/patch-as
rename to graphics/svgalib/files/patch-demos-accel.c
diff --git a/graphics/svgalib/files/patch-at b/graphics/svgalib/files/patch-demos-forktest.c
similarity index 100%
rename from graphics/svgalib/files/patch-at
rename to graphics/svgalib/files/patch-demos-forktest.c
diff --git a/graphics/svgalib/files/patch-au b/graphics/svgalib/files/patch-demos-linearfork.c
similarity index 100%
rename from graphics/svgalib/files/patch-au
rename to graphics/svgalib/files/patch-demos-linearfork.c
diff --git a/graphics/svgalib/files/patch-aq b/graphics/svgalib/files/patch-gl-Makefile
similarity index 100%
rename from graphics/svgalib/files/patch-aq
rename to graphics/svgalib/files/patch-gl-Makefile
diff --git a/graphics/svgalib/files/patch-ay b/graphics/svgalib/files/patch-gl-cctext.c
similarity index 100%
rename from graphics/svgalib/files/patch-ay
rename to graphics/svgalib/files/patch-gl-cctext.c
diff --git a/graphics/svgalib/files/patch-ac b/graphics/svgalib/files/patch-gl-inlstring.h
similarity index 100%
rename from graphics/svgalib/files/patch-ac
rename to graphics/svgalib/files/patch-gl-inlstring.h
diff --git a/graphics/svgalib/files/patch-aw b/graphics/svgalib/files/patch-include-linux-kd.h
similarity index 100%
rename from graphics/svgalib/files/patch-aw
rename to graphics/svgalib/files/patch-include-linux-kd.h
diff --git a/graphics/svgalib/files/patch-av b/graphics/svgalib/files/patch-include-linux-keyboard.h
similarity index 100%
rename from graphics/svgalib/files/patch-av
rename to graphics/svgalib/files/patch-include-linux-keyboard.h
diff --git a/graphics/svgalib/files/patch-ab b/graphics/svgalib/files/patch-src-Makefile
similarity index 100%
rename from graphics/svgalib/files/patch-ab
rename to graphics/svgalib/files/patch-src-Makefile
diff --git a/graphics/svgalib/files/patch-ao b/graphics/svgalib/files/patch-src-ark.c
similarity index 100%
rename from graphics/svgalib/files/patch-ao
rename to graphics/svgalib/files/patch-src-ark.c
diff --git a/graphics/svgalib/files/patch-az b/graphics/svgalib/files/patch-src-config-libvga.config
similarity index 100%
rename from graphics/svgalib/files/patch-az
rename to graphics/svgalib/files/patch-src-config-libvga.config
diff --git a/graphics/svgalib/files/patch-ag b/graphics/svgalib/files/patch-src-joystick-joydev.h_1
similarity index 100%
rename from graphics/svgalib/files/patch-ag
rename to graphics/svgalib/files/patch-src-joystick-joydev.h_1
diff --git a/graphics/svgalib/files/patch-af b/graphics/svgalib/files/patch-src-joystick-joydev.h_2
similarity index 100%
rename from graphics/svgalib/files/patch-af
rename to graphics/svgalib/files/patch-src-joystick-joydev.h_2
diff --git a/graphics/svgalib/files/patch-ah b/graphics/svgalib/files/patch-src-keyboard-keyboard.c
similarity index 100%
rename from graphics/svgalib/files/patch-ah
rename to graphics/svgalib/files/patch-src-keyboard-keyboard.c
diff --git a/graphics/svgalib/files/patch-ax b/graphics/svgalib/files/patch-src-keyboard-vgakeyboard.h
similarity index 100%
rename from graphics/svgalib/files/patch-ax
rename to graphics/svgalib/files/patch-src-keyboard-vgakeyboard.h
diff --git a/graphics/svgalib/files/patch-ai b/graphics/svgalib/files/patch-src-libvga.h
similarity index 100%
rename from graphics/svgalib/files/patch-ai
rename to graphics/svgalib/files/patch-src-libvga.h
diff --git a/graphics/svgalib/files/patch-aj b/graphics/svgalib/files/patch-src-mach32.c
similarity index 100%
rename from graphics/svgalib/files/patch-aj
rename to graphics/svgalib/files/patch-src-mach32.c
diff --git a/graphics/svgalib/files/patch-ak b/graphics/svgalib/files/patch-src-mouse-ms.c
similarity index 100%
rename from graphics/svgalib/files/patch-ak
rename to graphics/svgalib/files/patch-src-mouse-ms.c
diff --git a/graphics/svgalib/files/patch-al b/graphics/svgalib/files/patch-src-nv3.c
similarity index 100%
rename from graphics/svgalib/files/patch-al
rename to graphics/svgalib/files/patch-src-nv3.c
diff --git a/graphics/svgalib/files/patch-am b/graphics/svgalib/files/patch-src-vga.c
similarity index 100%
rename from graphics/svgalib/files/patch-am
rename to graphics/svgalib/files/patch-src-vga.c
diff --git a/graphics/svgalib/files/patch-an b/graphics/svgalib/files/patch-src-vgamisc.c
similarity index 100%
rename from graphics/svgalib/files/patch-an
rename to graphics/svgalib/files/patch-src-vgamisc.c
diff --git a/graphics/svgalib/files/patch-ap b/graphics/svgalib/files/patch-utils-Makefile
similarity index 100%
rename from graphics/svgalib/files/patch-ap
rename to graphics/svgalib/files/patch-utils-Makefile
diff --git a/graphics/svgalib/files/patch-ad b/graphics/svgalib/files/patch-utils-gtf-scitech.h
similarity index 100%
rename from graphics/svgalib/files/patch-ad
rename to graphics/svgalib/files/patch-utils-gtf-scitech.h
diff --git a/graphics/tifmerge/files/patch-aa b/graphics/tifmerge/files/patch-tifmerge.c
similarity index 100%
rename from graphics/tifmerge/files/patch-aa
rename to graphics/tifmerge/files/patch-tifmerge.c
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 59b9dbd50c32..946942f8c559 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -10,7 +10,6 @@ MASTER_SITES=	http://download.polytechnic.edu.na/pub2/openpkg1/sources/DST/vcg/
 		http://ftp.sjtu.edu.cn/sites/ftp.openpkg.org/sources/DST/vcg/ \
 		ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
 DISTNAME=	${PORTNAME}.20050204
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visualization Tool for compiler graphs
@@ -19,7 +18,7 @@ LICENSE=	GPLv2 # (or later)
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
-USES=		imake:env
+USES=		imake:env tar:tgz
 USE_XORG=	x11 xext
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/graphics/vcg/files/patch-ap b/graphics/vcg/files/patch-Makefile
similarity index 59%
rename from graphics/vcg/files/patch-ap
rename to graphics/vcg/files/patch-Makefile
index 5b7ffd6ed108..d599982ef49e 100644
--- a/graphics/vcg/files/patch-ap
+++ b/graphics/vcg/files/patch-Makefile
@@ -18,14 +18,3 @@
  compare: preconf xcompare xvcg install
  	/bin/rm $(PROJECTHOME)/../bin/vcg
  	ln -s $(PROJECTHOME)/../bin/xvcg $(PROJECTHOME)/../bin/vcg
---- ./preconf/X11/Imakefile.org	Wed Feb  8 11:48:30 1995
-+++ ./preconf/X11/Imakefile	Thu Jun 12 10:35:35 1997
-@@ -2,7 +2,7 @@
-         DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XLIB)
- 
--all:
-+all::
- 	@ echo "#"
- 	@ echo LIBPATH = -L$(USRLIBDIR)
- 	@ echo INCLUDES = $(ALLINCLUDES)
diff --git a/graphics/vcg/files/patch-aa b/graphics/vcg/files/patch-demo_Makefile
similarity index 100%
rename from graphics/vcg/files/patch-aa
rename to graphics/vcg/files/patch-demo_Makefile
diff --git a/graphics/vcg/files/patch-ab b/graphics/vcg/files/patch-doc_Makefile
similarity index 100%
rename from graphics/vcg/files/patch-ab
rename to graphics/vcg/files/patch-doc_Makefile
diff --git a/graphics/vcg/files/patch-preconf_X11_Imakefile b/graphics/vcg/files/patch-preconf_X11_Imakefile
new file mode 100644
index 000000000000..fdd0c9b5113f
--- /dev/null
+++ b/graphics/vcg/files/patch-preconf_X11_Imakefile
@@ -0,0 +1,11 @@
+--- ./preconf/X11/Imakefile.org	Wed Feb  8 11:48:30 1995
++++ ./preconf/X11/Imakefile	Thu Jun 12 10:35:35 1997
+@@ -2,7 +2,7 @@
+         DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XLIB)
+ 
+-all:
++all::
+ 	@ echo "#"
+ 	@ echo LIBPATH = -L$(USRLIBDIR)
+ 	@ echo INCLUDES = $(ALLINCLUDES)
diff --git a/graphics/vcg/files/patch-ae b/graphics/vcg/files/patch-src_Makefile
similarity index 100%
rename from graphics/vcg/files/patch-ae
rename to graphics/vcg/files/patch-src_Makefile
diff --git a/graphics/vcg/files/patch-ag b/graphics/vcg/files/patch-src_X11dev.c
similarity index 100%
rename from graphics/vcg/files/patch-ag
rename to graphics/vcg/files/patch-src_X11dev.c
diff --git a/graphics/vcg/files/patch-ah b/graphics/vcg/files/patch-src_X11devcl.c
similarity index 100%
rename from graphics/vcg/files/patch-ah
rename to graphics/vcg/files/patch-src_X11devcl.c
diff --git a/graphics/vcg/files/patch-ai b/graphics/vcg/files/patch-src_X11devfe.c
similarity index 100%
rename from graphics/vcg/files/patch-ai
rename to graphics/vcg/files/patch-src_X11devfe.c
diff --git a/graphics/vcg/files/patch-aj b/graphics/vcg/files/patch-src_X11devfs.c
similarity index 100%
rename from graphics/vcg/files/patch-aj
rename to graphics/vcg/files/patch-src_X11devfs.c
diff --git a/graphics/vcg/files/patch-ak b/graphics/vcg/files/patch-src_X11devla.c
similarity index 100%
rename from graphics/vcg/files/patch-ak
rename to graphics/vcg/files/patch-src_X11devla.c
diff --git a/graphics/vcg/files/patch-al b/graphics/vcg/files/patch-src_X11devpb.c
similarity index 100%
rename from graphics/vcg/files/patch-al
rename to graphics/vcg/files/patch-src_X11devpb.c
diff --git a/graphics/vcg/files/patch-am b/graphics/vcg/files/patch-src_X11devst.c
similarity index 100%
rename from graphics/vcg/files/patch-am
rename to graphics/vcg/files/patch-src_X11devst.c
diff --git a/graphics/vcg/files/patch-an b/graphics/vcg/files/patch-src_X11devti.c
similarity index 100%
rename from graphics/vcg/files/patch-an
rename to graphics/vcg/files/patch-src_X11devti.c
diff --git a/graphics/vcg/files/patch-ao b/graphics/vcg/files/patch-src_X11devvw.c
similarity index 100%
rename from graphics/vcg/files/patch-ao
rename to graphics/vcg/files/patch-src_X11devvw.c
diff --git a/graphics/vcg/files/patch-af b/graphics/vcg/files/patch-src_main.c
similarity index 100%
rename from graphics/vcg/files/patch-af
rename to graphics/vcg/files/patch-src_main.c
diff --git a/graphics/vcg/files/patch-ad b/graphics/vcg/files/patch-src_preconf_lex.yy.c
similarity index 100%
rename from graphics/vcg/files/patch-ad
rename to graphics/vcg/files/patch-src_preconf_lex.yy.c
diff --git a/graphics/vcg/files/patch-ac b/graphics/vcg/files/patch-src_preconf_y.tab.c
similarity index 100%
rename from graphics/vcg/files/patch-ac
rename to graphics/vcg/files/patch-src_preconf_y.tab.c
diff --git a/graphics/whirlgif/files/patch-aa b/graphics/whirlgif/files/patch-Makefile
similarity index 100%
rename from graphics/whirlgif/files/patch-aa
rename to graphics/whirlgif/files/patch-Makefile
diff --git a/graphics/xdgagrab/files/patch-aa b/graphics/xdgagrab/files/patch-Makefile
similarity index 100%
rename from graphics/xdgagrab/files/patch-aa
rename to graphics/xdgagrab/files/patch-Makefile
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index ee703b97ef87..6e3ac9f5b668 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/rays/pov
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface to POV-Ray
@@ -16,7 +15,7 @@ COMMENT=	Graphical interface to POV-Ray
 LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	x11 xext xpm
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/graphics/xfpovray/files/patch-ad b/graphics/xfpovray/files/patch-flx_Imakefile
similarity index 100%
rename from graphics/xfpovray/files/patch-ad
rename to graphics/xfpovray/files/patch-flx_Imakefile
diff --git a/graphics/xfpovray/files/patch-ac b/graphics/xfpovray/files/patch-src_Imakefile
similarity index 100%
rename from graphics/xfpovray/files/patch-ac
rename to graphics/xfpovray/files/patch-src_Imakefile
diff --git a/graphics/xfpovray/files/patch-ae b/graphics/xfpovray/files/patch-src_show_image.c
similarity index 100%
rename from graphics/xfpovray/files/patch-ae
rename to graphics/xfpovray/files/patch-src_show_image.c
diff --git a/graphics/xfpovray/files/patch-ab b/graphics/xfpovray/files/patch-src_xfpovray.h
similarity index 100%
rename from graphics/xfpovray/files/patch-ab
rename to graphics/xfpovray/files/patch-src_xfpovray.h
diff --git a/graphics/xfpovray/files/patch-af b/graphics/xfpovray/files/patch-src_xfprovray.c
similarity index 100%
rename from graphics/xfpovray/files/patch-af
rename to graphics/xfpovray/files/patch-src_xfprovray.c
diff --git a/graphics/xfpovray/files/patch-aa b/graphics/xfpovray/files/patch-xfpovraf.cf
similarity index 100%
rename from graphics/xfpovray/files/patch-aa
rename to graphics/xfpovray/files/patch-xfpovraf.cf
diff --git a/graphics/xpx/files/patch-aa b/graphics/xpx/files/patch-Imakefile
similarity index 100%
rename from graphics/xpx/files/patch-aa
rename to graphics/xpx/files/patch-Imakefile
diff --git a/graphics/xzgv/files/patch-aa b/graphics/xzgv/files/patch-Makefile
similarity index 100%
rename from graphics/xzgv/files/patch-aa
rename to graphics/xzgv/files/patch-Makefile
diff --git a/graphics/xzgv/files/patch-ab b/graphics/xzgv/files/patch-doc_Makefile
similarity index 100%
rename from graphics/xzgv/files/patch-ab
rename to graphics/xzgv/files/patch-doc_Makefile