diff --git a/emulators/aftp/files/patch-aa b/emulators/aftp/files/patch-Makefile
similarity index 100%
rename from emulators/aftp/files/patch-aa
rename to emulators/aftp/files/patch-Makefile
diff --git a/emulators/aftp/files/patch-ab b/emulators/aftp/files/patch-aftp.c
similarity index 100%
rename from emulators/aftp/files/patch-ab
rename to emulators/aftp/files/patch-aftp.c
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 567512512094..02aa0682570c 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Extensible hardware simulation framework with MC68K support
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_ENV=	PROJECT_BASE=${STAGEDIR}${PREFIX} WRKSRC=${WRKSRC} WISH=${WISH}
 
-USES+=		tk
+USES=		tk
 MAKE_JOBS_UNSAFE=	yes
 
 pre-patch:
diff --git a/emulators/bsvc/files/patch-ai b/emulators/bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx_2
similarity index 100%
rename from emulators/bsvc/files/patch-ai
rename to emulators/bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx_2
diff --git a/emulators/bsvc/files/patch-af b/emulators/bsvc/files/patch-UI__Makefile
similarity index 100%
rename from emulators/bsvc/files/patch-af
rename to emulators/bsvc/files/patch-UI__Makefile
diff --git a/emulators/bsvc/files/patch-ag b/emulators/bsvc/files/patch-sim68300__cpu__Makefile
similarity index 100%
rename from emulators/bsvc/files/patch-ag
rename to emulators/bsvc/files/patch-sim68300__cpu__Makefile
diff --git a/emulators/bsvc/files/patch-ah b/emulators/bsvc/files/patch-sim68360__cpu__Makefile
similarity index 100%
rename from emulators/bsvc/files/patch-ah
rename to emulators/bsvc/files/patch-sim68360__cpu__Makefile
diff --git a/emulators/cpmemu/files/patch-ab b/emulators/cpmemu/files/patch-Makefile
similarity index 100%
rename from emulators/cpmemu/files/patch-ab
rename to emulators/cpmemu/files/patch-Makefile
diff --git a/emulators/cpmemu/files/patch-ac b/emulators/cpmemu/files/patch-bios.c
similarity index 100%
rename from emulators/cpmemu/files/patch-ac
rename to emulators/cpmemu/files/patch-bios.c
diff --git a/emulators/cpmemu/files/patch-ad b/emulators/cpmemu/files/patch-io.c
similarity index 100%
rename from emulators/cpmemu/files/patch-ad
rename to emulators/cpmemu/files/patch-io.c
diff --git a/emulators/cpmemu/files/patch-ae b/emulators/cpmemu/files/patch-low.c
similarity index 100%
rename from emulators/cpmemu/files/patch-ae
rename to emulators/cpmemu/files/patch-low.c
diff --git a/emulators/darcnes/files/patch-ab b/emulators/darcnes/files/patch-Makefile
similarity index 100%
rename from emulators/darcnes/files/patch-ab
rename to emulators/darcnes/files/patch-Makefile
diff --git a/emulators/darcnes/files/patch-aa b/emulators/darcnes/files/patch-snd_unix.c
similarity index 100%
rename from emulators/darcnes/files/patch-aa
rename to emulators/darcnes/files/patch-snd_unix.c
diff --git a/emulators/gbe/files/patch-aa b/emulators/gbe/files/patch-Makefile
similarity index 100%
rename from emulators/gbe/files/patch-aa
rename to emulators/gbe/files/patch-Makefile
diff --git a/emulators/gbe/files/patch-ab b/emulators/gbe/files/patch-vram.c
similarity index 100%
rename from emulators/gbe/files/patch-ab
rename to emulators/gbe/files/patch-vram.c
diff --git a/emulators/gxemul/files/patch-aa b/emulators/gxemul/files/patch-src_devices_dev_wdc.cc
similarity index 100%
rename from emulators/gxemul/files/patch-aa
rename to emulators/gxemul/files/patch-src_devices_dev_wdc.cc
diff --git a/emulators/gxemul/files/patch-ab b/emulators/gxemul/files/patch-src_include_refcount_ptr.h
similarity index 100%
rename from emulators/gxemul/files/patch-ab
rename to emulators/gxemul/files/patch-src_include_refcount_ptr.h
diff --git a/emulators/klh10/files/patch-aa b/emulators/klh10/files/patch-src_Mk-fbx86.mk
similarity index 100%
rename from emulators/klh10/files/patch-aa
rename to emulators/klh10/files/patch-src_Mk-fbx86.mk
diff --git a/emulators/klh10/files/patch-ab b/emulators/klh10/files/patch-src_vmtape.c
similarity index 100%
rename from emulators/klh10/files/patch-ab
rename to emulators/klh10/files/patch-src_vmtape.c
diff --git a/emulators/qemu-devel/files/patch-bg b/emulators/qemu-devel/files/patch-qemu-include-net-net.h
similarity index 100%
rename from emulators/qemu-devel/files/patch-bg
rename to emulators/qemu-devel/files/patch-qemu-include-net-net.h
diff --git a/emulators/qemu-devel/files/patch-bf b/emulators/qemu-devel/files/patch-qemu-slirp-slirp_config.h
similarity index 100%
rename from emulators/qemu-devel/files/patch-bf
rename to emulators/qemu-devel/files/patch-qemu-slirp-slirp_config.h
diff --git a/emulators/qemu/files/patch-bg b/emulators/qemu/files/patch-qemu_Makefiles
similarity index 100%
rename from emulators/qemu/files/patch-bg
rename to emulators/qemu/files/patch-qemu_Makefiles
diff --git a/emulators/qemu/files/patch-ac b/emulators/qemu/files/patch-qemu_configure_1
similarity index 100%
rename from emulators/qemu/files/patch-ac
rename to emulators/qemu/files/patch-qemu_configure_1
diff --git a/emulators/qemu/files/patch-bd b/emulators/qemu/files/patch-qemu_configure_2
similarity index 100%
rename from emulators/qemu/files/patch-bd
rename to emulators/qemu/files/patch-qemu_configure_2
diff --git a/emulators/qemu/files/patch-bt b/emulators/qemu/files/patch-qemu_net.c
similarity index 100%
rename from emulators/qemu/files/patch-bt
rename to emulators/qemu/files/patch-qemu_net.c
diff --git a/emulators/qemu/files/patch-bf b/emulators/qemu/files/patch-qemu_slirp_slirp_config.h
similarity index 100%
rename from emulators/qemu/files/patch-bf
rename to emulators/qemu/files/patch-qemu_slirp_slirp_config.h
diff --git a/emulators/sim6811/files/patch-ac b/emulators/sim6811/files/patch-main.c
similarity index 100%
rename from emulators/sim6811/files/patch-ac
rename to emulators/sim6811/files/patch-main.c
diff --git a/emulators/sim6811/files/patch-ab b/emulators/sim6811/files/patch-sim6811.1
similarity index 100%
rename from emulators/sim6811/files/patch-ab
rename to emulators/sim6811/files/patch-sim6811.1
diff --git a/emulators/snes9x/files/patch-ad b/emulators/snes9x/files/patch-memmap.cpp
similarity index 100%
rename from emulators/snes9x/files/patch-ad
rename to emulators/snes9x/files/patch-memmap.cpp
diff --git a/emulators/snes9x/files/patch-ae b/emulators/snes9x/files/patch-port.h
similarity index 100%
rename from emulators/snes9x/files/patch-ae
rename to emulators/snes9x/files/patch-port.h
diff --git a/emulators/snes9x/files/patch-af b/emulators/snes9x/files/patch-unix_unix.cpp
similarity index 100%
rename from emulators/snes9x/files/patch-af
rename to emulators/snes9x/files/patch-unix_unix.cpp
diff --git a/emulators/snes9x/files/patch-ag b/emulators/snes9x/files/patch-unix_xf86.cpp
similarity index 100%
rename from emulators/snes9x/files/patch-ag
rename to emulators/snes9x/files/patch-unix_xf86.cpp
diff --git a/emulators/snes9x/files/patch-ah b/emulators/snes9x/files/patch-unzip_unzip.h
similarity index 100%
rename from emulators/snes9x/files/patch-ah
rename to emulators/snes9x/files/patch-unzip_unzip.h
diff --git a/emulators/vice/files/patch-ab b/emulators/vice/files/patch-man_c1541.1
similarity index 100%
rename from emulators/vice/files/patch-ab
rename to emulators/vice/files/patch-man_c1541.1
diff --git a/emulators/vice/files/patch-ac b/emulators/vice/files/patch-man_vice.1
similarity index 100%
rename from emulators/vice/files/patch-ac
rename to emulators/vice/files/patch-man_vice.1