From 6df3e23245b2c3793f24e4c42dd330d59419494c Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 28 Jul 2014 14:12:36 +0000
Subject: [PATCH] Rename audio/ patch-xy patches to reflect the files they
 modify.

---
 audio/ascd/files/{patch-ae => patch-Imakefile}                 | 0
 audio/ascd/files/{patch-ag => patch-faktory.c}                 | 0
 audio/ascd/files/{patch-aa => patch-misc_config.h.default}     | 0
 audio/ascd/files/{patch-ab => patch-misc_dirs.h.default}       | 0
 audio/boodler/files/{patch-ab => patch-configure.py}           | 0
 audio/boodler/files/{patch-aa => patch-wrapper_boodler}        | 0
 audio/btc/files/{patch-aa => patch-btc.c}                      | 0
 audio/cam/Makefile                                             | 3 ++-
 audio/cam/files/{patch-ac => patch-sounds.c}                   | 0
 audio/cd-console/files/{patch-aa => patch-Makefile}            | 0
 audio/cd-console/files/{patch-ac => patch-cd-console.cpp}      | 0
 audio/cd-console/files/{patch-ab => patch-cd_ll_bsd.cpp}       | 0
 audio/cdplay/Makefile                                          | 2 +-
 audio/cdplay/files/{patch-ab => patch-cd.c}                    | 0
 audio/cdplay/files/{patch-ac => patch-cdplay.1}                | 0
 audio/cdplay/files/{patch-ad => patch-cdplay.h}                | 0
 audio/cdplay/files/{patch-ae => patch-main.c}                  | 0
 audio/cplay/files/{patch-aa => patch-Makefile}                 | 0
 audio/dagrab/files/{patch-aa => patch-Makefile}                | 0
 audio/dagrab/files/{patch-ab => patch-dagrab.c}                | 0
 audio/esound/files/{patch-aa => patch-Makefile.in}             | 0
 audio/esound/files/{patch-ac => patch-esd.c}                   | 0
 audio/esound/files/{patch-ad => patch-esdlib.c}                | 0
 audio/fcplay/files/{patch-ab => patch-AudioDriver.h}           | 0
 audio/fcplay/files/{patch-aa => patch-POINTER}                 | 0
 audio/fcplay/files/{patch-ac => patch-configure}               | 0
 .../files/{patch-aa => patch-festival_info_festival.info}      | 0
 .../{patch-ah => patch-festival_config_modules_nas_audio.mak}  | 0
 .../files/{patch-ap => patch-speech_tools_audio_nas.cc}        | 0
 ...atch-ag => patch-speech_tools_config_modules_nas_audio.mak} | 0
 .../files/{patch-ae => patch-speech_tools_include_EST_unix.h}  | 0
 audio/gkrellmms2/files/{patch-aa => patch-Makefile}            | 0
 audio/gkrellmvolume2/files/{patch-aa => patch-Makefile}        | 0
 audio/gmixer/files/{patch-aa => patch-Makefile}                | 0
 audio/gsm/files/{patch-aa => patch-inc_config.h}               | 0
 audio/id3ren/files/{patch-aa => patch-src_Makefile}            | 0
 audio/id3ren/files/{patch-ab => patch-src_id3tag.c}            | 0
 audio/juke/files/{patch-ab => patch-src_conf.c}                | 0
 audio/juke/files/{patch-aa => patch-src_conf.h}                | 0
 audio/mp3wrap/Makefile                                         | 2 +-
 audio/mp3wrap/files/{patch-aa => patch-crc.c}                  | 0
 audio/nas/files/{patch-af => patch-config_NetAudio.def}        | 0
 .../files/{patch-ab => patch-server_dda_voxware_auvoxware.c}   | 0
 .../files/{patch-aa => patch_clients_audio_audial_audial.c}    | 0
 audio/nosefart/files/{patch-aa => patch-Makefile}              | 0
 audio/nspmod/files/{patch-ab => patch-Makefile}                | 0
 audio/nspmod/files/{patch-aa => patch-dacio-linux.c}           | 0
 audio/nspmod/files/{patch-ad => patch-dacio.h}                 | 0
 audio/nspmod/files/{patch-ac => patch-nspmod.c}                | 0
 audio/nspmod/files/{patch-ae => patch-nspmod.h}                | 0
 audio/rplay/files/{patch-ac => patch-Makefile.config.in}       | 0
 audio/rplay/files/{patch-ad => patch-doc_Makefile.in}          | 0
 audio/rplay/files/{patch-ae => patch-doc_RPLAY.texi}           | 0
 audio/rplay/files/{patch-af => patch-doc_RPTP.texi}            | 0
 audio/rplay/files/{patch-ag => patch-doc_librplay.texi}        | 0
 audio/rplay/files/{patch-ai => patch-doc_rplayd.8}             | 0
 audio/rplay/files/{patch-ah => patch-doc_rplayd.texi}          | 0
 audio/rplay/files/{patch-aj => patch-librplay_Makefile.in}     | 0
 audio/rplay/files/{patch-ab => patch-rplayd_Makefile.in}       | 0
 .../files/{patch-an => patch-rplayd__audio__audio_FreeBSD.c}   | 0
 audio/rplay/files/{patch-ak => patch-rplayd_sound.h}           | 0
 audio/rplay/files/{patch-al => patch-rplayd_spool.c}           | 0
 audio/rplay/files/{patch-am => patch-rx_Makefile.in}           | 0
 audio/rsynth/Makefile                                          | 2 +-
 audio/rsynth/files/{patch-ac => patch-Makefile.in}             | 0
 audio/rsynth/files/{patch-aa => patch-naplay.c}                | 0
 audio/s3mod/files/{patch-ab => patch-Makefile}                 | 0
 audio/s3mod/files/{patch-ac => patch-config.h}                 | 0
 audio/s3mod/files/{patch-ae => patch-gus.c}                    | 0
 audio/s3mod/files/{patch-af => patch-gus.h}                    | 0
 audio/s3mod/files/{patch-ag => patch-main.c}                   | 0
 audio/s3mod/files/{patch-ah => patch-main.h}                   | 0
 audio/s3mod/files/{patch-ai => patch-mod.c}                    | 0
 audio/s3mod/files/{patch-aj => patch-play.c}                   | 0
 audio/s3mod/files/{patch-ak => patch-tables.h}                 | 0
 audio/shout/Makefile                                           | 2 +-
 audio/shout/files/{patch-ac => patch-configure}                | 0
 audio/shout/files/{patch-aa => patch-sock.c}                   | 0
 audio/shout/files/{patch-ab => patch-util.c}                   | 0
 audio/splaytk/files/{patch-aa => patch-splay-tk.tcl}           | 0
 audio/tclmidi/files/{patch-aa => patch-Makefile.ins}           | 0
 audio/tclmidi/files/{patch-ab => patch-configure}              | 0
 audio/tclmidi/files/{patch-ac => patch-smf_SMFTrack.cxx}       | 0
 audio/tosha/files/{patch-aa => patch-tosha.c}                  | 0
 audio/xmcd/files/{patch-ab => patch-Imakefile}                 | 0
 audio/xmcd/files/{patch-ac => patch-cda_d__Imakefile}          | 0
 audio/xmcd/files/{patch-ad => patch-cdda_d__Imakefile}         | 0
 audio/xmcd/files/{patch-ak => patch-cdda_d__if_flac.c}         | 0
 audio/xmcd/files/{patch-ah => patch-cdda_d__pthr.c}            | 0
 audio/xmcd/files/{patch-aj => patch-cddb_d__Imakefile}         | 0
 audio/xmcd/files/{patch-ai => patch-libdi_d__config.sh}        | 0
 audio/xmcd/files/{patch-af => patch-util_d__Imakefile}         | 0
 audio/xmcd/files/{patch-aa => patch-xmcd_d__Imakefile}         | 0
 audio/xmix/files/{patch-aa => patch-Imakefile}                 | 0
 audio/xmix/files/{patch-ab => patch-xmix.c}                    | 0
 audio/xmixer/files/{patch-af => patch-xmixer.man}              | 0
 audio/xmms-mailnotify/files/{patch-aa => patch-mailnotify.c_1} | 0
 audio/xmms-mailnotify/files/{patch-ab => patch-mailnotify.c_2} | 0
 audio/xmms-mailnotify/files/{patch-ac => patch-mailnotify.c_3} | 0
 audio/xmradio/files/{patch-aa => patch-Imakefile}              | 0
 audio/xmradio/files/{patch-ac => patch-analyzer.c}             | 0
 audio/xmradio/files/{patch-ad => patch-radio.c}                | 0
 audio/xmradio/files/{patch-ab => patch-sample.c}               | 0
 audio/xwave/files/{patch-ap => patch-FWF_Imakefile}            | 0
 audio/xwave/files/{patch-at => patch-FWF_src_Imakefile}        | 0
 audio/xwave/files/{patch-al => patch-config.site}              | 0
 audio/xwave/files/{patch-aa => patch-src_Imakefile}            | 0
 audio/xwave/files/{patch-ar => patch-src_XWave}                | 0
 audio/xwave/files/{patch-ai => patch-src__record_dialog.c}     | 0
 audio/xwave/files/{patch-ab => patch-src_aifc.c}               | 0
 audio/xwave/files/{patch-ac => patch-src_au.c}                 | 0
 audio/xwave/files/{patch-ad => patch-src_audio.c}              | 0
 audio/xwave/files/{patch-ae => patch-src_button.c}             | 0
 audio/xwave/files/{patch-as => patch-src_edit.c}               | 0
 audio/xwave/files/{patch-af => patch-src_effects.c}            | 0
 audio/xwave/files/{patch-ag => patch-src_endian.c}             | 0
 audio/xwave/files/{patch-ah => patch-src_graphics.c}           | 0
 audio/xwave/files/{patch-aj => patch-src_riff.c}               | 0
 audio/xwave/files/{patch-aq => patch-src_types.h}              | 0
 119 files changed, 6 insertions(+), 5 deletions(-)
 rename audio/ascd/files/{patch-ae => patch-Imakefile} (100%)
 rename audio/ascd/files/{patch-ag => patch-faktory.c} (100%)
 rename audio/ascd/files/{patch-aa => patch-misc_config.h.default} (100%)
 rename audio/ascd/files/{patch-ab => patch-misc_dirs.h.default} (100%)
 rename audio/boodler/files/{patch-ab => patch-configure.py} (100%)
 rename audio/boodler/files/{patch-aa => patch-wrapper_boodler} (100%)
 rename audio/btc/files/{patch-aa => patch-btc.c} (100%)
 rename audio/cam/files/{patch-ac => patch-sounds.c} (100%)
 rename audio/cd-console/files/{patch-aa => patch-Makefile} (100%)
 rename audio/cd-console/files/{patch-ac => patch-cd-console.cpp} (100%)
 rename audio/cd-console/files/{patch-ab => patch-cd_ll_bsd.cpp} (100%)
 rename audio/cdplay/files/{patch-ab => patch-cd.c} (100%)
 rename audio/cdplay/files/{patch-ac => patch-cdplay.1} (100%)
 rename audio/cdplay/files/{patch-ad => patch-cdplay.h} (100%)
 rename audio/cdplay/files/{patch-ae => patch-main.c} (100%)
 rename audio/cplay/files/{patch-aa => patch-Makefile} (100%)
 rename audio/dagrab/files/{patch-aa => patch-Makefile} (100%)
 rename audio/dagrab/files/{patch-ab => patch-dagrab.c} (100%)
 rename audio/esound/files/{patch-aa => patch-Makefile.in} (100%)
 rename audio/esound/files/{patch-ac => patch-esd.c} (100%)
 rename audio/esound/files/{patch-ad => patch-esdlib.c} (100%)
 rename audio/fcplay/files/{patch-ab => patch-AudioDriver.h} (100%)
 rename audio/fcplay/files/{patch-aa => patch-POINTER} (100%)
 rename audio/fcplay/files/{patch-ac => patch-configure} (100%)
 rename audio/festdoc/files/{patch-aa => patch-festival_info_festival.info} (100%)
 rename audio/festival/files/{patch-ah => patch-festival_config_modules_nas_audio.mak} (100%)
 rename audio/festival/files/{patch-ap => patch-speech_tools_audio_nas.cc} (100%)
 rename audio/festival/files/{patch-ag => patch-speech_tools_config_modules_nas_audio.mak} (100%)
 rename audio/festival/files/{patch-ae => patch-speech_tools_include_EST_unix.h} (100%)
 rename audio/gkrellmms2/files/{patch-aa => patch-Makefile} (100%)
 rename audio/gkrellmvolume2/files/{patch-aa => patch-Makefile} (100%)
 rename audio/gmixer/files/{patch-aa => patch-Makefile} (100%)
 rename audio/gsm/files/{patch-aa => patch-inc_config.h} (100%)
 rename audio/id3ren/files/{patch-aa => patch-src_Makefile} (100%)
 rename audio/id3ren/files/{patch-ab => patch-src_id3tag.c} (100%)
 rename audio/juke/files/{patch-ab => patch-src_conf.c} (100%)
 rename audio/juke/files/{patch-aa => patch-src_conf.h} (100%)
 rename audio/mp3wrap/files/{patch-aa => patch-crc.c} (100%)
 rename audio/nas/files/{patch-af => patch-config_NetAudio.def} (100%)
 rename audio/nas/files/{patch-ab => patch-server_dda_voxware_auvoxware.c} (100%)
 rename audio/nas/files/{patch-aa => patch_clients_audio_audial_audial.c} (100%)
 rename audio/nosefart/files/{patch-aa => patch-Makefile} (100%)
 rename audio/nspmod/files/{patch-ab => patch-Makefile} (100%)
 rename audio/nspmod/files/{patch-aa => patch-dacio-linux.c} (100%)
 rename audio/nspmod/files/{patch-ad => patch-dacio.h} (100%)
 rename audio/nspmod/files/{patch-ac => patch-nspmod.c} (100%)
 rename audio/nspmod/files/{patch-ae => patch-nspmod.h} (100%)
 rename audio/rplay/files/{patch-ac => patch-Makefile.config.in} (100%)
 rename audio/rplay/files/{patch-ad => patch-doc_Makefile.in} (100%)
 rename audio/rplay/files/{patch-ae => patch-doc_RPLAY.texi} (100%)
 rename audio/rplay/files/{patch-af => patch-doc_RPTP.texi} (100%)
 rename audio/rplay/files/{patch-ag => patch-doc_librplay.texi} (100%)
 rename audio/rplay/files/{patch-ai => patch-doc_rplayd.8} (100%)
 rename audio/rplay/files/{patch-ah => patch-doc_rplayd.texi} (100%)
 rename audio/rplay/files/{patch-aj => patch-librplay_Makefile.in} (100%)
 rename audio/rplay/files/{patch-ab => patch-rplayd_Makefile.in} (100%)
 rename audio/rplay/files/{patch-an => patch-rplayd__audio__audio_FreeBSD.c} (100%)
 rename audio/rplay/files/{patch-ak => patch-rplayd_sound.h} (100%)
 rename audio/rplay/files/{patch-al => patch-rplayd_spool.c} (100%)
 rename audio/rplay/files/{patch-am => patch-rx_Makefile.in} (100%)
 rename audio/rsynth/files/{patch-ac => patch-Makefile.in} (100%)
 rename audio/rsynth/files/{patch-aa => patch-naplay.c} (100%)
 rename audio/s3mod/files/{patch-ab => patch-Makefile} (100%)
 rename audio/s3mod/files/{patch-ac => patch-config.h} (100%)
 rename audio/s3mod/files/{patch-ae => patch-gus.c} (100%)
 rename audio/s3mod/files/{patch-af => patch-gus.h} (100%)
 rename audio/s3mod/files/{patch-ag => patch-main.c} (100%)
 rename audio/s3mod/files/{patch-ah => patch-main.h} (100%)
 rename audio/s3mod/files/{patch-ai => patch-mod.c} (100%)
 rename audio/s3mod/files/{patch-aj => patch-play.c} (100%)
 rename audio/s3mod/files/{patch-ak => patch-tables.h} (100%)
 rename audio/shout/files/{patch-ac => patch-configure} (100%)
 rename audio/shout/files/{patch-aa => patch-sock.c} (100%)
 rename audio/shout/files/{patch-ab => patch-util.c} (100%)
 rename audio/splaytk/files/{patch-aa => patch-splay-tk.tcl} (100%)
 rename audio/tclmidi/files/{patch-aa => patch-Makefile.ins} (100%)
 rename audio/tclmidi/files/{patch-ab => patch-configure} (100%)
 rename audio/tclmidi/files/{patch-ac => patch-smf_SMFTrack.cxx} (100%)
 rename audio/tosha/files/{patch-aa => patch-tosha.c} (100%)
 rename audio/xmcd/files/{patch-ab => patch-Imakefile} (100%)
 rename audio/xmcd/files/{patch-ac => patch-cda_d__Imakefile} (100%)
 rename audio/xmcd/files/{patch-ad => patch-cdda_d__Imakefile} (100%)
 rename audio/xmcd/files/{patch-ak => patch-cdda_d__if_flac.c} (100%)
 rename audio/xmcd/files/{patch-ah => patch-cdda_d__pthr.c} (100%)
 rename audio/xmcd/files/{patch-aj => patch-cddb_d__Imakefile} (100%)
 rename audio/xmcd/files/{patch-ai => patch-libdi_d__config.sh} (100%)
 rename audio/xmcd/files/{patch-af => patch-util_d__Imakefile} (100%)
 rename audio/xmcd/files/{patch-aa => patch-xmcd_d__Imakefile} (100%)
 rename audio/xmix/files/{patch-aa => patch-Imakefile} (100%)
 rename audio/xmix/files/{patch-ab => patch-xmix.c} (100%)
 rename audio/xmixer/files/{patch-af => patch-xmixer.man} (100%)
 rename audio/xmms-mailnotify/files/{patch-aa => patch-mailnotify.c_1} (100%)
 rename audio/xmms-mailnotify/files/{patch-ab => patch-mailnotify.c_2} (100%)
 rename audio/xmms-mailnotify/files/{patch-ac => patch-mailnotify.c_3} (100%)
 rename audio/xmradio/files/{patch-aa => patch-Imakefile} (100%)
 rename audio/xmradio/files/{patch-ac => patch-analyzer.c} (100%)
 rename audio/xmradio/files/{patch-ad => patch-radio.c} (100%)
 rename audio/xmradio/files/{patch-ab => patch-sample.c} (100%)
 rename audio/xwave/files/{patch-ap => patch-FWF_Imakefile} (100%)
 rename audio/xwave/files/{patch-at => patch-FWF_src_Imakefile} (100%)
 rename audio/xwave/files/{patch-al => patch-config.site} (100%)
 rename audio/xwave/files/{patch-aa => patch-src_Imakefile} (100%)
 rename audio/xwave/files/{patch-ar => patch-src_XWave} (100%)
 rename audio/xwave/files/{patch-ai => patch-src__record_dialog.c} (100%)
 rename audio/xwave/files/{patch-ab => patch-src_aifc.c} (100%)
 rename audio/xwave/files/{patch-ac => patch-src_au.c} (100%)
 rename audio/xwave/files/{patch-ad => patch-src_audio.c} (100%)
 rename audio/xwave/files/{patch-ae => patch-src_button.c} (100%)
 rename audio/xwave/files/{patch-as => patch-src_edit.c} (100%)
 rename audio/xwave/files/{patch-af => patch-src_effects.c} (100%)
 rename audio/xwave/files/{patch-ag => patch-src_endian.c} (100%)
 rename audio/xwave/files/{patch-ah => patch-src_graphics.c} (100%)
 rename audio/xwave/files/{patch-aj => patch-src_riff.c} (100%)
 rename audio/xwave/files/{patch-aq => patch-src_types.h} (100%)

diff --git a/audio/ascd/files/patch-ae b/audio/ascd/files/patch-Imakefile
similarity index 100%
rename from audio/ascd/files/patch-ae
rename to audio/ascd/files/patch-Imakefile
diff --git a/audio/ascd/files/patch-ag b/audio/ascd/files/patch-faktory.c
similarity index 100%
rename from audio/ascd/files/patch-ag
rename to audio/ascd/files/patch-faktory.c
diff --git a/audio/ascd/files/patch-aa b/audio/ascd/files/patch-misc_config.h.default
similarity index 100%
rename from audio/ascd/files/patch-aa
rename to audio/ascd/files/patch-misc_config.h.default
diff --git a/audio/ascd/files/patch-ab b/audio/ascd/files/patch-misc_dirs.h.default
similarity index 100%
rename from audio/ascd/files/patch-ab
rename to audio/ascd/files/patch-misc_dirs.h.default
diff --git a/audio/boodler/files/patch-ab b/audio/boodler/files/patch-configure.py
similarity index 100%
rename from audio/boodler/files/patch-ab
rename to audio/boodler/files/patch-configure.py
diff --git a/audio/boodler/files/patch-aa b/audio/boodler/files/patch-wrapper_boodler
similarity index 100%
rename from audio/boodler/files/patch-aa
rename to audio/boodler/files/patch-wrapper_boodler
diff --git a/audio/btc/files/patch-aa b/audio/btc/files/patch-btc.c
similarity index 100%
rename from audio/btc/files/patch-aa
rename to audio/btc/files/patch-btc.c
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index cb73c6709fbf..548e4e605efe 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -6,11 +6,12 @@ PORTVERSION=	1.02
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/mixers
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cpu's Audio Mixer [curses based]
 
+USES=		tar:tgz
+
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		BINDIR="${PREFIX}/bin" \
 		MANDIR="${MAN1PREFIX}/man/man1" \
diff --git a/audio/cam/files/patch-ac b/audio/cam/files/patch-sounds.c
similarity index 100%
rename from audio/cam/files/patch-ac
rename to audio/cam/files/patch-sounds.c
diff --git a/audio/cd-console/files/patch-aa b/audio/cd-console/files/patch-Makefile
similarity index 100%
rename from audio/cd-console/files/patch-aa
rename to audio/cd-console/files/patch-Makefile
diff --git a/audio/cd-console/files/patch-ac b/audio/cd-console/files/patch-cd-console.cpp
similarity index 100%
rename from audio/cd-console/files/patch-ac
rename to audio/cd-console/files/patch-cd-console.cpp
diff --git a/audio/cd-console/files/patch-ab b/audio/cd-console/files/patch-cd_ll_bsd.cpp
similarity index 100%
rename from audio/cd-console/files/patch-ab
rename to audio/cd-console/files/patch-cd_ll_bsd.cpp
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 4c3241b801a5..71a3e8eb378f 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -30,6 +30,6 @@ pre-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdplay ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN}	${WRKSRC}/cdplay.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cdplay.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/cdplay/files/patch-ab b/audio/cdplay/files/patch-cd.c
similarity index 100%
rename from audio/cdplay/files/patch-ab
rename to audio/cdplay/files/patch-cd.c
diff --git a/audio/cdplay/files/patch-ac b/audio/cdplay/files/patch-cdplay.1
similarity index 100%
rename from audio/cdplay/files/patch-ac
rename to audio/cdplay/files/patch-cdplay.1
diff --git a/audio/cdplay/files/patch-ad b/audio/cdplay/files/patch-cdplay.h
similarity index 100%
rename from audio/cdplay/files/patch-ad
rename to audio/cdplay/files/patch-cdplay.h
diff --git a/audio/cdplay/files/patch-ae b/audio/cdplay/files/patch-main.c
similarity index 100%
rename from audio/cdplay/files/patch-ae
rename to audio/cdplay/files/patch-main.c
diff --git a/audio/cplay/files/patch-aa b/audio/cplay/files/patch-Makefile
similarity index 100%
rename from audio/cplay/files/patch-aa
rename to audio/cplay/files/patch-Makefile
diff --git a/audio/dagrab/files/patch-aa b/audio/dagrab/files/patch-Makefile
similarity index 100%
rename from audio/dagrab/files/patch-aa
rename to audio/dagrab/files/patch-Makefile
diff --git a/audio/dagrab/files/patch-ab b/audio/dagrab/files/patch-dagrab.c
similarity index 100%
rename from audio/dagrab/files/patch-ab
rename to audio/dagrab/files/patch-dagrab.c
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-Makefile.in
similarity index 100%
rename from audio/esound/files/patch-aa
rename to audio/esound/files/patch-Makefile.in
diff --git a/audio/esound/files/patch-ac b/audio/esound/files/patch-esd.c
similarity index 100%
rename from audio/esound/files/patch-ac
rename to audio/esound/files/patch-esd.c
diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-esdlib.c
similarity index 100%
rename from audio/esound/files/patch-ad
rename to audio/esound/files/patch-esdlib.c
diff --git a/audio/fcplay/files/patch-ab b/audio/fcplay/files/patch-AudioDriver.h
similarity index 100%
rename from audio/fcplay/files/patch-ab
rename to audio/fcplay/files/patch-AudioDriver.h
diff --git a/audio/fcplay/files/patch-aa b/audio/fcplay/files/patch-POINTER
similarity index 100%
rename from audio/fcplay/files/patch-aa
rename to audio/fcplay/files/patch-POINTER
diff --git a/audio/fcplay/files/patch-ac b/audio/fcplay/files/patch-configure
similarity index 100%
rename from audio/fcplay/files/patch-ac
rename to audio/fcplay/files/patch-configure
diff --git a/audio/festdoc/files/patch-aa b/audio/festdoc/files/patch-festival_info_festival.info
similarity index 100%
rename from audio/festdoc/files/patch-aa
rename to audio/festdoc/files/patch-festival_info_festival.info
diff --git a/audio/festival/files/patch-ah b/audio/festival/files/patch-festival_config_modules_nas_audio.mak
similarity index 100%
rename from audio/festival/files/patch-ah
rename to audio/festival/files/patch-festival_config_modules_nas_audio.mak
diff --git a/audio/festival/files/patch-ap b/audio/festival/files/patch-speech_tools_audio_nas.cc
similarity index 100%
rename from audio/festival/files/patch-ap
rename to audio/festival/files/patch-speech_tools_audio_nas.cc
diff --git a/audio/festival/files/patch-ag b/audio/festival/files/patch-speech_tools_config_modules_nas_audio.mak
similarity index 100%
rename from audio/festival/files/patch-ag
rename to audio/festival/files/patch-speech_tools_config_modules_nas_audio.mak
diff --git a/audio/festival/files/patch-ae b/audio/festival/files/patch-speech_tools_include_EST_unix.h
similarity index 100%
rename from audio/festival/files/patch-ae
rename to audio/festival/files/patch-speech_tools_include_EST_unix.h
diff --git a/audio/gkrellmms2/files/patch-aa b/audio/gkrellmms2/files/patch-Makefile
similarity index 100%
rename from audio/gkrellmms2/files/patch-aa
rename to audio/gkrellmms2/files/patch-Makefile
diff --git a/audio/gkrellmvolume2/files/patch-aa b/audio/gkrellmvolume2/files/patch-Makefile
similarity index 100%
rename from audio/gkrellmvolume2/files/patch-aa
rename to audio/gkrellmvolume2/files/patch-Makefile
diff --git a/audio/gmixer/files/patch-aa b/audio/gmixer/files/patch-Makefile
similarity index 100%
rename from audio/gmixer/files/patch-aa
rename to audio/gmixer/files/patch-Makefile
diff --git a/audio/gsm/files/patch-aa b/audio/gsm/files/patch-inc_config.h
similarity index 100%
rename from audio/gsm/files/patch-aa
rename to audio/gsm/files/patch-inc_config.h
diff --git a/audio/id3ren/files/patch-aa b/audio/id3ren/files/patch-src_Makefile
similarity index 100%
rename from audio/id3ren/files/patch-aa
rename to audio/id3ren/files/patch-src_Makefile
diff --git a/audio/id3ren/files/patch-ab b/audio/id3ren/files/patch-src_id3tag.c
similarity index 100%
rename from audio/id3ren/files/patch-ab
rename to audio/id3ren/files/patch-src_id3tag.c
diff --git a/audio/juke/files/patch-ab b/audio/juke/files/patch-src_conf.c
similarity index 100%
rename from audio/juke/files/patch-ab
rename to audio/juke/files/patch-src_conf.c
diff --git a/audio/juke/files/patch-aa b/audio/juke/files/patch-src_conf.h
similarity index 100%
rename from audio/juke/files/patch-aa
rename to audio/juke/files/patch-src_conf.h
diff --git a/audio/mp3wrap/Makefile b/audio/mp3wrap/Makefile
index 36bb2708f573..72660442a813 100644
--- a/audio/mp3wrap/Makefile
+++ b/audio/mp3wrap/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	uqs@FreeBSD.org
-COMMENT=	Utility to merge mp3 files (and other formats)
+COMMENT=	Merge mp3 files (and other formats)
 
 GNU_CONFIGURE=	yes
 
diff --git a/audio/mp3wrap/files/patch-aa b/audio/mp3wrap/files/patch-crc.c
similarity index 100%
rename from audio/mp3wrap/files/patch-aa
rename to audio/mp3wrap/files/patch-crc.c
diff --git a/audio/nas/files/patch-af b/audio/nas/files/patch-config_NetAudio.def
similarity index 100%
rename from audio/nas/files/patch-af
rename to audio/nas/files/patch-config_NetAudio.def
diff --git a/audio/nas/files/patch-ab b/audio/nas/files/patch-server_dda_voxware_auvoxware.c
similarity index 100%
rename from audio/nas/files/patch-ab
rename to audio/nas/files/patch-server_dda_voxware_auvoxware.c
diff --git a/audio/nas/files/patch-aa b/audio/nas/files/patch_clients_audio_audial_audial.c
similarity index 100%
rename from audio/nas/files/patch-aa
rename to audio/nas/files/patch_clients_audio_audial_audial.c
diff --git a/audio/nosefart/files/patch-aa b/audio/nosefart/files/patch-Makefile
similarity index 100%
rename from audio/nosefart/files/patch-aa
rename to audio/nosefart/files/patch-Makefile
diff --git a/audio/nspmod/files/patch-ab b/audio/nspmod/files/patch-Makefile
similarity index 100%
rename from audio/nspmod/files/patch-ab
rename to audio/nspmod/files/patch-Makefile
diff --git a/audio/nspmod/files/patch-aa b/audio/nspmod/files/patch-dacio-linux.c
similarity index 100%
rename from audio/nspmod/files/patch-aa
rename to audio/nspmod/files/patch-dacio-linux.c
diff --git a/audio/nspmod/files/patch-ad b/audio/nspmod/files/patch-dacio.h
similarity index 100%
rename from audio/nspmod/files/patch-ad
rename to audio/nspmod/files/patch-dacio.h
diff --git a/audio/nspmod/files/patch-ac b/audio/nspmod/files/patch-nspmod.c
similarity index 100%
rename from audio/nspmod/files/patch-ac
rename to audio/nspmod/files/patch-nspmod.c
diff --git a/audio/nspmod/files/patch-ae b/audio/nspmod/files/patch-nspmod.h
similarity index 100%
rename from audio/nspmod/files/patch-ae
rename to audio/nspmod/files/patch-nspmod.h
diff --git a/audio/rplay/files/patch-ac b/audio/rplay/files/patch-Makefile.config.in
similarity index 100%
rename from audio/rplay/files/patch-ac
rename to audio/rplay/files/patch-Makefile.config.in
diff --git a/audio/rplay/files/patch-ad b/audio/rplay/files/patch-doc_Makefile.in
similarity index 100%
rename from audio/rplay/files/patch-ad
rename to audio/rplay/files/patch-doc_Makefile.in
diff --git a/audio/rplay/files/patch-ae b/audio/rplay/files/patch-doc_RPLAY.texi
similarity index 100%
rename from audio/rplay/files/patch-ae
rename to audio/rplay/files/patch-doc_RPLAY.texi
diff --git a/audio/rplay/files/patch-af b/audio/rplay/files/patch-doc_RPTP.texi
similarity index 100%
rename from audio/rplay/files/patch-af
rename to audio/rplay/files/patch-doc_RPTP.texi
diff --git a/audio/rplay/files/patch-ag b/audio/rplay/files/patch-doc_librplay.texi
similarity index 100%
rename from audio/rplay/files/patch-ag
rename to audio/rplay/files/patch-doc_librplay.texi
diff --git a/audio/rplay/files/patch-ai b/audio/rplay/files/patch-doc_rplayd.8
similarity index 100%
rename from audio/rplay/files/patch-ai
rename to audio/rplay/files/patch-doc_rplayd.8
diff --git a/audio/rplay/files/patch-ah b/audio/rplay/files/patch-doc_rplayd.texi
similarity index 100%
rename from audio/rplay/files/patch-ah
rename to audio/rplay/files/patch-doc_rplayd.texi
diff --git a/audio/rplay/files/patch-aj b/audio/rplay/files/patch-librplay_Makefile.in
similarity index 100%
rename from audio/rplay/files/patch-aj
rename to audio/rplay/files/patch-librplay_Makefile.in
diff --git a/audio/rplay/files/patch-ab b/audio/rplay/files/patch-rplayd_Makefile.in
similarity index 100%
rename from audio/rplay/files/patch-ab
rename to audio/rplay/files/patch-rplayd_Makefile.in
diff --git a/audio/rplay/files/patch-an b/audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c
similarity index 100%
rename from audio/rplay/files/patch-an
rename to audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c
diff --git a/audio/rplay/files/patch-ak b/audio/rplay/files/patch-rplayd_sound.h
similarity index 100%
rename from audio/rplay/files/patch-ak
rename to audio/rplay/files/patch-rplayd_sound.h
diff --git a/audio/rplay/files/patch-al b/audio/rplay/files/patch-rplayd_spool.c
similarity index 100%
rename from audio/rplay/files/patch-al
rename to audio/rplay/files/patch-rplayd_spool.c
diff --git a/audio/rplay/files/patch-am b/audio/rplay/files/patch-rx_Makefile.in
similarity index 100%
rename from audio/rplay/files/patch-am
rename to audio/rplay/files/patch-rx_Makefile.in
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 894d46fb20f8..fd7332518c1a 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech synthesizer
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm	\
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
 		libaudio.so:${PORTSDIR}/audio/nas
 
 GNU_CONFIGURE=	yes
diff --git a/audio/rsynth/files/patch-ac b/audio/rsynth/files/patch-Makefile.in
similarity index 100%
rename from audio/rsynth/files/patch-ac
rename to audio/rsynth/files/patch-Makefile.in
diff --git a/audio/rsynth/files/patch-aa b/audio/rsynth/files/patch-naplay.c
similarity index 100%
rename from audio/rsynth/files/patch-aa
rename to audio/rsynth/files/patch-naplay.c
diff --git a/audio/s3mod/files/patch-ab b/audio/s3mod/files/patch-Makefile
similarity index 100%
rename from audio/s3mod/files/patch-ab
rename to audio/s3mod/files/patch-Makefile
diff --git a/audio/s3mod/files/patch-ac b/audio/s3mod/files/patch-config.h
similarity index 100%
rename from audio/s3mod/files/patch-ac
rename to audio/s3mod/files/patch-config.h
diff --git a/audio/s3mod/files/patch-ae b/audio/s3mod/files/patch-gus.c
similarity index 100%
rename from audio/s3mod/files/patch-ae
rename to audio/s3mod/files/patch-gus.c
diff --git a/audio/s3mod/files/patch-af b/audio/s3mod/files/patch-gus.h
similarity index 100%
rename from audio/s3mod/files/patch-af
rename to audio/s3mod/files/patch-gus.h
diff --git a/audio/s3mod/files/patch-ag b/audio/s3mod/files/patch-main.c
similarity index 100%
rename from audio/s3mod/files/patch-ag
rename to audio/s3mod/files/patch-main.c
diff --git a/audio/s3mod/files/patch-ah b/audio/s3mod/files/patch-main.h
similarity index 100%
rename from audio/s3mod/files/patch-ah
rename to audio/s3mod/files/patch-main.h
diff --git a/audio/s3mod/files/patch-ai b/audio/s3mod/files/patch-mod.c
similarity index 100%
rename from audio/s3mod/files/patch-ai
rename to audio/s3mod/files/patch-mod.c
diff --git a/audio/s3mod/files/patch-aj b/audio/s3mod/files/patch-play.c
similarity index 100%
rename from audio/s3mod/files/patch-aj
rename to audio/s3mod/files/patch-play.c
diff --git a/audio/s3mod/files/patch-ak b/audio/s3mod/files/patch-tables.h
similarity index 100%
rename from audio/s3mod/files/patch-ak
rename to audio/s3mod/files/patch-tables.h
diff --git a/audio/shout/Makefile b/audio/shout/Makefile
index 2dec2a9bf768..dd3f4d48ce91 100644
--- a/audio/shout/Makefile
+++ b/audio/shout/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/libshout/ \
 		http://public.planetmirror.com/pub/xiph/releases/libshout/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Program that sends mp3 streams to an icecast/shoutcast server
+COMMENT=	Send mp3 streams to an icecast/shoutcast server
 
 GNU_CONFIGURE=	yes
 
diff --git a/audio/shout/files/patch-ac b/audio/shout/files/patch-configure
similarity index 100%
rename from audio/shout/files/patch-ac
rename to audio/shout/files/patch-configure
diff --git a/audio/shout/files/patch-aa b/audio/shout/files/patch-sock.c
similarity index 100%
rename from audio/shout/files/patch-aa
rename to audio/shout/files/patch-sock.c
diff --git a/audio/shout/files/patch-ab b/audio/shout/files/patch-util.c
similarity index 100%
rename from audio/shout/files/patch-ab
rename to audio/shout/files/patch-util.c
diff --git a/audio/splaytk/files/patch-aa b/audio/splaytk/files/patch-splay-tk.tcl
similarity index 100%
rename from audio/splaytk/files/patch-aa
rename to audio/splaytk/files/patch-splay-tk.tcl
diff --git a/audio/tclmidi/files/patch-aa b/audio/tclmidi/files/patch-Makefile.ins
similarity index 100%
rename from audio/tclmidi/files/patch-aa
rename to audio/tclmidi/files/patch-Makefile.ins
diff --git a/audio/tclmidi/files/patch-ab b/audio/tclmidi/files/patch-configure
similarity index 100%
rename from audio/tclmidi/files/patch-ab
rename to audio/tclmidi/files/patch-configure
diff --git a/audio/tclmidi/files/patch-ac b/audio/tclmidi/files/patch-smf_SMFTrack.cxx
similarity index 100%
rename from audio/tclmidi/files/patch-ac
rename to audio/tclmidi/files/patch-smf_SMFTrack.cxx
diff --git a/audio/tosha/files/patch-aa b/audio/tosha/files/patch-tosha.c
similarity index 100%
rename from audio/tosha/files/patch-aa
rename to audio/tosha/files/patch-tosha.c
diff --git a/audio/xmcd/files/patch-ab b/audio/xmcd/files/patch-Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-ab
rename to audio/xmcd/files/patch-Imakefile
diff --git a/audio/xmcd/files/patch-ac b/audio/xmcd/files/patch-cda_d__Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-ac
rename to audio/xmcd/files/patch-cda_d__Imakefile
diff --git a/audio/xmcd/files/patch-ad b/audio/xmcd/files/patch-cdda_d__Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-ad
rename to audio/xmcd/files/patch-cdda_d__Imakefile
diff --git a/audio/xmcd/files/patch-ak b/audio/xmcd/files/patch-cdda_d__if_flac.c
similarity index 100%
rename from audio/xmcd/files/patch-ak
rename to audio/xmcd/files/patch-cdda_d__if_flac.c
diff --git a/audio/xmcd/files/patch-ah b/audio/xmcd/files/patch-cdda_d__pthr.c
similarity index 100%
rename from audio/xmcd/files/patch-ah
rename to audio/xmcd/files/patch-cdda_d__pthr.c
diff --git a/audio/xmcd/files/patch-aj b/audio/xmcd/files/patch-cddb_d__Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-aj
rename to audio/xmcd/files/patch-cddb_d__Imakefile
diff --git a/audio/xmcd/files/patch-ai b/audio/xmcd/files/patch-libdi_d__config.sh
similarity index 100%
rename from audio/xmcd/files/patch-ai
rename to audio/xmcd/files/patch-libdi_d__config.sh
diff --git a/audio/xmcd/files/patch-af b/audio/xmcd/files/patch-util_d__Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-af
rename to audio/xmcd/files/patch-util_d__Imakefile
diff --git a/audio/xmcd/files/patch-aa b/audio/xmcd/files/patch-xmcd_d__Imakefile
similarity index 100%
rename from audio/xmcd/files/patch-aa
rename to audio/xmcd/files/patch-xmcd_d__Imakefile
diff --git a/audio/xmix/files/patch-aa b/audio/xmix/files/patch-Imakefile
similarity index 100%
rename from audio/xmix/files/patch-aa
rename to audio/xmix/files/patch-Imakefile
diff --git a/audio/xmix/files/patch-ab b/audio/xmix/files/patch-xmix.c
similarity index 100%
rename from audio/xmix/files/patch-ab
rename to audio/xmix/files/patch-xmix.c
diff --git a/audio/xmixer/files/patch-af b/audio/xmixer/files/patch-xmixer.man
similarity index 100%
rename from audio/xmixer/files/patch-af
rename to audio/xmixer/files/patch-xmixer.man
diff --git a/audio/xmms-mailnotify/files/patch-aa b/audio/xmms-mailnotify/files/patch-mailnotify.c_1
similarity index 100%
rename from audio/xmms-mailnotify/files/patch-aa
rename to audio/xmms-mailnotify/files/patch-mailnotify.c_1
diff --git a/audio/xmms-mailnotify/files/patch-ab b/audio/xmms-mailnotify/files/patch-mailnotify.c_2
similarity index 100%
rename from audio/xmms-mailnotify/files/patch-ab
rename to audio/xmms-mailnotify/files/patch-mailnotify.c_2
diff --git a/audio/xmms-mailnotify/files/patch-ac b/audio/xmms-mailnotify/files/patch-mailnotify.c_3
similarity index 100%
rename from audio/xmms-mailnotify/files/patch-ac
rename to audio/xmms-mailnotify/files/patch-mailnotify.c_3
diff --git a/audio/xmradio/files/patch-aa b/audio/xmradio/files/patch-Imakefile
similarity index 100%
rename from audio/xmradio/files/patch-aa
rename to audio/xmradio/files/patch-Imakefile
diff --git a/audio/xmradio/files/patch-ac b/audio/xmradio/files/patch-analyzer.c
similarity index 100%
rename from audio/xmradio/files/patch-ac
rename to audio/xmradio/files/patch-analyzer.c
diff --git a/audio/xmradio/files/patch-ad b/audio/xmradio/files/patch-radio.c
similarity index 100%
rename from audio/xmradio/files/patch-ad
rename to audio/xmradio/files/patch-radio.c
diff --git a/audio/xmradio/files/patch-ab b/audio/xmradio/files/patch-sample.c
similarity index 100%
rename from audio/xmradio/files/patch-ab
rename to audio/xmradio/files/patch-sample.c
diff --git a/audio/xwave/files/patch-ap b/audio/xwave/files/patch-FWF_Imakefile
similarity index 100%
rename from audio/xwave/files/patch-ap
rename to audio/xwave/files/patch-FWF_Imakefile
diff --git a/audio/xwave/files/patch-at b/audio/xwave/files/patch-FWF_src_Imakefile
similarity index 100%
rename from audio/xwave/files/patch-at
rename to audio/xwave/files/patch-FWF_src_Imakefile
diff --git a/audio/xwave/files/patch-al b/audio/xwave/files/patch-config.site
similarity index 100%
rename from audio/xwave/files/patch-al
rename to audio/xwave/files/patch-config.site
diff --git a/audio/xwave/files/patch-aa b/audio/xwave/files/patch-src_Imakefile
similarity index 100%
rename from audio/xwave/files/patch-aa
rename to audio/xwave/files/patch-src_Imakefile
diff --git a/audio/xwave/files/patch-ar b/audio/xwave/files/patch-src_XWave
similarity index 100%
rename from audio/xwave/files/patch-ar
rename to audio/xwave/files/patch-src_XWave
diff --git a/audio/xwave/files/patch-ai b/audio/xwave/files/patch-src__record_dialog.c
similarity index 100%
rename from audio/xwave/files/patch-ai
rename to audio/xwave/files/patch-src__record_dialog.c
diff --git a/audio/xwave/files/patch-ab b/audio/xwave/files/patch-src_aifc.c
similarity index 100%
rename from audio/xwave/files/patch-ab
rename to audio/xwave/files/patch-src_aifc.c
diff --git a/audio/xwave/files/patch-ac b/audio/xwave/files/patch-src_au.c
similarity index 100%
rename from audio/xwave/files/patch-ac
rename to audio/xwave/files/patch-src_au.c
diff --git a/audio/xwave/files/patch-ad b/audio/xwave/files/patch-src_audio.c
similarity index 100%
rename from audio/xwave/files/patch-ad
rename to audio/xwave/files/patch-src_audio.c
diff --git a/audio/xwave/files/patch-ae b/audio/xwave/files/patch-src_button.c
similarity index 100%
rename from audio/xwave/files/patch-ae
rename to audio/xwave/files/patch-src_button.c
diff --git a/audio/xwave/files/patch-as b/audio/xwave/files/patch-src_edit.c
similarity index 100%
rename from audio/xwave/files/patch-as
rename to audio/xwave/files/patch-src_edit.c
diff --git a/audio/xwave/files/patch-af b/audio/xwave/files/patch-src_effects.c
similarity index 100%
rename from audio/xwave/files/patch-af
rename to audio/xwave/files/patch-src_effects.c
diff --git a/audio/xwave/files/patch-ag b/audio/xwave/files/patch-src_endian.c
similarity index 100%
rename from audio/xwave/files/patch-ag
rename to audio/xwave/files/patch-src_endian.c
diff --git a/audio/xwave/files/patch-ah b/audio/xwave/files/patch-src_graphics.c
similarity index 100%
rename from audio/xwave/files/patch-ah
rename to audio/xwave/files/patch-src_graphics.c
diff --git a/audio/xwave/files/patch-aj b/audio/xwave/files/patch-src_riff.c
similarity index 100%
rename from audio/xwave/files/patch-aj
rename to audio/xwave/files/patch-src_riff.c
diff --git a/audio/xwave/files/patch-aq b/audio/xwave/files/patch-src_types.h
similarity index 100%
rename from audio/xwave/files/patch-aq
rename to audio/xwave/files/patch-src_types.h