diff --git a/devel/ElectricFence/files/patch-aa b/devel/ElectricFence/files/patch-Makefile
similarity index 100%
rename from devel/ElectricFence/files/patch-aa
rename to devel/ElectricFence/files/patch-Makefile
diff --git a/devel/ElectricFence/files/patch-ab b/devel/ElectricFence/files/patch-page.c
similarity index 100%
rename from devel/ElectricFence/files/patch-ab
rename to devel/ElectricFence/files/patch-page.c
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-Makefile.in
similarity index 100%
rename from devel/ORBit2/files/patch-ab
rename to devel/ORBit2/files/patch-Makefile.in
diff --git a/devel/avltree/files/patch-aa b/devel/avltree/files/patch-Makefile
similarity index 100%
rename from devel/avltree/files/patch-aa
rename to devel/avltree/files/patch-Makefile
diff --git a/devel/bcc/files/patch-ab b/devel/bcc/files/patch-as
similarity index 100%
rename from devel/bcc/files/patch-ab
rename to devel/bcc/files/patch-as
diff --git a/devel/bcc/files/patch-ac b/devel/bcc/files/patch-bcc
similarity index 100%
rename from devel/bcc/files/patch-ac
rename to devel/bcc/files/patch-bcc
diff --git a/devel/bcc/files/patch-aa b/devel/bcc/files/patch-ld
similarity index 100%
rename from devel/bcc/files/patch-aa
rename to devel/bcc/files/patch-ld
diff --git a/devel/boehm-gc/files/patch-ab b/devel/boehm-gc/files/patch-doc_gc.man
similarity index 100%
rename from devel/boehm-gc/files/patch-ab
rename to devel/boehm-gc/files/patch-doc_gc.man
diff --git a/devel/cflow/files/patch-ad b/devel/cflow/files/patch-cflow.1
similarity index 100%
rename from devel/cflow/files/patch-ad
rename to devel/cflow/files/patch-cflow.1
diff --git a/devel/cflow/files/patch-ac b/devel/cflow/files/patch-cflow.sh
similarity index 100%
rename from devel/cflow/files/patch-ac
rename to devel/cflow/files/patch-cflow.sh
diff --git a/devel/cflow/files/patch-ab b/devel/cflow/files/patch-prcc.prototypes.h
similarity index 100%
rename from devel/cflow/files/patch-ab
rename to devel/cflow/files/patch-prcc.prototypes.h
diff --git a/devel/ctags/files/patch-aa b/devel/ctags/files/patch-ctags.1
similarity index 100%
rename from devel/ctags/files/patch-aa
rename to devel/ctags/files/patch-ctags.1
diff --git a/devel/cweb/files/patch-ab b/devel/cweb/files/patch-cweb.1
similarity index 100%
rename from devel/cweb/files/patch-ab
rename to devel/cweb/files/patch-cweb.1
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index b27a8b73bb5a..8ec51e5c2977 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -6,14 +6,13 @@ PORTVERSION=	1.6e
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gedanken.org.uk/software/cxref/download/ \
 		http://fossies.org/linux/misc/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C program cross-referencing & documentation tool
 
 LICENSE=	GPLv2
 
-USES=		gmake shebangfix
+USES=		gmake shebangfix tar:tgz
 SHEBANG_FILES=	contrib/xrgr.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-cxref-cpp
diff --git a/devel/cxref/files/patch-ae b/devel/cxref/files/patch-query_Makefile.in
similarity index 100%
rename from devel/cxref/files/patch-ae
rename to devel/cxref/files/patch-query_Makefile.in
diff --git a/devel/cxref/files/patch-ad b/devel/cxref/files/patch-src_Makefile.in
similarity index 100%
rename from devel/cxref/files/patch-ad
rename to devel/cxref/files/patch-src_Makefile.in
diff --git a/devel/doxygen/files/patch-ah b/devel/doxygen/files/patch-doc-doxygen_manual.tex
similarity index 100%
rename from devel/doxygen/files/patch-ah
rename to devel/doxygen/files/patch-doc-doxygen_manual.tex
diff --git a/devel/elftoaout/files/patch-aa b/devel/elftoaout/files/patch-elftoaout.c
similarity index 100%
rename from devel/elftoaout/files/patch-aa
rename to devel/elftoaout/files/patch-elftoaout.c
diff --git a/devel/f77flow/files/patch-aa b/devel/f77flow/files/patch-Makefile
similarity index 100%
rename from devel/f77flow/files/patch-aa
rename to devel/f77flow/files/patch-Makefile
diff --git a/devel/f77flow/files/patch-ab b/devel/f77flow/files/patch-flow.c
similarity index 100%
rename from devel/f77flow/files/patch-ab
rename to devel/f77flow/files/patch-flow.c
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-Makefile.ins
similarity index 100%
rename from devel/glib12/files/patch-ab
rename to devel/glib12/files/patch-Makefile.ins
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-configure
similarity index 100%
rename from devel/glib12/files/patch-ae
rename to devel/glib12/files/patch-configure
diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-glib-config.in
similarity index 100%
rename from devel/glib12/files/patch-ac
rename to devel/glib12/files/patch-glib-config.in
diff --git a/devel/glib12/files/patch-af b/devel/glib12/files/patch-glib.h
similarity index 100%
rename from devel/glib12/files/patch-af
rename to devel/glib12/files/patch-glib.h
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-configure
similarity index 100%
rename from devel/glib20/files/patch-ae
rename to devel/glib20/files/patch-configure
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-doc_reference_Makefile.in
similarity index 100%
rename from devel/glib20/files/patch-ah
rename to devel/glib20/files/patch-doc_reference_Makefile.in
diff --git a/devel/gmake-lite/files/patch-ab b/devel/gmake-lite/files/patch-doc_make.texi
similarity index 100%
rename from devel/gmake-lite/files/patch-ab
rename to devel/gmake-lite/files/patch-doc_make.texi
diff --git a/devel/gmake/files/patch-ab b/devel/gmake/files/patch-doc_make.text
similarity index 100%
rename from devel/gmake/files/patch-ab
rename to devel/gmake/files/patch-doc_make.text
diff --git a/devel/libPropList/files/patch-ab b/devel/libPropList/files/patch-filehandling.c
similarity index 100%
rename from devel/libPropList/files/patch-ab
rename to devel/libPropList/files/patch-filehandling.c
diff --git a/devel/libcii/files/patch-ab b/devel/libcii/files/patch-src_swtch.s
similarity index 100%
rename from devel/libcii/files/patch-ab
rename to devel/libcii/files/patch-src_swtch.s
diff --git a/devel/libcii/files/patch-aa b/devel/libcii/files/patch-src_thread.c
similarity index 100%
rename from devel/libcii/files/patch-aa
rename to devel/libcii/files/patch-src_thread.c
diff --git a/devel/libdlmalloc/files/patch-aa b/devel/libdlmalloc/files/patch-malloc-2.8.6.c
similarity index 100%
rename from devel/libdlmalloc/files/patch-aa
rename to devel/libdlmalloc/files/patch-malloc-2.8.6.c
diff --git a/devel/libgetline/files/patch-aa b/devel/libgetline/files/patch-CHANGES
similarity index 100%
rename from devel/libgetline/files/patch-aa
rename to devel/libgetline/files/patch-CHANGES
diff --git a/devel/libgetline/files/patch-ab b/devel/libgetline/files/patch-Makefile
similarity index 100%
rename from devel/libgetline/files/patch-ab
rename to devel/libgetline/files/patch-Makefile
diff --git a/devel/libol/files/patch-aa b/devel/libol/files/patch-configure
similarity index 100%
rename from devel/libol/files/patch-aa
rename to devel/libol/files/patch-configure
diff --git a/devel/libole2/files/patch-aa b/devel/libole2/files/patch-Makefile.in
similarity index 100%
rename from devel/libole2/files/patch-aa
rename to devel/libole2/files/patch-Makefile.in
diff --git a/devel/libole2/files/patch-ab b/devel/libole2/files/patch-libole2Conf.sh.in
similarity index 100%
rename from devel/libole2/files/patch-ab
rename to devel/libole2/files/patch-libole2Conf.sh.in
diff --git a/devel/libtai/files/patch-aa b/devel/libtai/files/patch-Makefile
similarity index 100%
rename from devel/libtai/files/patch-aa
rename to devel/libtai/files/patch-Makefile
diff --git a/devel/libtai/files/patch-ab b/devel/libtai/files/patch-conf-ccso
similarity index 100%
rename from devel/libtai/files/patch-ab
rename to devel/libtai/files/patch-conf-ccso
diff --git a/devel/libtai/files/patch-ag b/devel/libtai/files/patch-leadsecs_read.c
similarity index 100%
rename from devel/libtai/files/patch-ag
rename to devel/libtai/files/patch-leadsecs_read.c
diff --git a/devel/libtai/files/patch-af b/devel/libtai/files/patch-leapsecs.3
similarity index 100%
rename from devel/libtai/files/patch-af
rename to devel/libtai/files/patch-leapsecs.3
diff --git a/devel/libtai/files/patch-ac b/devel/libtai/files/patch-make-compile.sh
similarity index 100%
rename from devel/libtai/files/patch-ac
rename to devel/libtai/files/patch-make-compile.sh
diff --git a/devel/libtai/files/patch-ad b/devel/libtai/files/patch-make-compileso.sh
similarity index 100%
rename from devel/libtai/files/patch-ad
rename to devel/libtai/files/patch-make-compileso.sh
diff --git a/devel/libtai/files/patch-ae b/devel/libtai/files/patch-make-makelibso.sh
similarity index 100%
rename from devel/libtai/files/patch-ae
rename to devel/libtai/files/patch-make-makelibso.sh
diff --git a/devel/libunicode/files/patch-aa b/devel/libunicode/files/patch-Makefile.in
similarity index 100%
rename from devel/libunicode/files/patch-aa
rename to devel/libunicode/files/patch-Makefile.in
diff --git a/devel/mkcmd/files/patch-ae b/devel/mkcmd/files/patch-bin_mkcmd_Make.host
similarity index 100%
rename from devel/mkcmd/files/patch-ae
rename to devel/mkcmd/files/patch-bin_mkcmd_Make.host
diff --git a/devel/mkcmd/files/patch-aa b/devel/mkcmd/files/patch-bin_mkcmd_machine.h
similarity index 100%
rename from devel/mkcmd/files/patch-aa
rename to devel/mkcmd/files/patch-bin_mkcmd_machine.h
diff --git a/devel/mkcmd/files/patch-ab b/devel/mkcmd/files/patch-bin_mkcmd_mkcmd.man
similarity index 100%
rename from devel/mkcmd/files/patch-ab
rename to devel/mkcmd/files/patch-bin_mkcmd_mkcmd.man
diff --git a/devel/mkcmd/files/patch-ac b/devel/mkcmd/files/patch-lib_mkcmd_Make.host
similarity index 100%
rename from devel/mkcmd/files/patch-ac
rename to devel/mkcmd/files/patch-lib_mkcmd_Make.host
diff --git a/devel/mkcmd/files/patch-ad b/devel/mkcmd/files/patch-lib_mkcmd_mkcmd.man
similarity index 100%
rename from devel/mkcmd/files/patch-ad
rename to devel/mkcmd/files/patch-lib_mkcmd_mkcmd.man
diff --git a/devel/msrc0/files/patch-aa b/devel/msrc0/files/patch-makeme
similarity index 100%
rename from devel/msrc0/files/patch-aa
rename to devel/msrc0/files/patch-makeme
diff --git a/devel/p5-Cdk/files/patch-ad b/devel/p5-Cdk/files/patch-demos_rolodex
similarity index 100%
rename from devel/p5-Cdk/files/patch-ad
rename to devel/p5-Cdk/files/patch-demos_rolodex
diff --git a/devel/p5-Locale-PGetText/files/patch-aa b/devel/p5-Locale-PGetText/files/patch-Makefile.PL
similarity index 100%
rename from devel/p5-Locale-PGetText/files/patch-aa
rename to devel/p5-Locale-PGetText/files/patch-Makefile.PL
diff --git a/devel/p5-TraceFuncs/files/patch-aa b/devel/p5-TraceFuncs/files/patch-Makefile.PL
similarity index 100%
rename from devel/p5-TraceFuncs/files/patch-aa
rename to devel/p5-TraceFuncs/files/patch-Makefile.PL
diff --git a/devel/ruby-locale/Makefile b/devel/ruby-locale/Makefile
index badcef64e4f8..6c039095f6dd 100644
--- a/devel/ruby-locale/Makefile
+++ b/devel/ruby-locale/Makefile
@@ -23,15 +23,10 @@ INSTALL_TARGET=	site-install
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${RUBY_MODDOCDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.rb ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-locale/files/patch-ab b/devel/ruby-locale/files/patch-rblocale.c
similarity index 100%
rename from devel/ruby-locale/files/patch-ab
rename to devel/ruby-locale/files/patch-rblocale.c
diff --git a/devel/sdts++/files/patch-aa b/devel/sdts++/files/patch-doc__sdts++.texi
similarity index 100%
rename from devel/sdts++/files/patch-aa
rename to devel/sdts++/files/patch-doc__sdts++.texi
diff --git a/devel/sdts++/files/patch-ab b/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp
similarity index 100%
rename from devel/sdts++/files/patch-ab
rename to devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 41303e55171f..4277ea31a8cc 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -27,7 +27,7 @@ do-build:
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/sfio
 	${INSTALL_DATA} ${WRKDIR}/include/* ${STAGEDIR}${PREFIX}/include/sfio
-	cd ${WRKDIR}/lib ; ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib
+	(cd ${WRKDIR}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib)
 	${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3
 
diff --git a/devel/sfio/files/patch-ac b/devel/sfio/files/patch-src_lib_sfio_Sfio_dc_Makefile
similarity index 100%
rename from devel/sfio/files/patch-ac
rename to devel/sfio/files/patch-src_lib_sfio_Sfio_dc_Makefile
diff --git a/devel/sfio/files/patch-ad b/devel/sfio/files/patch-src_lib_sfio_Sfio_f_Makefile
similarity index 100%
rename from devel/sfio/files/patch-ad
rename to devel/sfio/files/patch-src_lib_sfio_Sfio_f_Makefile
diff --git a/devel/sfio/files/patch-ag b/devel/sfio/files/patch-src_lib_sfio_Sfio_t_runtest
similarity index 100%
rename from devel/sfio/files/patch-ag
rename to devel/sfio/files/patch-src_lib_sfio_Sfio_t_runtest
diff --git a/devel/sfio/files/patch-ae b/devel/sfio/files/patch-src_lib_sfio_Stdio_b_Makefile
similarity index 100%
rename from devel/sfio/files/patch-ae
rename to devel/sfio/files/patch-src_lib_sfio_Stdio_b_Makefile
diff --git a/devel/sfio/files/patch-af b/devel/sfio/files/patch-src_lib_sfio_Stdio_s_Makefile
similarity index 100%
rename from devel/sfio/files/patch-af
rename to devel/sfio/files/patch-src_lib_sfio_Stdio_s_Makefile
diff --git a/devel/sfio/files/patch-aa b/devel/sfio/files/patch-src_lib_sfio_makefile
similarity index 100%
rename from devel/sfio/files/patch-aa
rename to devel/sfio/files/patch-src_lib_sfio_makefile
diff --git a/devel/sfio/files/patch-ab b/devel/sfio/files/patch-src_lib_sfio_sfhdr.h
similarity index 100%
rename from devel/sfio/files/patch-ab
rename to devel/sfio/files/patch-src_lib_sfio_sfhdr.h
diff --git a/devel/tclgetopts/files/patch-aa b/devel/tclgetopts/files/patch-foxTypedOpts.tcl
similarity index 100%
rename from devel/tclgetopts/files/patch-aa
rename to devel/tclgetopts/files/patch-foxTypedOpts.tcl
diff --git a/devel/tclgetopts/files/patch-ab b/devel/tclgetopts/files/patch-typedopts.n
similarity index 100%
rename from devel/tclgetopts/files/patch-ab
rename to devel/tclgetopts/files/patch-typedopts.n
diff --git a/devel/tkinspect/files/patch-aa b/devel/tkinspect/files/patch-install.tcl
similarity index 100%
rename from devel/tkinspect/files/patch-aa
rename to devel/tkinspect/files/patch-install.tcl
diff --git a/devel/tkinspect/files/patch-ab b/devel/tkinspect/files/patch-tkinspect.tcl
similarity index 100%
rename from devel/tkinspect/files/patch-ab
rename to devel/tkinspect/files/patch-tkinspect.tcl
diff --git a/devel/uclmmbase/files/patch-af b/devel/uclmmbase/files/patch-src__mbus_parser.c
similarity index 100%
rename from devel/uclmmbase/files/patch-af
rename to devel/uclmmbase/files/patch-src__mbus_parser.c
diff --git a/devel/xxgdb/files/patch-ab b/devel/xxgdb/files/patch-Imakefile
similarity index 100%
rename from devel/xxgdb/files/patch-ab
rename to devel/xxgdb/files/patch-Imakefile
diff --git a/devel/xxgdb/files/patch-ac b/devel/xxgdb/files/patch-calldbx.c
similarity index 100%
rename from devel/xxgdb/files/patch-ac
rename to devel/xxgdb/files/patch-calldbx.c
diff --git a/devel/xxgdb/files/patch-ah b/devel/xxgdb/files/patch-command.c
similarity index 100%
rename from devel/xxgdb/files/patch-ah
rename to devel/xxgdb/files/patch-command.c
diff --git a/devel/xxgdb/files/patch-ad b/devel/xxgdb/files/patch-filemenu.c
similarity index 100%
rename from devel/xxgdb/files/patch-ad
rename to devel/xxgdb/files/patch-filemenu.c
diff --git a/devel/xxgdb/files/patch-ae b/devel/xxgdb/files/patch-global.h
similarity index 100%
rename from devel/xxgdb/files/patch-ae
rename to devel/xxgdb/files/patch-global.h
diff --git a/devel/xxgdb/files/patch-af b/devel/xxgdb/files/patch-regex.c
similarity index 100%
rename from devel/xxgdb/files/patch-af
rename to devel/xxgdb/files/patch-regex.c
diff --git a/devel/xxgdb/files/patch-ai b/devel/xxgdb/files/patch-signals.c
similarity index 100%
rename from devel/xxgdb/files/patch-ai
rename to devel/xxgdb/files/patch-signals.c
diff --git a/devel/xxgdb/files/patch-ag b/devel/xxgdb/files/patch-source.c
similarity index 100%
rename from devel/xxgdb/files/patch-ag
rename to devel/xxgdb/files/patch-source.c