918 files changed, 1 insertions, 1 deletions

diff --git a/archivers/libcomprex/files/patch-tests::extractarchive.c b/archivers/libcomprex/files/patch-tests__extractarchive.c
index 559dcb67af68..559dcb67af68 100644
--- a/archivers/libcomprex/files/patch-tests::extractarchive.c
+++ b/archivers/libcomprex/files/patch-tests__extractarchive.c
diff --git a/astro/gpsdrive/files/patch-src::gpsserial.c b/astro/gpsdrive/files/patch-src__gpsserial.c
index 531570d64224..531570d64224 100644
--- a/astro/gpsdrive/files/patch-src::gpsserial.c
+++ b/astro/gpsdrive/files/patch-src__gpsserial.c
diff --git a/astro/gpsdrive/files/patch-src::splash.c b/astro/gpsdrive/files/patch-src__splash.c
index 22e57ada2d77..22e57ada2d77 100644
--- a/astro/gpsdrive/files/patch-src::splash.c
+++ b/astro/gpsdrive/files/patch-src__splash.c
diff --git a/audio/ample/files/patch-src::base64.c b/audio/ample/files/patch-src__base64.c
index 23e6d10f7f2b..23e6d10f7f2b 100644
--- a/audio/ample/files/patch-src::base64.c
+++ b/audio/ample/files/patch-src__base64.c
diff --git a/audio/extace/files/patch-src::color_win.c b/audio/extace/files/patch-src__color_win.c
index 08be78990228..08be78990228 100644
--- a/audio/extace/files/patch-src::color_win.c
+++ b/audio/extace/files/patch-src__color_win.c
diff --git a/audio/flite/files/patch-include::cst_sts.h b/audio/flite/files/patch-include__cst_sts.h
index c27fd15d0595..c27fd15d0595 100644
--- a/audio/flite/files/patch-include::cst_sts.h
+++ b/audio/flite/files/patch-include__cst_sts.h
diff --git a/audio/glame/files/patch-src::plugins::audio_io_oss.c b/audio/glame/files/patch-src__plugins__audio_io_oss.c
index f59657bd3244..f59657bd3244 100644
--- a/audio/glame/files/patch-src::plugins::audio_io_oss.c
+++ b/audio/glame/files/patch-src__plugins__audio_io_oss.c
diff --git a/audio/gnomoradio/files/patch-rainbow::license.cc b/audio/gnomoradio/files/patch-rainbow__license.cc
index 0a77cd7e3776..0a77cd7e3776 100644
--- a/audio/gnomoradio/files/patch-rainbow::license.cc
+++ b/audio/gnomoradio/files/patch-rainbow__license.cc
diff --git a/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc b/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc
index 59e878ff7179..59e878ff7179 100644
--- a/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc
+++ b/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc
diff --git a/audio/grip/files/patch-src::main.c b/audio/grip/files/patch-src__main.c
index 7da04c7fd540..7da04c7fd540 100644
--- a/audio/grip/files/patch-src::main.c
+++ b/audio/grip/files/patch-src__main.c
diff --git a/audio/id3ren/files/patch-man::Makefile b/audio/id3ren/files/patch-man__Makefile
index d004277400af..d004277400af 100644
--- a/audio/id3ren/files/patch-man::Makefile
+++ b/audio/id3ren/files/patch-man__Makefile
diff --git a/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h b/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h
index df50ab655518..df50ab655518 100644
--- a/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h
+++ b/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h
diff --git a/audio/mixmos/files/patch-src::mixer.h b/audio/mixmos/files/patch-src__mixer.h
index da743376a0cb..da743376a0cb 100644
--- a/audio/mixmos/files/patch-src::mixer.h
+++ b/audio/mixmos/files/patch-src__mixer.h
diff --git a/audio/mixmos/files/patch-src::prefs.h b/audio/mixmos/files/patch-src__prefs.h
index 70d41b2d7333..70d41b2d7333 100644
--- a/audio/mixmos/files/patch-src::prefs.h
+++ b/audio/mixmos/files/patch-src__prefs.h
diff --git a/audio/mp3blaster/files/patch-src::main.cc b/audio/mp3blaster/files/patch-src__main.cc
index ba8b05bb8904..ba8b05bb8904 100644
--- a/audio/mp3blaster/files/patch-src::main.cc
+++ b/audio/mp3blaster/files/patch-src__main.cc
diff --git a/audio/muse/files/patch-src::Makefile.in b/audio/muse/files/patch-src__Makefile.in
index abd4d08a05b1..abd4d08a05b1 100644
--- a/audio/muse/files/patch-src::Makefile.in
+++ b/audio/muse/files/patch-src__Makefile.in
diff --git a/audio/muse/files/patch-src::jmixer.cpp b/audio/muse/files/patch-src__jmixer.cpp
index b00c3f06560c..b00c3f06560c 100644
--- a/audio/muse/files/patch-src::jmixer.cpp
+++ b/audio/muse/files/patch-src__jmixer.cpp
diff --git a/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc b/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc
index 6032cdc86627..6032cdc86627 100644
--- a/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc
+++ b/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc
diff --git a/audio/muse/files/patch-src::outchannels.cpp b/audio/muse/files/patch-src__outchannels.cpp
index b35b3ac2c444..b35b3ac2c444 100644
--- a/audio/muse/files/patch-src::outchannels.cpp
+++ b/audio/muse/files/patch-src__outchannels.cpp
diff --git a/audio/muse/files/patch-src::pipe.cpp b/audio/muse/files/patch-src__pipe.cpp
index aac653714a64..aac653714a64 100644
--- a/audio/muse/files/patch-src::pipe.cpp
+++ b/audio/muse/files/patch-src__pipe.cpp
diff --git a/audio/muse/files/patch-src::shout::sock.c b/audio/muse/files/patch-src__shout__sock.c
index 19956755987e..19956755987e 100644
--- a/audio/muse/files/patch-src::shout::sock.c
+++ b/audio/muse/files/patch-src__shout__sock.c
diff --git a/audio/napster/files/patch-doc::Makefile.in b/audio/napster/files/patch-doc__Makefile.in
index c7394856d010..c7394856d010 100644
--- a/audio/napster/files/patch-doc::Makefile.in
+++ b/audio/napster/files/patch-doc__Makefile.in
diff --git a/audio/rioutil/files/patch-src::Makefile.in b/audio/rioutil/files/patch-src__Makefile.in
index e697fd437268..e697fd437268 100644
--- a/audio/rioutil/files/patch-src::Makefile.in
+++ b/audio/rioutil/files/patch-src__Makefile.in
diff --git a/audio/rplay/files/patch-rplayd::rplayd.c b/audio/rplay/files/patch-rplayd__rplayd.c
index e764578164ab..e764578164ab 100644
--- a/audio/rplay/files/patch-rplayd::rplayd.c
+++ b/audio/rplay/files/patch-rplayd__rplayd.c
diff --git a/audio/soundtracker/files/patch-app::Makefile.in b/audio/soundtracker/files/patch-app__Makefile.in
index b77dd5b8b80a..b77dd5b8b80a 100644
--- a/audio/soundtracker/files/patch-app::Makefile.in
+++ b/audio/soundtracker/files/patch-app__Makefile.in
diff --git a/audio/soundtracker/files/patch-po::ja.po b/audio/soundtracker/files/patch-po__ja.po
index 360d66a7d0fc..360d66a7d0fc 100644
--- a/audio/soundtracker/files/patch-po::ja.po
+++ b/audio/soundtracker/files/patch-po__ja.po
diff --git a/audio/umix/files/patch-src::driver_oss.c b/audio/umix/files/patch-src__driver_oss.c
index d7a1340b3dce..d7a1340b3dce 100644
--- a/audio/umix/files/patch-src::driver_oss.c
+++ b/audio/umix/files/patch-src__driver_oss.c
diff --git a/audio/x11amp/files/patch-Effect::test::Makefile.in b/audio/x11amp/files/patch-Effect__test__Makefile.in
index be0d81bebffa..be0d81bebffa 100644
--- a/audio/x11amp/files/patch-Effect::test::Makefile.in
+++ b/audio/x11amp/files/patch-Effect__test__Makefile.in
diff --git a/audio/x11amp/files/patch-Effect::voice::Makefile.in b/audio/x11amp/files/patch-Effect__voice__Makefile.in
index 27bd7805b902..27bd7805b902 100644
--- a/audio/x11amp/files/patch-Effect::voice::Makefile.in
+++ b/audio/x11amp/files/patch-Effect__voice__Makefile.in
diff --git a/audio/x11amp/files/patch-Effect::voice::about.c b/audio/x11amp/files/patch-Effect__voice__about.c
index 356aa70de19d..356aa70de19d 100644
--- a/audio/x11amp/files/patch-Effect::voice::about.c
+++ b/audio/x11amp/files/patch-Effect__voice__about.c
diff --git a/audio/x11amp/files/patch-General::ir::Makefile.in b/audio/x11amp/files/patch-General__ir__Makefile.in
index 3dfd0c357282..3dfd0c357282 100644
--- a/audio/x11amp/files/patch-General::ir::Makefile.in
+++ b/audio/x11amp/files/patch-General__ir__Makefile.in
diff --git a/audio/x11amp/files/patch-General::ir::about.c b/audio/x11amp/files/patch-General__ir__about.c
index 11efe9decdcd..11efe9decdcd 100644
--- a/audio/x11amp/files/patch-General::ir::about.c
+++ b/audio/x11amp/files/patch-General__ir__about.c
diff --git a/audio/x11amp/files/patch-Input::cdaudio::Makefile.in b/audio/x11amp/files/patch-Input__cdaudio__Makefile.in
index a6534f85f477..a6534f85f477 100644
--- a/audio/x11amp/files/patch-Input::cdaudio::Makefile.in
+++ b/audio/x11amp/files/patch-Input__cdaudio__Makefile.in
diff --git a/audio/x11amp/files/patch-Input::mikmod::Makefile.in b/audio/x11amp/files/patch-Input__mikmod__Makefile.in
index a81defefdbca..a81defefdbca 100644
--- a/audio/x11amp/files/patch-Input::mikmod::Makefile.in
+++ b/audio/x11amp/files/patch-Input__mikmod__Makefile.in
diff --git a/audio/x11amp/files/patch-Input::mpg123::Makefile.in b/audio/x11amp/files/patch-Input__mpg123__Makefile.in
index 600f6c27830d..600f6c27830d 100644
--- a/audio/x11amp/files/patch-Input::mpg123::Makefile.in
+++ b/audio/x11amp/files/patch-Input__mpg123__Makefile.in
diff --git a/audio/x11amp/files/patch-Input::wav::Makefile.in b/audio/x11amp/files/patch-Input__wav__Makefile.in
index 606165df690c..606165df690c 100644
--- a/audio/x11amp/files/patch-Input::wav::Makefile.in
+++ b/audio/x11amp/files/patch-Input__wav__Makefile.in
diff --git a/audio/x11amp/files/patch-Output::OSS::Makefile.in b/audio/x11amp/files/patch-Output__OSS__Makefile.in
index ced6298795c1..ced6298795c1 100644
--- a/audio/x11amp/files/patch-Output::OSS::Makefile.in
+++ b/audio/x11amp/files/patch-Output__OSS__Makefile.in
diff --git a/audio/x11amp/files/patch-Output::OSS::OSS.h b/audio/x11amp/files/patch-Output__OSS__OSS.h
index f6a51284e77f..f6a51284e77f 100644
--- a/audio/x11amp/files/patch-Output::OSS::OSS.h
+++ b/audio/x11amp/files/patch-Output__OSS__OSS.h
diff --git a/audio/x11amp/files/patch-Output::esd::Makefile.in b/audio/x11amp/files/patch-Output__esd__Makefile.in
index 6e36a2b60385..6e36a2b60385 100644
--- a/audio/x11amp/files/patch-Output::esd::Makefile.in
+++ b/audio/x11amp/files/patch-Output__esd__Makefile.in
diff --git a/audio/x11amp/files/patch-libx11amp::Makefile.in b/audio/x11amp/files/patch-libx11amp__Makefile.in
index 0179fe77a8f5..0179fe77a8f5 100644
--- a/audio/x11amp/files/patch-libx11amp::Makefile.in
+++ b/audio/x11amp/files/patch-libx11amp__Makefile.in
diff --git a/audio/x11amp/files/patch-libx11amp::configure b/audio/x11amp/files/patch-libx11amp__configure
index aa00c48b4b5a..aa00c48b4b5a 100644
--- a/audio/x11amp/files/patch-libx11amp::configure
+++ b/audio/x11amp/files/patch-libx11amp__configure
diff --git a/audio/x11amp/files/patch-wmx11amp::Makefile.in b/audio/x11amp/files/patch-wmx11amp__Makefile.in
index d0bb63c485e4..d0bb63c485e4 100644
--- a/audio/x11amp/files/patch-wmx11amp::Makefile.in
+++ b/audio/x11amp/files/patch-wmx11amp__Makefile.in
diff --git a/audio/x11amp/files/patch-x11amp::Makefile.in b/audio/x11amp/files/patch-x11amp__Makefile.in
index 92cf7ce838de..92cf7ce838de 100644
--- a/audio/x11amp/files/patch-x11amp::Makefile.in
+++ b/audio/x11amp/files/patch-x11amp__Makefile.in
diff --git a/audio/x11amp/files/patch-x11amp::main.c b/audio/x11amp/files/patch-x11amp__main.c
index beaa279456fa..beaa279456fa 100644
--- a/audio/x11amp/files/patch-x11amp::main.c
+++ b/audio/x11amp/files/patch-x11amp__main.c
diff --git a/audio/ximp3/files/patch-lib::L3.h b/audio/ximp3/files/patch-lib__L3.h
index 3148ca42a62e..3148ca42a62e 100644
--- a/audio/ximp3/files/patch-lib::L3.h
+++ b/audio/ximp3/files/patch-lib__L3.h
diff --git a/audio/xmixer/files/patch-Xw::Base.c b/audio/xmixer/files/patch-Xw__Base.c
index 09d7560f3f31..09d7560f3f31 100644
--- a/audio/xmixer/files/patch-Xw::Base.c
+++ b/audio/xmixer/files/patch-Xw__Base.c
diff --git a/cad/alliance/files/patch-exp::src::ht.c b/cad/alliance/files/patch-exp__src__ht.c
index 4ba85f65659b..4ba85f65659b 100644
--- a/cad/alliance/files/patch-exp::src::ht.c
+++ b/cad/alliance/files/patch-exp__src__ht.c
diff --git a/cad/alliance/files/patch-sea::src::sea.sh b/cad/alliance/files/patch-sea__src__sea.sh
index 585e4f470b42..585e4f470b42 100644
--- a/cad/alliance/files/patch-sea::src::sea.sh
+++ b/cad/alliance/files/patch-sea__src__sea.sh
diff --git a/cad/alliance/files/patch-sea::src::seplace.sh b/cad/alliance/files/patch-sea__src__seplace.sh
index 6baf95c11d43..6baf95c11d43 100644
--- a/cad/alliance/files/patch-sea::src::seplace.sh
+++ b/cad/alliance/files/patch-sea__src__seplace.sh
diff --git a/cad/alliance/files/patch-sea::src::seroute.sh b/cad/alliance/files/patch-sea__src__seroute.sh
index c45ba45066e3..c45ba45066e3 100644
--- a/cad/alliance/files/patch-sea::src::seroute.sh
+++ b/cad/alliance/files/patch-sea__src__seroute.sh
diff --git a/chinese/bitchx/files/patch-include::config.h b/chinese/bitchx/files/patch-include__config.h
index e011a935830e..e011a935830e 100644
--- a/chinese/bitchx/files/patch-include::config.h
+++ b/chinese/bitchx/files/patch-include__config.h
diff --git a/chinese/bitchx/files/patch-source::input.c b/chinese/bitchx/files/patch-source__input.c
index 62e38c1d5261..62e38c1d5261 100644
--- a/chinese/bitchx/files/patch-source::input.c
+++ b/chinese/bitchx/files/patch-source__input.c
diff --git a/chinese/bitchx/files/patch-source::screen.c b/chinese/bitchx/files/patch-source__screen.c
index 8b650b55c9f8..8b650b55c9f8 100644
--- a/chinese/bitchx/files/patch-source::screen.c
+++ b/chinese/bitchx/files/patch-source__screen.c
diff --git a/chinese/cce/files/patch-inputs::all::Makefile.in b/chinese/cce/files/patch-inputs__all__Makefile.in
index e7386ec3195f..e7386ec3195f 100644
--- a/chinese/cce/files/patch-inputs::all::Makefile.in
+++ b/chinese/cce/files/patch-inputs__all__Makefile.in
diff --git a/chinese/cce/files/patch-src::cce.cfg b/chinese/cce/files/patch-src__cce.cfg
index a54f89e4ad8a..a54f89e4ad8a 100644
--- a/chinese/cce/files/patch-src::cce.cfg
+++ b/chinese/cce/files/patch-src__cce.cfg
diff --git a/chinese/cce/files/patch-src::term::term.c b/chinese/cce/files/patch-src__term__term.c
index b4763150c893..b4763150c893 100644
--- a/chinese/cce/files/patch-src::term::term.c
+++ b/chinese/cce/files/patch-src__term__term.c
diff --git a/chinese/kon2/files/patch-lib::coding.c b/chinese/kon2/files/patch-lib__coding.c
index 129a8f9afbb0..129a8f9afbb0 100644
--- a/chinese/kon2/files/patch-lib::coding.c
+++ b/chinese/kon2/files/patch-lib__coding.c
diff --git a/chinese/pine4/files/patch-pine::strings.c b/chinese/pine4/files/patch-pine__strings.c
index 0f115ae8adb7..0f115ae8adb7 100644
--- a/chinese/pine4/files/patch-pine::strings.c
+++ b/chinese/pine4/files/patch-pine__strings.c
diff --git a/chinese/ttfm/files/patch-modules::gscjk.ttfm b/chinese/ttfm/files/patch-modules__gscjk.ttfm
index c7771a38c695..c7771a38c695 100644
--- a/chinese/ttfm/files/patch-modules::gscjk.ttfm
+++ b/chinese/ttfm/files/patch-modules__gscjk.ttfm
diff --git a/chinese/wenju/files/patch-tests::Makefile.in b/chinese/wenju/files/patch-tests__Makefile.in
index 2519f01f0ef6..2519f01f0ef6 100644
--- a/chinese/wenju/files/patch-tests::Makefile.in
+++ b/chinese/wenju/files/patch-tests__Makefile.in
diff --git a/chinese/wenju/files/patch-tests::wenju.c b/chinese/wenju/files/patch-tests__wenju.c
index edaf845c0b8d..edaf845c0b8d 100644
--- a/chinese/wenju/files/patch-tests::wenju.c
+++ b/chinese/wenju/files/patch-tests__wenju.c
diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_map_key.h b/comms/gsmlib/files/patch-gsmlib__gsm_map_key.h
index fe265b2691b2..fe265b2691b2 100644
--- a/comms/gsmlib/files/patch-gsmlib::gsm_map_key.h
+++ b/comms/gsmlib/files/patch-gsmlib__gsm_map_key.h
diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h b/comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h
index be5e42c2dbde..be5e42c2dbde 100644
--- a/comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h
+++ b/comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h
diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc b/comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc
index 4dabea9f4fcb..4dabea9f4fcb 100644
--- a/comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc
+++ b/comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc
diff --git a/comms/lirc/files/patch-daemons::Makefile.in b/comms/lirc/files/patch-daemons__Makefile.in
index b44f5bb128b4..b44f5bb128b4 100644
--- a/comms/lirc/files/patch-daemons::Makefile.in
+++ b/comms/lirc/files/patch-daemons__Makefile.in
diff --git a/comms/lirc/files/patch-daemons::dump_config.c b/comms/lirc/files/patch-daemons__dump_config.c
index 6e3e61dde355..6e3e61dde355 100644
--- a/comms/lirc/files/patch-daemons::dump_config.c
+++ b/comms/lirc/files/patch-daemons__dump_config.c
diff --git a/comms/lirc/files/patch-daemons::hw-types.c b/comms/lirc/files/patch-daemons__hw-types.c
index 3c6d6d009a5d..3c6d6d009a5d 100644
--- a/comms/lirc/files/patch-daemons::hw-types.c
+++ b/comms/lirc/files/patch-daemons__hw-types.c
diff --git a/comms/lirc/files/patch-daemons::hw_default.c b/comms/lirc/files/patch-daemons__hw_default.c
index 762307e8858c..762307e8858c 100644
--- a/comms/lirc/files/patch-daemons::hw_default.c
+++ b/comms/lirc/files/patch-daemons__hw_default.c
diff --git a/comms/lirc/files/patch-daemons::hw_devinput.c b/comms/lirc/files/patch-daemons__hw_devinput.c
index d1c7cffe58e9..d1c7cffe58e9 100644
--- a/comms/lirc/files/patch-daemons::hw_devinput.c
+++ b/comms/lirc/files/patch-daemons__hw_devinput.c
diff --git a/comms/lirc/files/patch-daemons::hw_hiddev.c b/comms/lirc/files/patch-daemons__hw_hiddev.c
index e887bd1d6081..e887bd1d6081 100644
--- a/comms/lirc/files/patch-daemons::hw_hiddev.c
+++ b/comms/lirc/files/patch-daemons__hw_hiddev.c
diff --git a/comms/lirc/files/patch-daemons::hw_srm7500libusb.c b/comms/lirc/files/patch-daemons__hw_srm7500libusb.c
index b9fe11431c2f..b9fe11431c2f 100644
--- a/comms/lirc/files/patch-daemons::hw_srm7500libusb.c
+++ b/comms/lirc/files/patch-daemons__hw_srm7500libusb.c
diff --git a/comms/lirc/files/patch-daemons::ir_remote.c b/comms/lirc/files/patch-daemons__ir_remote.c
index bc587b5a229f..bc587b5a229f 100644
--- a/comms/lirc/files/patch-daemons::ir_remote.c
+++ b/comms/lirc/files/patch-daemons__ir_remote.c
diff --git a/comms/lirc/files/patch-daemons::lircd.c b/comms/lirc/files/patch-daemons__lircd.c
index b2b23d3d2fe2..b2b23d3d2fe2 100644
--- a/comms/lirc/files/patch-daemons::lircd.c
+++ b/comms/lirc/files/patch-daemons__lircd.c
diff --git a/comms/lirc/files/patch-daemons::lircmd.c b/comms/lirc/files/patch-daemons__lircmd.c
index c95f14cdca41..c95f14cdca41 100644
--- a/comms/lirc/files/patch-daemons::lircmd.c
+++ b/comms/lirc/files/patch-daemons__lircmd.c
diff --git a/comms/lirc/files/patch-drivers::lirc.h b/comms/lirc/files/patch-drivers__lirc.h
index b1eaca0284a9..b1eaca0284a9 100644
--- a/comms/lirc/files/patch-drivers::lirc.h
+++ b/comms/lirc/files/patch-drivers__lirc.h
diff --git a/comms/lirc/files/patch-tools::irsend.c b/comms/lirc/files/patch-tools__irsend.c
index 96b9dee79361..96b9dee79361 100644
--- a/comms/lirc/files/patch-tools::irsend.c
+++ b/comms/lirc/files/patch-tools__irsend.c
diff --git a/converters/iconv-extra/files/patch-ces::Makefile b/converters/iconv-extra/files/patch-ces__Makefile
index 806447eec3fd..806447eec3fd 100644
--- a/converters/iconv-extra/files/patch-ces::Makefile
+++ b/converters/iconv-extra/files/patch-ces__Makefile
diff --git a/converters/iconv-extra/files/patch-ces::iso-2022-cn.c b/converters/iconv-extra/files/patch-ces__iso-2022-cn.c
index 8408bd387c08..8408bd387c08 100644
--- a/converters/iconv-extra/files/patch-ces::iso-2022-cn.c
+++ b/converters/iconv-extra/files/patch-ces__iso-2022-cn.c
diff --git a/converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c b/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c
index c1d3da317c5b..c1d3da317c5b 100644
--- a/converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c
+++ b/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c
diff --git a/converters/iconv-extra/files/patch-ces::iso-2022-jp.c b/converters/iconv-extra/files/patch-ces__iso-2022-jp.c
index 0ad244075833..0ad244075833 100644
--- a/converters/iconv-extra/files/patch-ces::iso-2022-jp.c
+++ b/converters/iconv-extra/files/patch-ces__iso-2022-jp.c
diff --git a/converters/iconv-extra/files/patch-ces::iso-2022-kr.c b/converters/iconv-extra/files/patch-ces__iso-2022-kr.c
index 259e299cc7b0..259e299cc7b0 100644
--- a/converters/iconv-extra/files/patch-ces::iso-2022-kr.c
+++ b/converters/iconv-extra/files/patch-ces__iso-2022-kr.c
diff --git a/converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c b/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c
index 0b4f3e574c7a..0b4f3e574c7a 100644
--- a/converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c
+++ b/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c
diff --git a/converters/iconv/files/patch-ces::Makefile b/converters/iconv/files/patch-ces__Makefile
index 0a5f39d11207..0a5f39d11207 100644
--- a/converters/iconv/files/patch-ces::Makefile
+++ b/converters/iconv/files/patch-ces__Makefile
diff --git a/converters/iconv/files/patch-lib::converter.c b/converters/iconv/files/patch-lib__converter.c
index 362246793dca..362246793dca 100644
--- a/converters/iconv/files/patch-lib::converter.c
+++ b/converters/iconv/files/patch-lib__converter.c
diff --git a/converters/iconv/files/patch-util::Makefile b/converters/iconv/files/patch-util__Makefile
index a57ae2b5bdd1..a57ae2b5bdd1 100644
--- a/converters/iconv/files/patch-util::Makefile
+++ b/converters/iconv/files/patch-util__Makefile
diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset__lib__config.charset
index ba30603dc83a..ba30603dc83a 100644
--- a/converters/libiconv/files/patch-libcharset::lib::config.charset
+++ b/converters/libiconv/files/patch-libcharset__lib__config.charset
diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src__Makefile.in
index fc5bbd58b95d..fc5bbd58b95d 100644
--- a/converters/libiconv/files/patch-src::Makefile.in
+++ b/converters/libiconv/files/patch-src__Makefile.in
diff --git a/converters/recode/files/patch-i18n::el.po b/converters/recode/files/patch-i18n__el.po
index d4d49fe21bcd..d4d49fe21bcd 100644
--- a/converters/recode/files/patch-i18n::el.po
+++ b/converters/recode/files/patch-i18n__el.po
diff --git a/converters/recode/files/patch-src::names.c b/converters/recode/files/patch-src__names.c
index b4fddb093067..b4fddb093067 100644
--- a/converters/recode/files/patch-src::names.c
+++ b/converters/recode/files/patch-src__names.c
diff --git a/converters/recode/files/patch-src::outer.c b/converters/recode/files/patch-src__outer.c
index 04801f3d0726..04801f3d0726 100644
--- a/converters/recode/files/patch-src::outer.c
+++ b/converters/recode/files/patch-src__outer.c
diff --git a/converters/recode/files/patch-src::recodext.h b/converters/recode/files/patch-src__recodext.h
index 85c479c1462c..85c479c1462c 100644
--- a/converters/recode/files/patch-src::recodext.h
+++ b/converters/recode/files/patch-src__recodext.h
diff --git a/databases/cyrus-imspd/files/patch-imsp::dispatch.h b/databases/cyrus-imspd/files/patch-imsp__dispatch.h
index 887c9a03870d..887c9a03870d 100644
--- a/databases/cyrus-imspd/files/patch-imsp::dispatch.h
+++ b/databases/cyrus-imspd/files/patch-imsp__dispatch.h
diff --git a/databases/db4/files/patch-dist::Makefile.in b/databases/db4/files/patch-dist__Makefile.in
index cf1f67e21a73..cf1f67e21a73 100644
--- a/databases/db4/files/patch-dist::Makefile.in
+++ b/databases/db4/files/patch-dist__Makefile.in
diff --git a/databases/db4/files/patch-dist::configure b/databases/db4/files/patch-dist__configure
index 4f2ed615df05..4f2ed615df05 100644
--- a/databases/db4/files/patch-dist::configure
+++ b/databases/db4/files/patch-dist__configure
diff --git a/databases/db4/files/patch-dist::ltmain.sh b/databases/db4/files/patch-dist__ltmain.sh
index 7ba6dbdfd3fe..7ba6dbdfd3fe 100644
--- a/databases/db4/files/patch-dist::ltmain.sh
+++ b/databases/db4/files/patch-dist__ltmain.sh
diff --git a/databases/db41/files/patch-dist::Makefile.in b/databases/db41/files/patch-dist__Makefile.in
index 9809860f6b47..9809860f6b47 100644
--- a/databases/db41/files/patch-dist::Makefile.in
+++ b/databases/db41/files/patch-dist__Makefile.in
diff --git a/databases/db41/files/patch-dist::configure b/databases/db41/files/patch-dist__configure
index f6f65d26177e..f6f65d26177e 100644
--- a/databases/db41/files/patch-dist::configure
+++ b/databases/db41/files/patch-dist__configure
diff --git a/databases/db41/files/patch-dist::ltmain.sh b/databases/db41/files/patch-dist__ltmain.sh
index 7ba6dbdfd3fe..7ba6dbdfd3fe 100644
--- a/databases/db41/files/patch-dist::ltmain.sh
+++ b/databases/db41/files/patch-dist__ltmain.sh
diff --git a/databases/db42/files/patch-dist::configure b/databases/db42/files/patch-dist__configure
index f5fd795067be..f5fd795067be 100644
--- a/databases/db42/files/patch-dist::configure
+++ b/databases/db42/files/patch-dist__configure
diff --git a/databases/db43/files/patch-dist::configure b/databases/db43/files/patch-dist__configure
index 2dac99fc909d..2dac99fc909d 100644
--- a/databases/db43/files/patch-dist::configure
+++ b/databases/db43/files/patch-dist__configure
diff --git a/databases/db44/files/patch-dist::configure b/databases/db44/files/patch-dist__configure
index 5aceb834b77d..5aceb834b77d 100644
--- a/databases/db44/files/patch-dist::configure
+++ b/databases/db44/files/patch-dist__configure
diff --git a/databases/db46/files/patch-dist::configure b/databases/db46/files/patch-dist__configure
index 2dac99fc909d..2dac99fc909d 100644
--- a/databases/db46/files/patch-dist::configure
+++ b/databases/db46/files/patch-dist__configure
diff --git a/databases/db47/files/patch-dist::configure b/databases/db47/files/patch-dist__configure
index 2dac99fc909d..2dac99fc909d 100644
--- a/databases/db47/files/patch-dist::configure
+++ b/databases/db47/files/patch-dist__configure
diff --git a/databases/dbconnect/files/patch-src::dbconnect::dbconnect.cpp b/databases/dbconnect/files/patch-src__dbconnect__dbconnect.cpp
index 82d955694ea5..82d955694ea5 100644
--- a/databases/dbconnect/files/patch-src::dbconnect::dbconnect.cpp
+++ b/databases/dbconnect/files/patch-src__dbconnect__dbconnect.cpp
diff --git a/databases/dbconnect/files/patch-src::driver_mysql::mysqlBindParam.cpp b/databases/dbconnect/files/patch-src__driver_mysql__mysqlBindParam.cpp
index 35195fa95721..35195fa95721 100644
--- a/databases/dbconnect/files/patch-src::driver_mysql::mysqlBindParam.cpp
+++ b/databases/dbconnect/files/patch-src__driver_mysql__mysqlBindParam.cpp
diff --git a/databases/dbconnect/files/patch-src::driver_pgsql-7::pgsqlBindParam.cpp b/databases/dbconnect/files/patch-src__driver_pgsql-7__pgsqlBindParam.cpp
index ed5f967d7f86..ed5f967d7f86 100644
--- a/databases/dbconnect/files/patch-src::driver_pgsql-7::pgsqlBindParam.cpp
+++ b/databases/dbconnect/files/patch-src__driver_pgsql-7__pgsqlBindParam.cpp
diff --git a/databases/gnats4/files/patch-gnats::Makefile.in b/databases/gnats4/files/patch-gnats__Makefile.in
index eeab9d3c2608..eeab9d3c2608 100644
--- a/databases/gnats4/files/patch-gnats::Makefile.in
+++ b/databases/gnats4/files/patch-gnats__Makefile.in
diff --git a/databases/gnats4/files/patch-send-pr::Makefile.in b/databases/gnats4/files/patch-send-pr__Makefile.in
index 3c9c686174e6..3c9c686174e6 100644
--- a/databases/gnats4/files/patch-send-pr::Makefile.in
+++ b/databases/gnats4/files/patch-send-pr__Makefile.in
diff --git a/databases/msql3/files/patch-libmsql::Makefile.tmpl b/databases/msql3/files/patch-libmsql__Makefile.tmpl
index 648604c19370..648604c19370 100644
--- a/databases/msql3/files/patch-libmsql::Makefile.tmpl
+++ b/databases/msql3/files/patch-libmsql__Makefile.tmpl
diff --git a/databases/msql3/files/patch-msqld::main::Makefile.tmpl b/databases/msql3/files/patch-msqld__main__Makefile.tmpl
index 10965636e8d8..10965636e8d8 100644
--- a/databases/msql3/files/patch-msqld::main::Makefile.tmpl
+++ b/databases/msql3/files/patch-msqld__main__Makefile.tmpl
diff --git a/databases/msql3/files/patch-msqld::regexp::Makefile.tmpl b/databases/msql3/files/patch-msqld__regexp__Makefile.tmpl
index 6b5486e4f4c9..6b5486e4f4c9 100644
--- a/databases/msql3/files/patch-msqld::regexp::Makefile.tmpl
+++ b/databases/msql3/files/patch-msqld__regexp__Makefile.tmpl
diff --git a/databases/mysql-connector-odbc/files/patch-driver::execute.c b/databases/mysql-connector-odbc/files/patch-driver__execute.c
index f191b08db140..f191b08db140 100644
--- a/databases/mysql-connector-odbc/files/patch-driver::execute.c
+++ b/databases/mysql-connector-odbc/files/patch-driver__execute.c
diff --git a/databases/mysql-q4m/files/patch-src::ha_queue.cc b/databases/mysql-q4m/files/patch-src__ha_queue.cc
index 92ceb4f921e8..92ceb4f921e8 100644
--- a/databases/mysql-q4m/files/patch-src::ha_queue.cc
+++ b/databases/mysql-q4m/files/patch-src__ha_queue.cc
diff --git a/databases/mysql-q4m/files/patch-src::queue_cond.cc b/databases/mysql-q4m/files/patch-src__queue_cond.cc
index 343a58be8b6e..343a58be8b6e 100644
--- a/databases/mysql-q4m/files/patch-src::queue_cond.cc
+++ b/databases/mysql-q4m/files/patch-src__queue_cond.cc
diff --git a/databases/mysql51-server/files/patch-Docs::Makefile.in b/databases/mysql51-server/files/patch-Docs__Makefile.in
index 51888b7712cc..51888b7712cc 100644
--- a/databases/mysql51-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql51-server/files/patch-Docs__Makefile.in
diff --git a/databases/mysql51-server/files/patch-man::Makefile.in b/databases/mysql51-server/files/patch-man__Makefile.in
index 0b15e2d4ca03..0b15e2d4ca03 100644
--- a/databases/mysql51-server/files/patch-man::Makefile.in
+++ b/databases/mysql51-server/files/patch-man__Makefile.in
diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts__Makefile.in
index 7881ee6f48dc..7881ee6f48dc 100644
--- a/databases/mysql51-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql51-server/files/patch-scripts__Makefile.in
diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql__mysqld.cc
index 4feed825cb11..4feed825cb11 100644
--- a/databases/mysql51-server/files/patch-sql::mysqld.cc
+++ b/databases/mysql51-server/files/patch-sql__mysqld.cc
diff --git a/databases/namazu2/files/patch-pl::conf.pl.in b/databases/namazu2/files/patch-pl__conf.pl.in
index af2c5f323ba6..af2c5f323ba6 100644
--- a/databases/namazu2/files/patch-pl::conf.pl.in
+++ b/databases/namazu2/files/patch-pl__conf.pl.in
diff --git a/databases/pxtools/files/patch-src::Makefile.in b/databases/pxtools/files/patch-src__Makefile.in
index e2ed96c16e35..e2ed96c16e35 100644
--- a/databases/pxtools/files/patch-src::Makefile.in
+++ b/databases/pxtools/files/patch-src__Makefile.in
diff --git a/databases/sqsh/files/patch-doc::global.sqshrc b/databases/sqsh/files/patch-doc__global.sqshrc
index 37937cd8bf84..37937cd8bf84 100644
--- a/databases/sqsh/files/patch-doc::global.sqshrc
+++ b/databases/sqsh/files/patch-doc__global.sqshrc
diff --git a/databases/sqsh/files/patch-src::Makefile.in b/databases/sqsh/files/patch-src__Makefile.in
index bb082edd690b..bb082edd690b 100644
--- a/databases/sqsh/files/patch-src::Makefile.in
+++ b/databases/sqsh/files/patch-src__Makefile.in
diff --git a/deskutils/babytrans/files/patch-src::main.cc b/deskutils/babytrans/files/patch-src__main.cc
index b3e1434d2520..b3e1434d2520 100644
--- a/deskutils/babytrans/files/patch-src::main.cc
+++ b/deskutils/babytrans/files/patch-src__main.cc
diff --git a/deskutils/gdesklets/files/patch-Controls::ArrayBuffer::__init__.py b/deskutils/gdesklets/files/patch-Controls__ArrayBuffer____init__.py
index 1e41c906fe22..1e41c906fe22 100644
--- a/deskutils/gdesklets/files/patch-Controls::ArrayBuffer::__init__.py
+++ b/deskutils/gdesklets/files/patch-Controls__ArrayBuffer____init__.py
diff --git a/deskutils/gruler/files/patch-src::Makefile.in b/deskutils/gruler/files/patch-src__Makefile.in
index 677664129523..677664129523 100644
--- a/deskutils/gruler/files/patch-src::Makefile.in
+++ b/deskutils/gruler/files/patch-src__Makefile.in
diff --git a/deskutils/ithought/files/patch-src::Makefile.in b/deskutils/ithought/files/patch-src__Makefile.in
index f726bc796a59..f726bc796a59 100644
--- a/deskutils/ithought/files/patch-src::Makefile.in
+++ b/deskutils/ithought/files/patch-src__Makefile.in
diff --git a/deskutils/wmpinboard/files/patch-src::misc.c b/deskutils/wmpinboard/files/patch-src__misc.c
index 4d9576b834c1..4d9576b834c1 100644
--- a/deskutils/wmpinboard/files/patch-src::misc.c
+++ b/deskutils/wmpinboard/files/patch-src__misc.c
diff --git a/deskutils/wmpinboard/files/patch-src::wmpinboard.c b/deskutils/wmpinboard/files/patch-src__wmpinboard.c
index 28787abf2eca..28787abf2eca 100644
--- a/deskutils/wmpinboard/files/patch-src::wmpinboard.c
+++ b/deskutils/wmpinboard/files/patch-src__wmpinboard.c
diff --git a/deskutils/wmpinboard/files/patch-src::xmisc.c b/deskutils/wmpinboard/files/patch-src__xmisc.c
index e8e4582cf328..e8e4582cf328 100644
--- a/deskutils/wmpinboard/files/patch-src::xmisc.c
+++ b/deskutils/wmpinboard/files/patch-src__xmisc.c
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src__orb__util__Makefile.in
index e048ca634226..e048ca634226 100644
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ b/devel/ORBit2/files/patch-src__orb__util__Makefile.in
diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc__Makefile.in
index a567fda3389c..a567fda3389c 100644
--- a/devel/anjuta/files/patch-doc::Makefile.in
+++ b/devel/anjuta/files/patch-doc__Makefile.in
diff --git a/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp b/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp
index 7048a047e182..7048a047e182 100644
--- a/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp
+++ b/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp
diff --git a/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp b/devel/antlr/files/patch-lib__cpp__antlr__CharBuffer.hpp
index ce84fe4aca2e..ce84fe4aca2e 100644
--- a/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp
+++ b/devel/antlr/files/patch-lib__cpp__antlr__CharBuffer.hpp
diff --git a/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp b/devel/antlr/files/patch-lib__cpp__src__ASTFactory.cpp
index 72d9e8db937c..72d9e8db937c 100644
--- a/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp
+++ b/devel/antlr/files/patch-lib__cpp__src__ASTFactory.cpp
diff --git a/devel/automake/files/patch-doc::automake.texi b/devel/automake/files/patch-doc__automake.texi
index 9f2f250b4671..9f2f250b4671 100644
--- a/devel/automake/files/patch-doc::automake.texi
+++ b/devel/automake/files/patch-doc__automake.texi
diff --git a/devel/cppunit/files/patch-config::ltmain.sh b/devel/cppunit/files/patch-config__ltmain.sh
index 3f7106f94a09..3f7106f94a09 100644
--- a/devel/cppunit/files/patch-config::ltmain.sh
+++ b/devel/cppunit/files/patch-config__ltmain.sh
diff --git a/devel/cppunit/files/patch-doc::Makefile.in b/devel/cppunit/files/patch-doc__Makefile.in
index 1b4a4017e60e..1b4a4017e60e 100644
--- a/devel/cppunit/files/patch-doc::Makefile.in
+++ b/devel/cppunit/files/patch-doc__Makefile.in
diff --git a/devel/cutils/files/patch-doc::Makefile.in b/devel/cutils/files/patch-doc__Makefile.in
index 579450879394..579450879394 100644
--- a/devel/cutils/files/patch-doc::Makefile.in
+++ b/devel/cutils/files/patch-doc__Makefile.in
diff --git a/devel/cutils/files/patch-doc::cutils.texi b/devel/cutils/files/patch-doc__cutils.texi
index 42642a4d3e8c..42642a4d3e8c 100644
--- a/devel/cutils/files/patch-doc::cutils.texi
+++ b/devel/cutils/files/patch-doc__cutils.texi
diff --git a/devel/elfsh/files/patch-libelfsh::Makefile b/devel/elfsh/files/patch-libelfsh__Makefile
index d4fbc43b566b..d4fbc43b566b 100644
--- a/devel/elfsh/files/patch-libelfsh::Makefile
+++ b/devel/elfsh/files/patch-libelfsh__Makefile
diff --git a/devel/elfsh/files/patch-libelfsh::include::libelfsh.h b/devel/elfsh/files/patch-libelfsh__include__libelfsh.h
index e0572dc9d740..e0572dc9d740 100644
--- a/devel/elfsh/files/patch-libelfsh::include::libelfsh.h
+++ b/devel/elfsh/files/patch-libelfsh__include__libelfsh.h
diff --git a/devel/elfsh/files/patch-libhash::Makefile b/devel/elfsh/files/patch-libhash__Makefile
index c928d0690ffd..c928d0690ffd 100644
--- a/devel/elfsh/files/patch-libhash::Makefile
+++ b/devel/elfsh/files/patch-libhash__Makefile
diff --git a/devel/elfsh/files/patch-modules-modflow::Makefile b/devel/elfsh/files/patch-modules-modflow__Makefile
index 8b14dbff1b4a..8b14dbff1b4a 100644
--- a/devel/elfsh/files/patch-modules-modflow::Makefile
+++ b/devel/elfsh/files/patch-modules-modflow__Makefile
diff --git a/devel/elfsh/files/patch-modules::Makefile b/devel/elfsh/files/patch-modules__Makefile
index 052a30c81230..052a30c81230 100644
--- a/devel/elfsh/files/patch-modules::Makefile
+++ b/devel/elfsh/files/patch-modules__Makefile
diff --git a/devel/elfsh/files/patch-vm::Makefile b/devel/elfsh/files/patch-vm__Makefile
index 30e1c39b8295..30e1c39b8295 100644
--- a/devel/elfsh/files/patch-vm::Makefile
+++ b/devel/elfsh/files/patch-vm__Makefile
diff --git a/devel/elfsh/files/patch-vm::readln.c b/devel/elfsh/files/patch-vm__readln.c
index a9366b630360..a9366b630360 100644
--- a/devel/elfsh/files/patch-vm::readln.c
+++ b/devel/elfsh/files/patch-vm__readln.c
diff --git a/devel/glib12/files/patch-gmodule::gmodule-dl.c b/devel/glib12/files/patch-gmodule__gmodule-dl.c
index 5460f6300bc1..5460f6300bc1 100644
--- a/devel/glib12/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib12/files/patch-gmodule__gmodule-dl.c
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib__libcharset__Makefile.in
index b3589ad592c5..b3589ad592c5 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib__libcharset__Makefile.in
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule__gmodule-dl.c
index 586d7f80bd62..586d7f80bd62 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule__gmodule-dl.c
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs__Makefile.in
index 063376961823..063376961823 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs__Makefile.in
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs__gnome-vfs-application-registry.c
index 2747466f7bd9..2747466f7bd9 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs__gnome-vfs-application-registry.c
diff --git a/devel/gtranslator/files/patch-src::find.c b/devel/gtranslator/files/patch-src__find.c
index 8ee4e9b7e947..8ee4e9b7e947 100644
--- a/devel/gtranslator/files/patch-src::find.c
+++ b/devel/gtranslator/files/patch-src__find.c
diff --git a/devel/gtranslator/files/patch-src::message.c b/devel/gtranslator/files/patch-src__message.c
index db4ca7119c4a..db4ca7119c4a 100644
--- a/devel/gtranslator/files/patch-src::message.c
+++ b/devel/gtranslator/files/patch-src__message.c
diff --git a/devel/horde3-chora/files/patch-config::sourceroots.php.dist b/devel/horde3-chora/files/patch-config__sourceroots.php.dist
index 1a75771ecaf1..1a75771ecaf1 100644
--- a/devel/horde3-chora/files/patch-config::sourceroots.php.dist
+++ b/devel/horde3-chora/files/patch-config__sourceroots.php.dist
diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server__Makefile.in
index 45fc8fc1e142..45fc8fc1e142 100644
--- a/devel/libbonobo/files/patch-server::Makefile.in
+++ b/devel/libbonobo/files/patch-server__Makefile.in
diff --git a/devel/libbonobo/files/patch-server::activation-server-main.c b/devel/libbonobo/files/patch-server__activation-server-main.c
index 0f7e7cd3fe08..0f7e7cd3fe08 100644
--- a/devel/libbonobo/files/patch-server::activation-server-main.c
+++ b/devel/libbonobo/files/patch-server__activation-server-main.c
diff --git a/devel/libbonobo/files/patch-utils::bonobo-slay.in b/devel/libbonobo/files/patch-utils__bonobo-slay.in
index 44212a0418a1..44212a0418a1 100644
--- a/devel/libbonobo/files/patch-utils::bonobo-slay.in
+++ b/devel/libbonobo/files/patch-utils__bonobo-slay.in
diff --git a/devel/libelf/files/patch-lib::sys_elf.h.in b/devel/libelf/files/patch-lib__sys_elf.h.in
index b96611c5a71d..b96611c5a71d 100644
--- a/devel/libelf/files/patch-lib::sys_elf.h.in
+++ b/devel/libelf/files/patch-lib__sys_elf.h.in
diff --git a/devel/mk/files/patch-src::Posix.c b/devel/mk/files/patch-src__Posix.c
index 1e2b3dbe77d8..1e2b3dbe77d8 100644
--- a/devel/mk/files/patch-src::Posix.c
+++ b/devel/mk/files/patch-src__Posix.c
diff --git a/devel/mk/files/patch-src::main.c b/devel/mk/files/patch-src__main.c
index 50c5214e98de..50c5214e98de 100644
--- a/devel/mk/files/patch-src::main.c
+++ b/devel/mk/files/patch-src__main.c
diff --git a/devel/motor/files/patch-src::Makefile.in b/devel/motor/files/patch-src__Makefile.in
index a1ae4583ddbe..a1ae4583ddbe 100644
--- a/devel/motor/files/patch-src::Makefile.in
+++ b/devel/motor/files/patch-src__Makefile.in
diff --git a/devel/motor/files/patch-src::configuration::Makefile.in b/devel/motor/files/patch-src__configuration__Makefile.in
index dff1622135fa..dff1622135fa 100644
--- a/devel/motor/files/patch-src::configuration::Makefile.in
+++ b/devel/motor/files/patch-src__configuration__Makefile.in
diff --git a/devel/motor/files/patch-src::debugger::motordebugger.cc b/devel/motor/files/patch-src__debugger__motordebugger.cc
index 79d192d56367..79d192d56367 100644
--- a/devel/motor/files/patch-src::debugger::motordebugger.cc
+++ b/devel/motor/files/patch-src__debugger__motordebugger.cc
diff --git a/devel/motor/files/patch-src::manager::Makefile.in b/devel/motor/files/patch-src__manager__Makefile.in
index 9873474ec12b..9873474ec12b 100644
--- a/devel/motor/files/patch-src::manager::Makefile.in
+++ b/devel/motor/files/patch-src__manager__Makefile.in
diff --git a/devel/mpatrol/files/patch-..::..::src::mpatrol.h b/devel/mpatrol/files/patch-..__..__src__mpatrol.h
index f335de221249..f335de221249 100644
--- a/devel/mpatrol/files/patch-..::..::src::mpatrol.h
+++ b/devel/mpatrol/files/patch-..__..__src__mpatrol.h
diff --git a/devel/mpatrol/files/patch-..::..::src::mptrace.c b/devel/mpatrol/files/patch-..__..__src__mptrace.c
index 81272824cd51..81272824cd51 100644
--- a/devel/mpatrol/files/patch-..::..::src::mptrace.c
+++ b/devel/mpatrol/files/patch-..__..__src__mptrace.c
diff --git a/devel/mpatrol/files/patch-..::..::src::symbol.c b/devel/mpatrol/files/patch-..__..__src__symbol.c
index e36d9f2b171f..e36d9f2b171f 100644
--- a/devel/mpatrol/files/patch-..::..::src::symbol.c
+++ b/devel/mpatrol/files/patch-..__..__src__symbol.c
diff --git a/devel/mpatrol/files/patch-..::..::tools::dbmalloc.c b/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c
index 06352ee6ab0a..06352ee6ab0a 100644
--- a/devel/mpatrol/files/patch-..::..::tools::dbmalloc.c
+++ b/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c
diff --git a/devel/nspr/files/patch-..::config::autoconf.mk.in b/devel/nspr/files/patch-..__config__autoconf.mk.in
index a0a102666ba2..a0a102666ba2 100644
--- a/devel/nspr/files/patch-..::config::autoconf.mk.in
+++ b/devel/nspr/files/patch-..__config__autoconf.mk.in
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..__configure
index 1de6f0641c1a..1de6f0641c1a 100644
--- a/devel/nspr/files/patch-..::configure
+++ b/devel/nspr/files/patch-..__configure
diff --git a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.ml b/devel/ocamlweb/files/patch-ocaml-parser__terminfo.ml
index 6f25a47e0c06..6f25a47e0c06 100644
--- a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.ml
+++ b/devel/ocamlweb/files/patch-ocaml-parser__terminfo.ml
diff --git a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.mli b/devel/ocamlweb/files/patch-ocaml-parser__terminfo.mli
index 6b6796a10b10..6b6796a10b10 100644
--- a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.mli
+++ b/devel/ocamlweb/files/patch-ocaml-parser__terminfo.mli
diff --git a/devel/omniORB/files/patch-contrib::pkgconfig::GNUmakefile.in b/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in
index 3679845d611e..3679845d611e 100644
--- a/devel/omniORB/files/patch-contrib::pkgconfig::GNUmakefile.in
+++ b/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in
diff --git a/devel/omniORB/files/patch-idl::COS::Gnumakefile.in b/devel/omniORB/files/patch-idl__COS__Gnumakefile.in
index 18f578c0bcab..18f578c0bcab 100644
--- a/devel/omniORB/files/patch-idl::COS::Gnumakefile.in
+++ b/devel/omniORB/files/patch-idl__COS__Gnumakefile.in
diff --git a/devel/omniORB/files/patch-idl::Gnumakefile.in b/devel/omniORB/files/patch-idl__Gnumakefile.in
index d0aa376f299c..d0aa376f299c 100644
--- a/devel/omniORB/files/patch-idl::Gnumakefile.in
+++ b/devel/omniORB/files/patch-idl__Gnumakefile.in
diff --git a/devel/publib/files/patch-framework::Generic.mk b/devel/publib/files/patch-framework__Generic.mk
index 953d7d7d4b46..953d7d7d4b46 100644
--- a/devel/publib/files/patch-framework::Generic.mk
+++ b/devel/publib/files/patch-framework__Generic.mk
diff --git a/devel/publib/files/patch-liw::publibdoc::Makefile b/devel/publib/files/patch-liw__publibdoc__Makefile
index 56d7339c1919..56d7339c1919 100644
--- a/devel/publib/files/patch-liw::publibdoc::Makefile
+++ b/devel/publib/files/patch-liw__publibdoc__Makefile
diff --git a/devel/pwlib/files/patch-make::lib.mak b/devel/pwlib/files/patch-make__lib.mak
index c5098242f269..c5098242f269 100644
--- a/devel/pwlib/files/patch-make::lib.mak
+++ b/devel/pwlib/files/patch-make__lib.mak
diff --git a/devel/py-ncurses/files/patch-ncurses::_curses_wrap.c b/devel/py-ncurses/files/patch-ncurses___curses_wrap.c
index 2f1766aaf838..2f1766aaf838 100644
--- a/devel/py-ncurses/files/patch-ncurses::_curses_wrap.c
+++ b/devel/py-ncurses/files/patch-ncurses___curses_wrap.c
diff --git a/devel/py-ncurses/files/patch-ncurses::_panel_wrap.c b/devel/py-ncurses/files/patch-ncurses___panel_wrap.c
index 01a7f4408eb0..01a7f4408eb0 100644
--- a/devel/py-ncurses/files/patch-ncurses::_panel_wrap.c
+++ b/devel/py-ncurses/files/patch-ncurses___panel_wrap.c
diff --git a/devel/regexx/files/patch-examples::simple.cc b/devel/regexx/files/patch-examples__simple.cc
index 504f5d61509a..504f5d61509a 100644
--- a/devel/regexx/files/patch-examples::simple.cc
+++ b/devel/regexx/files/patch-examples__simple.cc
diff --git a/devel/regexx/files/patch-src::regex.hh b/devel/regexx/files/patch-src__regex.hh
index a34c40bb818f..a34c40bb818f 100644
--- a/devel/regexx/files/patch-src::regex.hh
+++ b/devel/regexx/files/patch-src__regex.hh
diff --git a/devel/regexx/files/patch-src::regexx.cc b/devel/regexx/files/patch-src__regexx.cc
index 4d15587279d8..4d15587279d8 100644
--- a/devel/regexx/files/patch-src::regexx.cc
+++ b/devel/regexx/files/patch-src__regexx.cc
diff --git a/devel/rlwrap/files/patch-src::ptytty.c b/devel/rlwrap/files/patch-src__ptytty.c
index 23598bc0c116..23598bc0c116 100644
--- a/devel/rlwrap/files/patch-src::ptytty.c
+++ b/devel/rlwrap/files/patch-src__ptytty.c
diff --git a/devel/ruby-rbprof/files/patch-aspects::profiler::lib::rbprof.rb b/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb
index d442ebdbc5cc..d442ebdbc5cc 100644
--- a/devel/ruby-rbprof/files/patch-aspects::profiler::lib::rbprof.rb
+++ b/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb
diff --git a/devel/sdlmm/files/patch-src::Makefile.in b/devel/sdlmm/files/patch-src__Makefile.in
index 24207e702a59..24207e702a59 100644
--- a/devel/sdlmm/files/patch-src::Makefile.in
+++ b/devel/sdlmm/files/patch-src__Makefile.in
diff --git a/devel/splint/files/patch-src::Headers::constants.h b/devel/splint/files/patch-src__Headers__constants.h
index f00c0e389b42..f00c0e389b42 100644
--- a/devel/splint/files/patch-src::Headers::constants.h
+++ b/devel/splint/files/patch-src__Headers__constants.h
diff --git a/devel/splint/files/patch-src::lcllib.c b/devel/splint/files/patch-src__lcllib.c
index 49893ede0fab..49893ede0fab 100644
--- a/devel/splint/files/patch-src::lcllib.c
+++ b/devel/splint/files/patch-src__lcllib.c
diff --git a/devel/styx/files/patch-inc::sysbase1.h b/devel/styx/files/patch-inc__sysbase1.h
index e1800ff903b9..e1800ff903b9 100644
--- a/devel/styx/files/patch-inc::sysbase1.h
+++ b/devel/styx/files/patch-inc__sysbase1.h
diff --git a/devel/styx/files/patch-libbase::gstream.c b/devel/styx/files/patch-libbase__gstream.c
index 2c8a3cc22e27..2c8a3cc22e27 100644
--- a/devel/styx/files/patch-libbase::gstream.c
+++ b/devel/styx/files/patch-libbase__gstream.c
diff --git a/devel/styx/files/patch-libbase::sysbase1.c b/devel/styx/files/patch-libbase__sysbase1.c
index 098fb470d1ce..098fb470d1ce 100644
--- a/devel/styx/files/patch-libbase::sysbase1.c
+++ b/devel/styx/files/patch-libbase__sysbase1.c
diff --git a/devel/terminality/files/patch-demo::Makefile b/devel/terminality/files/patch-demo__Makefile
index 02f180b34e54..02f180b34e54 100644
--- a/devel/terminality/files/patch-demo::Makefile
+++ b/devel/terminality/files/patch-demo__Makefile
diff --git a/devel/terminality/files/patch-dlgc::Makefile b/devel/terminality/files/patch-dlgc__Makefile
index 2485a12bb077..2485a12bb077 100644
--- a/devel/terminality/files/patch-dlgc::Makefile
+++ b/devel/terminality/files/patch-dlgc__Makefile
diff --git a/devel/wininfo/files/patch-src::wininfo.c b/devel/wininfo/files/patch-src__wininfo.c
index a341dc3ec24f..a341dc3ec24f 100644
--- a/devel/wininfo/files/patch-src::wininfo.c
+++ b/devel/wininfo/files/patch-src__wininfo.c
diff --git a/devel/xparam/files/patch-examples::calculator::Makefile.in b/devel/xparam/files/patch-examples__calculator__Makefile.in
index c9ce136e45fe..c9ce136e45fe 100644
--- a/devel/xparam/files/patch-examples::calculator::Makefile.in
+++ b/devel/xparam/files/patch-examples__calculator__Makefile.in
diff --git a/devel/xparam/files/patch-examples::involved::Makefile.in b/devel/xparam/files/patch-examples__involved__Makefile.in
index 91adf7e6ebaf..91adf7e6ebaf 100644
--- a/devel/xparam/files/patch-examples::involved::Makefile.in
+++ b/devel/xparam/files/patch-examples__involved__Makefile.in
diff --git a/devel/xparam/files/patch-lib::Makefile.in b/devel/xparam/files/patch-lib__Makefile.in
index 96e953675a6d..96e953675a6d 100644
--- a/devel/xparam/files/patch-lib::Makefile.in
+++ b/devel/xparam/files/patch-lib__Makefile.in
diff --git a/devel/xparam/files/patch-lib::sources::xpv_dynamic_loader.cpp b/devel/xparam/files/patch-lib__sources__xpv_dynamic_loader.cpp
index 2c1ba9aee6b1..2c1ba9aee6b1 100644
--- a/devel/xparam/files/patch-lib::sources::xpv_dynamic_loader.cpp
+++ b/devel/xparam/files/patch-lib__sources__xpv_dynamic_loader.cpp
diff --git a/dns/fastresolve/files/patch-dns-terror::DatedStringDb.cc b/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc
index 9c231327dee5..9c231327dee5 100644
--- a/dns/fastresolve/files/patch-dns-terror::DatedStringDb.cc
+++ b/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc
diff --git a/dns/fastresolve/files/patch-dns-terror::dns-terror.cc b/dns/fastresolve/files/patch-dns-terror__dns-terror.cc
index d7c881f32122..d7c881f32122 100644
--- a/dns/fastresolve/files/patch-dns-terror::dns-terror.cc
+++ b/dns/fastresolve/files/patch-dns-terror__dns-terror.cc
diff --git a/dns/idnkit/files/patch-tools::runidn::resolver.c b/dns/idnkit/files/patch-tools__runidn__resolver.c
index b0404437549b..b0404437549b 100644
--- a/dns/idnkit/files/patch-tools::runidn::resolver.c
+++ b/dns/idnkit/files/patch-tools__runidn__resolver.c
diff --git a/dns/inadyn/files/patch-man::inadyn.8 b/dns/inadyn/files/patch-man__inadyn.8
index 1cf8714108ca..1cf8714108ca 100644
--- a/dns/inadyn/files/patch-man::inadyn.8
+++ b/dns/inadyn/files/patch-man__inadyn.8
diff --git a/dns/inadyn/files/patch-src::dyndns.h b/dns/inadyn/files/patch-src__dyndns.h
index 0dbd9a7f74c3..0dbd9a7f74c3 100644
--- a/dns/inadyn/files/patch-src::dyndns.h
+++ b/dns/inadyn/files/patch-src__dyndns.h
diff --git a/dns/libidn/files/patch-doc::libidn.texi b/dns/libidn/files/patch-doc__libidn.texi
index 1429f7c14011..1429f7c14011 100644
--- a/dns/libidn/files/patch-doc::libidn.texi
+++ b/dns/libidn/files/patch-doc__libidn.texi
diff --git a/editors/cooledit/files/patch-rxvt::_rxvtlib.h b/editors/cooledit/files/patch-rxvt___rxvtlib.h
index a3965c22ed91..a3965c22ed91 100644
--- a/editors/cooledit/files/patch-rxvt::_rxvtlib.h
+++ b/editors/cooledit/files/patch-rxvt___rxvtlib.h
diff --git a/editors/cooledit/files/patch-widget::widechar.c b/editors/cooledit/files/patch-widget__widechar.c
index c60929714b2c..c60929714b2c 100644
--- a/editors/cooledit/files/patch-widget::widechar.c
+++ b/editors/cooledit/files/patch-widget__widechar.c
diff --git a/editors/fte/files/patch-src::fte-unix.mak b/editors/fte/files/patch-src__fte-unix.mak
index 23a48039e4fb..23a48039e4fb 100644
--- a/editors/fte/files/patch-src::fte-unix.mak
+++ b/editors/fte/files/patch-src__fte-unix.mak
diff --git a/editors/fte/files/patch-src::stl_string.cpp b/editors/fte/files/patch-src__stl_string.cpp
index 2391d7c34abf..2391d7c34abf 100644
--- a/editors/fte/files/patch-src::stl_string.cpp
+++ b/editors/fte/files/patch-src__stl_string.cpp
diff --git a/editors/fte/files/patch-src::sysdep.h b/editors/fte/files/patch-src__sysdep.h
index 3ab3d907b2d7..3ab3d907b2d7 100644
--- a/editors/fte/files/patch-src::sysdep.h
+++ b/editors/fte/files/patch-src__sysdep.h
diff --git a/editors/led/files/patch-src::file.c b/editors/led/files/patch-src__file.c
index 1bae33d41233..1bae33d41233 100644
--- a/editors/led/files/patch-src::file.c
+++ b/editors/led/files/patch-src__file.c
diff --git a/editors/mined/files/patch-src::makefile.bsd b/editors/mined/files/patch-src__makefile.bsd
index 898b249a38db..898b249a38db 100644
--- a/editors/mined/files/patch-src::makefile.bsd
+++ b/editors/mined/files/patch-src__makefile.bsd
diff --git a/editors/mined/files/patch-src::mkinclud.gcc b/editors/mined/files/patch-src__mkinclud.gcc
index 412568a5e104..412568a5e104 100644
--- a/editors/mined/files/patch-src::mkinclud.gcc
+++ b/editors/mined/files/patch-src__mkinclud.gcc
diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src__mkinclud.mak
index 6a0807b028c9..6a0807b028c9 100644
--- a/editors/mined/files/patch-src::mkinclud.mak
+++ b/editors/mined/files/patch-src__mkinclud.mak
diff --git a/emulators/generator/files/patch-hdr::generator.h b/emulators/generator/files/patch-hdr__generator.h
index 648ed05d7d72..648ed05d7d72 100644
--- a/emulators/generator/files/patch-hdr::generator.h
+++ b/emulators/generator/files/patch-hdr__generator.h
diff --git a/emulators/generator/files/patch-main::ui-gtk.c b/emulators/generator/files/patch-main__ui-gtk.c
index 9b6181f968b8..9b6181f968b8 100644
--- a/emulators/generator/files/patch-main::ui-gtk.c
+++ b/emulators/generator/files/patch-main__ui-gtk.c
diff --git a/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c b/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c
index 0034da8ce6cd..0034da8ce6cd 100644
--- a/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c
+++ b/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c
diff --git a/emulators/raine/files/patch-source::alleg::blit.c b/emulators/raine/files/patch-source__alleg__blit.c
index 1ecda275b4ff..1ecda275b4ff 100644
--- a/emulators/raine/files/patch-source::alleg::blit.c
+++ b/emulators/raine/files/patch-source__alleg__blit.c
diff --git a/emulators/raine/files/patch-source::emumain.c b/emulators/raine/files/patch-source__emumain.c
index 3293c4321044..3293c4321044 100644
--- a/emulators/raine/files/patch-source::emumain.c
+++ b/emulators/raine/files/patch-source__emumain.c
diff --git a/emulators/raine/files/patch-source::gui::rgui.c b/emulators/raine/files/patch-source__gui__rgui.c
index 11576063bd5d..11576063bd5d 100644
--- a/emulators/raine/files/patch-source::gui::rgui.c
+++ b/emulators/raine/files/patch-source__gui__rgui.c
diff --git a/finance/grisbi/files/patch-pixmaps::Makefile.in b/finance/grisbi/files/patch-pixmaps__Makefile.in
index 5b0d3a1c1979..5b0d3a1c1979 100644
--- a/finance/grisbi/files/patch-pixmaps::Makefile.in
+++ b/finance/grisbi/files/patch-pixmaps__Makefile.in
diff --git a/finance/grisbi/files/patch-src::Makefile.in b/finance/grisbi/files/patch-src__Makefile.in
index 3c7f0d54c873..3c7f0d54c873 100644
--- a/finance/grisbi/files/patch-src::Makefile.in
+++ b/finance/grisbi/files/patch-src__Makefile.in
diff --git a/french/eficas/files/patch-convert::Parserv5::Translate.py b/french/eficas/files/patch-convert__Parserv5__Translate.py
index c99b06cf3fb4..c99b06cf3fb4 100644
--- a/french/eficas/files/patch-convert::Parserv5::Translate.py
+++ b/french/eficas/files/patch-convert__Parserv5__Translate.py
diff --git a/ftp/proftpd/files/patch-doc::Configuration.html b/ftp/proftpd/files/patch-doc__Configuration.html
index 400699d4f8f1..400699d4f8f1 100644
--- a/ftp/proftpd/files/patch-doc::Configuration.html
+++ b/ftp/proftpd/files/patch-doc__Configuration.html
diff --git a/ftp/wmget/files/patch-dockapp::Makefile b/ftp/wmget/files/patch-dockapp__Makefile
index bc8795eebb07..bc8795eebb07 100644
--- a/ftp/wmget/files/patch-dockapp::Makefile
+++ b/ftp/wmget/files/patch-dockapp__Makefile
diff --git a/games/bomberinstinct/files/patch-data::Sprites::Makefile.in b/games/bomberinstinct/files/patch-data__Sprites__Makefile.in
index 285f4dca0959..285f4dca0959 100644
--- a/games/bomberinstinct/files/patch-data::Sprites::Makefile.in
+++ b/games/bomberinstinct/files/patch-data__Sprites__Makefile.in
diff --git a/games/cake/files/patch-cake::entity.cpp b/games/cake/files/patch-cake__entity.cpp
index babddf68d41d..babddf68d41d 100644
--- a/games/cake/files/patch-cake::entity.cpp
+++ b/games/cake/files/patch-cake__entity.cpp
diff --git a/games/cgoban/files/patch-wmslib::src::wms::snd.c b/games/cgoban/files/patch-wmslib__src__wms__snd.c
index 4e52888cb6a0..4e52888cb6a0 100644
--- a/games/cgoban/files/patch-wmslib::src::wms::snd.c
+++ b/games/cgoban/files/patch-wmslib__src__wms__snd.c
diff --git a/games/dodgindiamond2/files/patch-src::Makefile.in b/games/dodgindiamond2/files/patch-src__Makefile.in
index f0b924eeede9..f0b924eeede9 100644
--- a/games/dodgindiamond2/files/patch-src::Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__Makefile.in
diff --git a/games/dodgindiamond2/files/patch-src::data::Makefile.in b/games/dodgindiamond2/files/patch-src__data__Makefile.in
index 54a315bc23ec..54a315bc23ec 100644
--- a/games/dodgindiamond2/files/patch-src::data::Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__data__Makefile.in
diff --git a/games/dodgindiamond2/files/patch-src::main.c b/games/dodgindiamond2/files/patch-src__main.c
index ad1f4590b3a8..ad1f4590b3a8 100644
--- a/games/dodgindiamond2/files/patch-src::main.c
+++ b/games/dodgindiamond2/files/patch-src__main.c
diff --git a/games/ggz-txt-client/files/patch-ggz-txt::loop.c b/games/ggz-txt-client/files/patch-ggz-txt__loop.c
index 174b2920b273..174b2920b273 100644
--- a/games/ggz-txt-client/files/patch-ggz-txt::loop.c
+++ b/games/ggz-txt-client/files/patch-ggz-txt__loop.c
diff --git a/games/ggz-txt-client/files/patch-ggz-txt::output.c b/games/ggz-txt-client/files/patch-ggz-txt__output.c
index 6062361d91bc..6062361d91bc 100644
--- a/games/ggz-txt-client/files/patch-ggz-txt::output.c
+++ b/games/ggz-txt-client/files/patch-ggz-txt__output.c
diff --git a/games/ggz-txt-client/files/patch-tttxt::main.c b/games/ggz-txt-client/files/patch-tttxt__main.c
index e16834251384..e16834251384 100644
--- a/games/ggz-txt-client/files/patch-tttxt::main.c
+++ b/games/ggz-txt-client/files/patch-tttxt__main.c
diff --git a/games/gltron/files/patch-nebu::scripting::scritpting.c b/games/gltron/files/patch-nebu__scripting__scritpting.c
index b3b9efd10faa..b3b9efd10faa 100644
--- a/games/gltron/files/patch-nebu::scripting::scritpting.c
+++ b/games/gltron/files/patch-nebu__scripting__scritpting.c
diff --git a/games/gnomekiss/files/patch-src::event.c b/games/gnomekiss/files/patch-src__event.c
index 8ba2cdc866f2..8ba2cdc866f2 100644
--- a/games/gnomekiss/files/patch-src::event.c
+++ b/games/gnomekiss/files/patch-src__event.c
diff --git a/games/heretic/files/patch-graphics::i_sdl.c b/games/heretic/files/patch-graphics__i_sdl.c
index 388677f0f1e1..388677f0f1e1 100644
--- a/games/heretic/files/patch-graphics::i_sdl.c
+++ b/games/heretic/files/patch-graphics__i_sdl.c
diff --git a/games/heretic/files/patch-graphics::i_sdl_gl.c b/games/heretic/files/patch-graphics__i_sdl_gl.c
index 96ef61c995d2..96ef61c995d2 100644
--- a/games/heretic/files/patch-graphics::i_sdl_gl.c
+++ b/games/heretic/files/patch-graphics__i_sdl_gl.c
diff --git a/games/heroes/files/patch-src::menus.c b/games/heroes/files/patch-src__menus.c
index 134b7c35774b..134b7c35774b 100644
--- a/games/heroes/files/patch-src::menus.c
+++ b/games/heroes/files/patch-src__menus.c
diff --git a/games/linux-ut/files/patch-bin::ut b/games/linux-ut/files/patch-bin__ut
index b14b86fa2164..b14b86fa2164 100644
--- a/games/linux-ut/files/patch-bin::ut
+++ b/games/linux-ut/files/patch-bin__ut
diff --git a/games/monster-masher/files/patch-src::arena.cpp b/games/monster-masher/files/patch-src__arena.cpp
index aaf23107e72f..aaf23107e72f 100644
--- a/games/monster-masher/files/patch-src::arena.cpp
+++ b/games/monster-masher/files/patch-src__arena.cpp
diff --git a/games/moria/files/patch-doc::Makefile b/games/moria/files/patch-doc__Makefile
index 91ed516b5c23..91ed516b5c23 100644
--- a/games/moria/files/patch-doc::Makefile
+++ b/games/moria/files/patch-doc__Makefile
diff --git a/games/moria/files/patch-source::config.h b/games/moria/files/patch-source__config.h
index 5bfd9da5d0a0..5bfd9da5d0a0 100644
--- a/games/moria/files/patch-source::config.h
+++ b/games/moria/files/patch-source__config.h
diff --git a/games/moria/files/patch-source::death.c b/games/moria/files/patch-source__death.c
index 3e7795add028..3e7795add028 100644
--- a/games/moria/files/patch-source::death.c
+++ b/games/moria/files/patch-source__death.c
diff --git a/games/moria/files/patch-source::io.c b/games/moria/files/patch-source__io.c
index 8bec0d1170d6..8bec0d1170d6 100644
--- a/games/moria/files/patch-source::io.c
+++ b/games/moria/files/patch-source__io.c
diff --git a/games/moria/files/patch-source::main.c b/games/moria/files/patch-source__main.c
index a07015ed4d03..a07015ed4d03 100644
--- a/games/moria/files/patch-source::main.c
+++ b/games/moria/files/patch-source__main.c
diff --git a/games/moria/files/patch-source::misc1.c b/games/moria/files/patch-source__misc1.c
index 313c932c4a99..313c932c4a99 100644
--- a/games/moria/files/patch-source::misc1.c
+++ b/games/moria/files/patch-source__misc1.c
diff --git a/games/moria/files/patch-source::misc3.c b/games/moria/files/patch-source__misc3.c
index 9c0328bb782a..9c0328bb782a 100644
--- a/games/moria/files/patch-source::misc3.c
+++ b/games/moria/files/patch-source__misc3.c
diff --git a/games/moria/files/patch-source::save.c b/games/moria/files/patch-source__save.c
index bea0b8b490f3..bea0b8b490f3 100644
--- a/games/moria/files/patch-source::save.c
+++ b/games/moria/files/patch-source__save.c
diff --git a/games/moria/files/patch-source::signals.c b/games/moria/files/patch-source__signals.c
index 7d85536de9bd..7d85536de9bd 100644
--- a/games/moria/files/patch-source::signals.c
+++ b/games/moria/files/patch-source__signals.c
diff --git a/games/moria/files/patch-source::types.h b/games/moria/files/patch-source__types.h
index 5c3f89b98f9a..5c3f89b98f9a 100644
--- a/games/moria/files/patch-source::types.h
+++ b/games/moria/files/patch-source__types.h
diff --git a/games/moria/files/patch-unix::Makefile b/games/moria/files/patch-unix__Makefile
index b78b568e23ec..b78b568e23ec 100644
--- a/games/moria/files/patch-unix::Makefile
+++ b/games/moria/files/patch-unix__Makefile
diff --git a/games/moria/files/patch-unix::unix.c b/games/moria/files/patch-unix__unix.c
index 65bd69fd8093..65bd69fd8093 100644
--- a/games/moria/files/patch-unix::unix.c
+++ b/games/moria/files/patch-unix__unix.c
diff --git a/games/noegnud-data/files/patch-variants::Makefile b/games/noegnud-data/files/patch-variants__Makefile
index 8d3c7d0515a7..8d3c7d0515a7 100644
--- a/games/noegnud-data/files/patch-variants::Makefile
+++ b/games/noegnud-data/files/patch-variants__Makefile
diff --git a/games/noegnud-littlehack/files/patch-noegnud::noegnud_glfuncs.h b/games/noegnud-littlehack/files/patch-noegnud__noegnud_glfuncs.h
index 147e9b0736e1..147e9b0736e1 100644
--- a/games/noegnud-littlehack/files/patch-noegnud::noegnud_glfuncs.h
+++ b/games/noegnud-littlehack/files/patch-noegnud__noegnud_glfuncs.h
diff --git a/games/noegnud-littlehack/files/patch-noegnud::noegnud_interface.h b/games/noegnud-littlehack/files/patch-noegnud__noegnud_interface.h
index 05b1a944199a..05b1a944199a 100644
--- a/games/noegnud-littlehack/files/patch-noegnud::noegnud_interface.h
+++ b/games/noegnud-littlehack/files/patch-noegnud__noegnud_interface.h
diff --git a/games/noegnud-littlehack/files/patch-variants::Makefile b/games/noegnud-littlehack/files/patch-variants__Makefile
index 5545caa33ad0..5545caa33ad0 100644
--- a/games/noegnud-littlehack/files/patch-variants::Makefile
+++ b/games/noegnud-littlehack/files/patch-variants__Makefile
diff --git a/games/noegnud-littlehack/files/patch-variants::littlehack-0.0.1::src::trap.c b/games/noegnud-littlehack/files/patch-variants__littlehack-0.0.1__src__trap.c
index 07a7fa44b094..07a7fa44b094 100644
--- a/games/noegnud-littlehack/files/patch-variants::littlehack-0.0.1::src::trap.c
+++ b/games/noegnud-littlehack/files/patch-variants__littlehack-0.0.1__src__trap.c
diff --git a/games/noegnud-nethack-deet/files/patch-noegnud::noegnud_glfuncs.h b/games/noegnud-nethack-deet/files/patch-noegnud__noegnud_glfuncs.h
index 147e9b0736e1..147e9b0736e1 100644
--- a/games/noegnud-nethack-deet/files/patch-noegnud::noegnud_glfuncs.h
+++ b/games/noegnud-nethack-deet/files/patch-noegnud__noegnud_glfuncs.h
diff --git a/games/noegnud-nethack-deet/files/patch-noegnud::noegnud_interface.h b/games/noegnud-nethack-deet/files/patch-noegnud__noegnud_interface.h
index 05b1a944199a..05b1a944199a 100644
--- a/games/noegnud-nethack-deet/files/patch-noegnud::noegnud_interface.h
+++ b/games/noegnud-nethack-deet/files/patch-noegnud__noegnud_interface.h
diff --git a/games/noegnud-nethack-deet/files/patch-variants::Makefile b/games/noegnud-nethack-deet/files/patch-variants__Makefile
index b4e129eb5711..b4e129eb5711 100644
--- a/games/noegnud-nethack-deet/files/patch-variants::Makefile
+++ b/games/noegnud-nethack-deet/files/patch-variants__Makefile
diff --git a/games/noegnud-nethack/files/patch-noegnud::noegnud_glfuncs.h b/games/noegnud-nethack/files/patch-noegnud__noegnud_glfuncs.h
index 147e9b0736e1..147e9b0736e1 100644
--- a/games/noegnud-nethack/files/patch-noegnud::noegnud_glfuncs.h
+++ b/games/noegnud-nethack/files/patch-noegnud__noegnud_glfuncs.h
diff --git a/games/noegnud-nethack/files/patch-noegnud::noegnud_interface.h b/games/noegnud-nethack/files/patch-noegnud__noegnud_interface.h
index 05b1a944199a..05b1a944199a 100644
--- a/games/noegnud-nethack/files/patch-noegnud::noegnud_interface.h
+++ b/games/noegnud-nethack/files/patch-noegnud__noegnud_interface.h
diff --git a/games/noegnud-nethack/files/patch-variants::Makefile b/games/noegnud-nethack/files/patch-variants__Makefile
index 69fdcd8a736c..69fdcd8a736c 100644
--- a/games/noegnud-nethack/files/patch-variants::Makefile
+++ b/games/noegnud-nethack/files/patch-variants__Makefile
diff --git a/games/noegnud-slashem/files/patch-noegnud::noegnud_glfuncs.h b/games/noegnud-slashem/files/patch-noegnud__noegnud_glfuncs.h
index 147e9b0736e1..147e9b0736e1 100644
--- a/games/noegnud-slashem/files/patch-noegnud::noegnud_glfuncs.h
+++ b/games/noegnud-slashem/files/patch-noegnud__noegnud_glfuncs.h
diff --git a/games/noegnud-slashem/files/patch-noegnud::noegnud_interface.h b/games/noegnud-slashem/files/patch-noegnud__noegnud_interface.h
index 05b1a944199a..05b1a944199a 100644
--- a/games/noegnud-slashem/files/patch-noegnud::noegnud_interface.h
+++ b/games/noegnud-slashem/files/patch-noegnud__noegnud_interface.h
diff --git a/games/noegnud-slashem/files/patch-variants::Makefile b/games/noegnud-slashem/files/patch-variants__Makefile
index 990e3b819ba5..990e3b819ba5 100644
--- a/games/noegnud-slashem/files/patch-variants::Makefile
+++ b/games/noegnud-slashem/files/patch-variants__Makefile
diff --git a/games/pinball/files/patch-base::TextureUtil.cpp b/games/pinball/files/patch-base__TextureUtil.cpp
index 507c733c0f46..507c733c0f46 100644
--- a/games/pinball/files/patch-base::TextureUtil.cpp
+++ b/games/pinball/files/patch-base__TextureUtil.cpp
diff --git a/games/pinball/files/patch-data::tux::ModuleTux.cpp b/games/pinball/files/patch-data__tux__ModuleTux.cpp
index f6d45d46493c..f6d45d46493c 100644
--- a/games/pinball/files/patch-data::tux::ModuleTux.cpp
+++ b/games/pinball/files/patch-data__tux__ModuleTux.cpp
diff --git a/games/pinball/files/patch-src::EyeBehavior.cpp b/games/pinball/files/patch-src__EyeBehavior.cpp
index 53e85792c157..53e85792c157 100644
--- a/games/pinball/files/patch-src::EyeBehavior.cpp
+++ b/games/pinball/files/patch-src__EyeBehavior.cpp
diff --git a/games/pinball/files/patch-src::Loader.cpp b/games/pinball/files/patch-src__Loader.cpp
index f74923316e7d..f74923316e7d 100644
--- a/games/pinball/files/patch-src::Loader.cpp
+++ b/games/pinball/files/patch-src__Loader.cpp
diff --git a/games/tetrinet-x/files/patch-src::main.c b/games/tetrinet-x/files/patch-src__main.c
index 8f453d3fe036..8f453d3fe036 100644
--- a/games/tetrinet-x/files/patch-src::main.c
+++ b/games/tetrinet-x/files/patch-src__main.c
diff --git a/games/tetrinet-x/files/patch-src::main.h b/games/tetrinet-x/files/patch-src__main.h
index 5f3038369b1a..5f3038369b1a 100644
--- a/games/tetrinet-x/files/patch-src::main.h
+++ b/games/tetrinet-x/files/patch-src__main.h
diff --git a/games/tetrinet-x/files/patch-src::net.c b/games/tetrinet-x/files/patch-src__net.c
index 4b347233cdc0..4b347233cdc0 100644
--- a/games/tetrinet-x/files/patch-src::net.c
+++ b/games/tetrinet-x/files/patch-src__net.c
diff --git a/games/uhexen/files/patch-include::h2def.h b/games/uhexen/files/patch-include__h2def.h
index dda5deabb790..dda5deabb790 100644
--- a/games/uhexen/files/patch-include::h2def.h
+++ b/games/uhexen/files/patch-include__h2def.h
diff --git a/games/uhexen/files/patch-src::h2_main.c b/games/uhexen/files/patch-src__h2_main.c
index 9d673878a690..9d673878a690 100644
--- a/games/uhexen/files/patch-src::h2_main.c
+++ b/games/uhexen/files/patch-src__h2_main.c
diff --git a/games/uhexen/files/patch-src::i_sdlvideo.c b/games/uhexen/files/patch-src__i_sdlvideo.c
index 4451b30fc4f2..4451b30fc4f2 100644
--- a/games/uhexen/files/patch-src::i_sdlvideo.c
+++ b/games/uhexen/files/patch-src__i_sdlvideo.c
diff --git a/games/uhexen/files/patch-src::i_video.c b/games/uhexen/files/patch-src__i_video.c
index b1a72d193132..b1a72d193132 100644
--- a/games/uhexen/files/patch-src::i_video.c
+++ b/games/uhexen/files/patch-src__i_video.c
diff --git a/games/uhexen/files/patch-src::m_misc.c b/games/uhexen/files/patch-src__m_misc.c
index 7caa595b3604..7caa595b3604 100644
--- a/games/uhexen/files/patch-src::m_misc.c
+++ b/games/uhexen/files/patch-src__m_misc.c
diff --git a/games/uhexen/files/patch-src::w_wad.c b/games/uhexen/files/patch-src__w_wad.c
index fd925cb8a06e..fd925cb8a06e 100644
--- a/games/uhexen/files/patch-src::w_wad.c
+++ b/games/uhexen/files/patch-src__w_wad.c
diff --git a/games/xbubble/files/patch-src::Makefile.in b/games/xbubble/files/patch-src__Makefile.in
index cc51eab50740..cc51eab50740 100644
--- a/games/xbubble/files/patch-src::Makefile.in
+++ b/games/xbubble/files/patch-src__Makefile.in
diff --git a/games/xbubble/files/patch-src::init.c b/games/xbubble/files/patch-src__init.c
index 718172d4731f..718172d4731f 100644
--- a/games/xbubble/files/patch-src::init.c
+++ b/games/xbubble/files/patch-src__init.c
diff --git a/games/xevil/files/patch-cmn::actual.cpp b/games/xevil/files/patch-cmn__actual.cpp
index 1b4fdd54e96c..1b4fdd54e96c 100644
--- a/games/xevil/files/patch-cmn::actual.cpp
+++ b/games/xevil/files/patch-cmn__actual.cpp
diff --git a/games/xevil/files/patch-cmn::area.cpp b/games/xevil/files/patch-cmn__area.cpp
index 1c268954c8a0..1c268954c8a0 100644
--- a/games/xevil/files/patch-cmn::area.cpp
+++ b/games/xevil/files/patch-cmn__area.cpp
diff --git a/games/xevil/files/patch-cmn::game.cpp b/games/xevil/files/patch-cmn__game.cpp
index b7407b7d8370..b7407b7d8370 100644
--- a/games/xevil/files/patch-cmn::game.cpp
+++ b/games/xevil/files/patch-cmn__game.cpp
diff --git a/games/xevil/files/patch-cmn::game.h b/games/xevil/files/patch-cmn__game.h
index 9fb9045baaa4..9fb9045baaa4 100644
--- a/games/xevil/files/patch-cmn::game.h
+++ b/games/xevil/files/patch-cmn__game.h
diff --git a/games/xevil/files/patch-cmn::game_style.cpp b/games/xevil/files/patch-cmn__game_style.cpp
index c7179626de05..c7179626de05 100644
--- a/games/xevil/files/patch-cmn::game_style.cpp
+++ b/games/xevil/files/patch-cmn__game_style.cpp
diff --git a/games/xevil/files/patch-cmn::game_style.h b/games/xevil/files/patch-cmn__game_style.h
index 665984e9708d..665984e9708d 100644
--- a/games/xevil/files/patch-cmn::game_style.h
+++ b/games/xevil/files/patch-cmn__game_style.h
diff --git a/games/xevil/files/patch-cmn::intel.cpp b/games/xevil/files/patch-cmn__intel.cpp
index 8d364a7f736e..8d364a7f736e 100644
--- a/games/xevil/files/patch-cmn::intel.cpp
+++ b/games/xevil/files/patch-cmn__intel.cpp
diff --git a/games/xevil/files/patch-cmn::locator.h b/games/xevil/files/patch-cmn__locator.h
index 68d27544fc5f..68d27544fc5f 100644
--- a/games/xevil/files/patch-cmn::locator.h
+++ b/games/xevil/files/patch-cmn__locator.h
diff --git a/games/xevil/files/patch-cmn::physical.cpp b/games/xevil/files/patch-cmn__physical.cpp
index b9d29be92103..b9d29be92103 100644
--- a/games/xevil/files/patch-cmn::physical.cpp
+++ b/games/xevil/files/patch-cmn__physical.cpp
diff --git a/games/xevil/files/patch-cmn::physical.h b/games/xevil/files/patch-cmn__physical.h
index 5f668d4dbe36..5f668d4dbe36 100644
--- a/games/xevil/files/patch-cmn::physical.h
+++ b/games/xevil/files/patch-cmn__physical.h
diff --git a/games/xevil/files/patch-cmn::role.cpp b/games/xevil/files/patch-cmn__role.cpp
index 4d90e7b1329c..4d90e7b1329c 100644
--- a/games/xevil/files/patch-cmn::role.cpp
+++ b/games/xevil/files/patch-cmn__role.cpp
diff --git a/games/xevil/files/patch-cmn::streams.cpp b/games/xevil/files/patch-cmn__streams.cpp
index 09bd066253bc..09bd066253bc 100644
--- a/games/xevil/files/patch-cmn::streams.cpp
+++ b/games/xevil/files/patch-cmn__streams.cpp
diff --git a/games/xevil/files/patch-cmn::utils.cpp b/games/xevil/files/patch-cmn__utils.cpp
index 5cfdfd2a410b..5cfdfd2a410b 100644
--- a/games/xevil/files/patch-cmn::utils.cpp
+++ b/games/xevil/files/patch-cmn__utils.cpp
diff --git a/games/xevil/files/patch-cmn::world.cpp b/games/xevil/files/patch-cmn__world.cpp
index eb2b22c4f7a2..eb2b22c4f7a2 100644
--- a/games/xevil/files/patch-cmn::world.cpp
+++ b/games/xevil/files/patch-cmn__world.cpp
diff --git a/games/xevil/files/patch-cmn::xetp.cpp b/games/xevil/files/patch-cmn__xetp.cpp
index ab2a4f22859d..ab2a4f22859d 100644
--- a/games/xevil/files/patch-cmn::xetp.cpp
+++ b/games/xevil/files/patch-cmn__xetp.cpp
diff --git a/games/xevil/files/patch-x11::l_agreement_dlg.cpp b/games/xevil/files/patch-x11__l_agreement_dlg.cpp
index be702d9a002b..be702d9a002b 100644
--- a/games/xevil/files/patch-x11::l_agreement_dlg.cpp
+++ b/games/xevil/files/patch-x11__l_agreement_dlg.cpp
diff --git a/games/xevil/files/patch-x11::main.cpp b/games/xevil/files/patch-x11__main.cpp
index d80655e1b7c1..d80655e1b7c1 100644
--- a/games/xevil/files/patch-x11::main.cpp
+++ b/games/xevil/files/patch-x11__main.cpp
diff --git a/games/xevil/files/patch-x11::panel.cpp b/games/xevil/files/patch-x11__panel.cpp
index f75f23f74adb..f75f23f74adb 100644
--- a/games/xevil/files/patch-x11::panel.cpp
+++ b/games/xevil/files/patch-x11__panel.cpp
diff --git a/games/xevil/files/patch-x11::serverping.cpp b/games/xevil/files/patch-x11__serverping.cpp
index debc89bafc73..debc89bafc73 100644
--- a/games/xevil/files/patch-x11::serverping.cpp
+++ b/games/xevil/files/patch-x11__serverping.cpp
diff --git a/games/xevil/files/patch-x11::ui.cpp b/games/xevil/files/patch-x11__ui.cpp
index ab83dec24000..ab83dec24000 100644
--- a/games/xevil/files/patch-x11::ui.cpp
+++ b/games/xevil/files/patch-x11__ui.cpp
diff --git a/games/xevil/files/patch-x11::viewport.cpp b/games/xevil/files/patch-x11__viewport.cpp
index 774b267e3e00..774b267e3e00 100644
--- a/games/xevil/files/patch-x11::viewport.cpp
+++ b/games/xevil/files/patch-x11__viewport.cpp
diff --git a/games/xevil/files/patch-x11::xdata.cpp b/games/xevil/files/patch-x11__xdata.cpp
index fd1052042688..fd1052042688 100644
--- a/games/xevil/files/patch-x11::xdata.cpp
+++ b/games/xevil/files/patch-x11__xdata.cpp
diff --git a/games/xqf/files/patch-src::country-filter.h b/games/xqf/files/patch-src__country-filter.h
index e222f14994b6..e222f14994b6 100644
--- a/games/xqf/files/patch-src::country-filter.h
+++ b/games/xqf/files/patch-src__country-filter.h
diff --git a/games/xqf/files/patch-src::trayicon.c b/games/xqf/files/patch-src__trayicon.c
index 2914e135011a..2914e135011a 100644
--- a/games/xqf/files/patch-src::trayicon.c
+++ b/games/xqf/files/patch-src__trayicon.c
diff --git a/games/znibbles/files/patch-src::Base.H b/games/znibbles/files/patch-src__Base.H
index 0ca0d53c5be2..0ca0d53c5be2 100644
--- a/games/znibbles/files/patch-src::Base.H
+++ b/games/znibbles/files/patch-src__Base.H
diff --git a/games/znibbles/files/patch-src::DLList.cc b/games/znibbles/files/patch-src__DLList.cc
index 2a77a97430ce..2a77a97430ce 100644
--- a/games/znibbles/files/patch-src::DLList.cc
+++ b/games/znibbles/files/patch-src__DLList.cc
diff --git a/games/znibbles/files/patch-src::GTK::ClientGtk.C b/games/znibbles/files/patch-src__GTK__ClientGtk.C
index b9633a81ecfd..b9633a81ecfd 100644
--- a/games/znibbles/files/patch-src::GTK::ClientGtk.C
+++ b/games/znibbles/files/patch-src__GTK__ClientGtk.C
diff --git a/games/znibbles/files/patch-src::GTK::GtkInterface.C b/games/znibbles/files/patch-src__GTK__GtkInterface.C
index 85f00cc4d961..85f00cc4d961 100644
--- a/games/znibbles/files/patch-src::GTK::GtkInterface.C
+++ b/games/znibbles/files/patch-src__GTK__GtkInterface.C
diff --git a/games/znibbles/files/patch-src::GTK::Menus.C b/games/znibbles/files/patch-src__GTK__Menus.C
index 3ea74f6315f0..3ea74f6315f0 100644
--- a/games/znibbles/files/patch-src::GTK::Menus.C
+++ b/games/znibbles/files/patch-src__GTK__Menus.C
diff --git a/games/znibbles/files/patch-src::GTK::NibblesArea.C b/games/znibbles/files/patch-src__GTK__NibblesArea.C
index d85f655a2dd7..d85f655a2dd7 100644
--- a/games/znibbles/files/patch-src::GTK::NibblesArea.C
+++ b/games/znibbles/files/patch-src__GTK__NibblesArea.C
diff --git a/games/znibbles/files/patch-src::LongObject.C b/games/znibbles/files/patch-src__LongObject.C
index b0b6b4cae0f6..b0b6b4cae0f6 100644
--- a/games/znibbles/files/patch-src::LongObject.C
+++ b/games/znibbles/files/patch-src__LongObject.C
diff --git a/games/znibbles/files/patch-src::Map.C b/games/znibbles/files/patch-src__Map.C
index 365e115f01b7..365e115f01b7 100644
--- a/games/znibbles/files/patch-src::Map.C
+++ b/games/znibbles/files/patch-src__Map.C
diff --git a/games/znibbles/files/patch-src::Map.H b/games/znibbles/files/patch-src__Map.H
index 27a21d684eea..27a21d684eea 100644
--- a/games/znibbles/files/patch-src::Map.H
+++ b/games/znibbles/files/patch-src__Map.H
diff --git a/games/znibbles/files/patch-src::Movable.C b/games/znibbles/files/patch-src__Movable.C
index 7c59d6bfe455..7c59d6bfe455 100644
--- a/games/znibbles/files/patch-src::Movable.C
+++ b/games/znibbles/files/patch-src__Movable.C
diff --git a/games/znibbles/files/patch-src::Niblle.C b/games/znibbles/files/patch-src__Niblle.C
index 36b809e701cf..36b809e701cf 100644
--- a/games/znibbles/files/patch-src::Niblle.C
+++ b/games/znibbles/files/patch-src__Niblle.C
diff --git a/games/znibbles/files/patch-src::Object.C b/games/znibbles/files/patch-src__Object.C
index c863a689a716..c863a689a716 100644
--- a/games/znibbles/files/patch-src::Object.C
+++ b/games/znibbles/files/patch-src__Object.C
diff --git a/games/znibbles/files/patch-src::Options.C b/games/znibbles/files/patch-src__Options.C
index 9eee99273470..9eee99273470 100644
--- a/games/znibbles/files/patch-src::Options.C
+++ b/games/znibbles/files/patch-src__Options.C
diff --git a/games/znibbles/files/patch-src::Player.C b/games/znibbles/files/patch-src__Player.C
index 2aad9f39d606..2aad9f39d606 100644
--- a/games/znibbles/files/patch-src::Player.C
+++ b/games/znibbles/files/patch-src__Player.C
diff --git a/games/znibbles/files/patch-src::ServerInterface.C b/games/znibbles/files/patch-src__ServerInterface.C
index 6c53f53106de..6c53f53106de 100644
--- a/games/znibbles/files/patch-src::ServerInterface.C
+++ b/games/znibbles/files/patch-src__ServerInterface.C
diff --git a/games/znibbles/files/patch-src::Trame.C b/games/znibbles/files/patch-src__Trame.C
index 93f29d9ed6dc..93f29d9ed6dc 100644
--- a/games/znibbles/files/patch-src::Trame.C
+++ b/games/znibbles/files/patch-src__Trame.C
diff --git a/games/znibbles/files/patch-src::Trame.H b/games/znibbles/files/patch-src__Trame.H
index 6fe33b3c1f72..6fe33b3c1f72 100644
--- a/games/znibbles/files/patch-src::Trame.H
+++ b/games/znibbles/files/patch-src__Trame.H
diff --git a/games/znibbles/files/patch-src::World.C b/games/znibbles/files/patch-src__World.C
index e44be3b2f023..e44be3b2f023 100644
--- a/games/znibbles/files/patch-src::World.C
+++ b/games/znibbles/files/patch-src__World.C
diff --git a/games/znibbles/files/patch-src::X11::X11Interface.C b/games/znibbles/files/patch-src__X11__X11Interface.C
index db509a10727e..db509a10727e 100644
--- a/games/znibbles/files/patch-src::X11::X11Interface.C
+++ b/games/znibbles/files/patch-src__X11__X11Interface.C
diff --git a/games/znibbles/files/patch-src::X11::textarea.C b/games/znibbles/files/patch-src__X11__textarea.C
index 9a569c1462ee..9a569c1462ee 100644
--- a/games/znibbles/files/patch-src::X11::textarea.C
+++ b/games/znibbles/files/patch-src__X11__textarea.C
diff --git a/graphics/bbrb/files/patch-src::bbrblist.h b/graphics/bbrb/files/patch-src__bbrblist.h
index 4464559297d8..4464559297d8 100644
--- a/graphics/bbrb/files/patch-src::bbrblist.h
+++ b/graphics/bbrb/files/patch-src__bbrblist.h
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples__Makefile
index 6695684f45b9..6695684f45b9 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples__Makefile
diff --git a/graphics/dia/files/patch-objects::GRAFCET::boolequation.c b/graphics/dia/files/patch-objects__GRAFCET__boolequation.c
index 7db01d1e20da..7db01d1e20da 100644
--- a/graphics/dia/files/patch-objects::GRAFCET::boolequation.c
+++ b/graphics/dia/files/patch-objects__GRAFCET__boolequation.c
diff --git a/graphics/dynamechs/files/patch-aquarobot::Gait.hpp b/graphics/dynamechs/files/patch-aquarobot__Gait.hpp
index 184c2444adc5..184c2444adc5 100644
--- a/graphics/dynamechs/files/patch-aquarobot::Gait.hpp
+++ b/graphics/dynamechs/files/patch-aquarobot__Gait.hpp
diff --git a/graphics/dynamechs/files/patch-dmGL::dmGL.h b/graphics/dynamechs/files/patch-dmGL__dmGL.h
index 6ca4456b07b8..6ca4456b07b8 100644
--- a/graphics/dynamechs/files/patch-dmGL::dmGL.h
+++ b/graphics/dynamechs/files/patch-dmGL__dmGL.h
diff --git a/graphics/dynamechs/files/patch-dm::dm.h b/graphics/dynamechs/files/patch-dm__dm.h
index f597410da31a..f597410da31a 100644
--- a/graphics/dynamechs/files/patch-dm::dm.h
+++ b/graphics/dynamechs/files/patch-dm__dm.h
diff --git a/graphics/gts/files/patch-src::rounding.h b/graphics/gts/files/patch-src__rounding.h
index 666d1c1354a5..666d1c1354a5 100644
--- a/graphics/gts/files/patch-src::rounding.h
+++ b/graphics/gts/files/patch-src__rounding.h
diff --git a/graphics/ida/files/patch-mk::Autoconf.mk b/graphics/ida/files/patch-mk__Autoconf.mk
index efd0aea64779..efd0aea64779 100644
--- a/graphics/ida/files/patch-mk::Autoconf.mk
+++ b/graphics/ida/files/patch-mk__Autoconf.mk
diff --git a/graphics/ida/files/patch-mk::Variables.mk b/graphics/ida/files/patch-mk__Variables.mk
index c956a80a2011..c956a80a2011 100644
--- a/graphics/ida/files/patch-mk::Variables.mk
+++ b/graphics/ida/files/patch-mk__Variables.mk
diff --git a/graphics/ivtools/files/patch-src::comtest::Imakefile b/graphics/ivtools/files/patch-src__comtest__Imakefile
index 494e8a627b5b..494e8a627b5b 100644
--- a/graphics/ivtools/files/patch-src::comtest::Imakefile
+++ b/graphics/ivtools/files/patch-src__comtest__Imakefile
diff --git a/graphics/ivtools/files/patch-src::dclock::Imakefile b/graphics/ivtools/files/patch-src__dclock__Imakefile
index b64a5e5ff46a..b64a5e5ff46a 100644
--- a/graphics/ivtools/files/patch-src::dclock::Imakefile
+++ b/graphics/ivtools/files/patch-src__dclock__Imakefile
diff --git a/graphics/ivtools/files/patch-src::glyphs::gclock::Imakefile b/graphics/ivtools/files/patch-src__glyphs__gclock__Imakefile
index 4f9475cfdb43..4f9475cfdb43 100644
--- a/graphics/ivtools/files/patch-src::glyphs::gclock::Imakefile
+++ b/graphics/ivtools/files/patch-src__glyphs__gclock__Imakefile
diff --git a/graphics/ivtools/files/patch-src::glyphterp::Imakefile b/graphics/ivtools/files/patch-src__glyphterp__Imakefile
index 113b634e43ef..113b634e43ef 100644
--- a/graphics/ivtools/files/patch-src::glyphterp::Imakefile
+++ b/graphics/ivtools/files/patch-src__glyphterp__Imakefile
diff --git a/graphics/ivtools/files/patch-src::idemo::Imakefile b/graphics/ivtools/files/patch-src__idemo__Imakefile
index 8e0221e6fe39..8e0221e6fe39 100644
--- a/graphics/ivtools/files/patch-src::idemo::Imakefile
+++ b/graphics/ivtools/files/patch-src__idemo__Imakefile
diff --git a/graphics/ivtools/files/patch-src::man::Imakefile b/graphics/ivtools/files/patch-src__man__Imakefile
index 0ee6fff9862e..0ee6fff9862e 100644
--- a/graphics/ivtools/files/patch-src::man::Imakefile
+++ b/graphics/ivtools/files/patch-src__man__Imakefile
diff --git a/graphics/ivtools/files/patch-src::man::man1::Imakefile b/graphics/ivtools/files/patch-src__man__man1__Imakefile
index 8fc82fa7ab27..8fc82fa7ab27 100644
--- a/graphics/ivtools/files/patch-src::man::man1::Imakefile
+++ b/graphics/ivtools/files/patch-src__man__man1__Imakefile
diff --git a/graphics/ivtools/files/patch-src::scripts::Imakefile b/graphics/ivtools/files/patch-src__scripts__Imakefile
index 9c52e333edf9..9c52e333edf9 100644
--- a/graphics/ivtools/files/patch-src::scripts::Imakefile
+++ b/graphics/ivtools/files/patch-src__scripts__Imakefile
diff --git a/graphics/svgalib/files/patch-gl::driver.c b/graphics/svgalib/files/patch-gl__driver.c
index eefc4a15c406..eefc4a15c406 100644
--- a/graphics/svgalib/files/patch-gl::driver.c
+++ b/graphics/svgalib/files/patch-gl__driver.c
diff --git a/graphics/svgalib/files/patch-gl::line.c b/graphics/svgalib/files/patch-gl__line.c
index 5c4e28d87c75..5c4e28d87c75 100644
--- a/graphics/svgalib/files/patch-gl::line.c
+++ b/graphics/svgalib/files/patch-gl__line.c
diff --git a/graphics/svgalib/files/patch-src::nv3.c b/graphics/svgalib/files/patch-src__nv3.c
index 1b10bea7b37c..1b10bea7b37c 100644
--- a/graphics/svgalib/files/patch-src::nv3.c
+++ b/graphics/svgalib/files/patch-src__nv3.c
diff --git a/graphics/svgalib/files/patch-src::s3.c b/graphics/svgalib/files/patch-src__s3.c
index 7ee38e646313..7ee38e646313 100644
--- a/graphics/svgalib/files/patch-src::s3.c
+++ b/graphics/svgalib/files/patch-src__s3.c
diff --git a/graphics/svgalib/files/patch-src::vgapix.c b/graphics/svgalib/files/patch-src__vgapix.c
index cccdddb749d5..cccdddb749d5 100644
--- a/graphics/svgalib/files/patch-src::vgapix.c
+++ b/graphics/svgalib/files/patch-src__vgapix.c
diff --git a/graphics/urt/files/patch-cnv::gif2rle.c b/graphics/urt/files/patch-cnv__gif2rle.c
index da3bf2435cb4..da3bf2435cb4 100644
--- a/graphics/urt/files/patch-cnv::gif2rle.c
+++ b/graphics/urt/files/patch-cnv__gif2rle.c
diff --git a/graphics/urt/files/patch-cnv::rletops.c b/graphics/urt/files/patch-cnv__rletops.c
index 33c06ea787d9..33c06ea787d9 100644
--- a/graphics/urt/files/patch-cnv::rletops.c
+++ b/graphics/urt/files/patch-cnv__rletops.c
diff --git a/graphics/urt/files/patch-cnv::rletorla.c b/graphics/urt/files/patch-cnv__rletorla.c
index d242530e2af2..d242530e2af2 100644
--- a/graphics/urt/files/patch-cnv::rletorla.c
+++ b/graphics/urt/files/patch-cnv__rletorla.c
diff --git a/graphics/urt/files/patch-cnv::rletovcr.c b/graphics/urt/files/patch-cnv__rletovcr.c
index d68f14745fab..d68f14745fab 100644
--- a/graphics/urt/files/patch-cnv::rletovcr.c
+++ b/graphics/urt/files/patch-cnv__rletovcr.c
diff --git a/graphics/urt/files/patch-cnv::tex::makefile.src b/graphics/urt/files/patch-cnv__tex__makefile.src
index 55d042e4e1aa..55d042e4e1aa 100644
--- a/graphics/urt/files/patch-cnv::tex::makefile.src
+++ b/graphics/urt/files/patch-cnv__tex__makefile.src
diff --git a/graphics/urt/files/patch-cnv::vcrtorele.c b/graphics/urt/files/patch-cnv__vcrtorele.c
index d55a851f18db..d55a851f18db 100644
--- a/graphics/urt/files/patch-cnv::vcrtorele.c
+++ b/graphics/urt/files/patch-cnv__vcrtorele.c
diff --git a/graphics/urt/files/patch-config::hp700-hpux10 b/graphics/urt/files/patch-config__hp700-hpux10
index fcb9ea3c4652..fcb9ea3c4652 100644
--- a/graphics/urt/files/patch-config::hp700-hpux10
+++ b/graphics/urt/files/patch-config__hp700-hpux10
diff --git a/graphics/urt/files/patch-config::sol2-5 b/graphics/urt/files/patch-config__sol2-5
index 2185ed705213..2185ed705213 100644
--- a/graphics/urt/files/patch-config::sol2-5
+++ b/graphics/urt/files/patch-config__sol2-5
diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config__urt
index 9b0cbd2b23c9..9b0cbd2b23c9 100644
--- a/graphics/urt/files/patch-config::urt
+++ b/graphics/urt/files/patch-config__urt
diff --git a/graphics/urt/files/patch-get::getfb.c b/graphics/urt/files/patch-get__getfb.c
index 7d587a099cc5..7d587a099cc5 100644
--- a/graphics/urt/files/patch-get::getfb.c
+++ b/graphics/urt/files/patch-get__getfb.c
diff --git a/graphics/urt/files/patch-get::getx11::XGetHClrs.c b/graphics/urt/files/patch-get__getx11__XGetHClrs.c
index 5e8939a991cb..5e8939a991cb 100644
--- a/graphics/urt/files/patch-get::getx11::XGetHClrs.c
+++ b/graphics/urt/files/patch-get__getx11__XGetHClrs.c
diff --git a/graphics/urt/files/patch-get::getx11::in_cmap.c b/graphics/urt/files/patch-get__getx11__in_cmap.c
index 1b90cbbe4dba..1b90cbbe4dba 100644
--- a/graphics/urt/files/patch-get::getx11::in_cmap.c
+++ b/graphics/urt/files/patch-get__getx11__in_cmap.c
diff --git a/graphics/urt/files/patch-get::makefile.src b/graphics/urt/files/patch-get__makefile.src
index 3063e270d89c..3063e270d89c 100644
--- a/graphics/urt/files/patch-get::makefile.src
+++ b/graphics/urt/files/patch-get__makefile.src
diff --git a/graphics/urt/files/patch-include::makefile.src b/graphics/urt/files/patch-include__makefile.src
index 8783e2101751..8783e2101751 100644
--- a/graphics/urt/files/patch-include::makefile.src
+++ b/graphics/urt/files/patch-include__makefile.src
diff --git a/graphics/urt/files/patch-include::rle_config.tlr b/graphics/urt/files/patch-include__rle_config.tlr
index e35827a7885a..e35827a7885a 100644
--- a/graphics/urt/files/patch-include::rle_config.tlr
+++ b/graphics/urt/files/patch-include__rle_config.tlr
diff --git a/graphics/urt/files/patch-lib::buildmap.c b/graphics/urt/files/patch-lib__buildmap.c
index 082cd10a74e5..082cd10a74e5 100644
--- a/graphics/urt/files/patch-lib::buildmap.c
+++ b/graphics/urt/files/patch-lib__buildmap.c
diff --git a/graphics/urt/files/patch-lib::inv_cmap.c b/graphics/urt/files/patch-lib__inv_cmap.c
index 4438798f0d97..4438798f0d97 100644
--- a/graphics/urt/files/patch-lib::inv_cmap.c
+++ b/graphics/urt/files/patch-lib__inv_cmap.c
diff --git a/graphics/urt/files/patch-lib::makefile.src b/graphics/urt/files/patch-lib__makefile.src
index 8d5f8a6cb2b5..8d5f8a6cb2b5 100644
--- a/graphics/urt/files/patch-lib::makefile.src
+++ b/graphics/urt/files/patch-lib__makefile.src
diff --git a/graphics/urt/files/patch-lib::rle_global.c b/graphics/urt/files/patch-lib__rle_global.c
index 175e746418eb..175e746418eb 100644
--- a/graphics/urt/files/patch-lib::rle_global.c
+++ b/graphics/urt/files/patch-lib__rle_global.c
diff --git a/graphics/urt/files/patch-lib::scanargs.c b/graphics/urt/files/patch-lib__scanargs.c
index 86a3d3c6a4c2..86a3d3c6a4c2 100644
--- a/graphics/urt/files/patch-lib::scanargs.c
+++ b/graphics/urt/files/patch-lib__scanargs.c
diff --git a/graphics/urt/files/patch-man::makefile.src b/graphics/urt/files/patch-man__makefile.src
index 9ecc903da868..9ecc903da868 100644
--- a/graphics/urt/files/patch-man::makefile.src
+++ b/graphics/urt/files/patch-man__makefile.src
diff --git a/graphics/urt/files/patch-tools::avg4.c b/graphics/urt/files/patch-tools__avg4.c
index aabf0b37e01c..aabf0b37e01c 100644
--- a/graphics/urt/files/patch-tools::avg4.c
+++ b/graphics/urt/files/patch-tools__avg4.c
diff --git a/graphics/urt/files/patch-tools::into.c b/graphics/urt/files/patch-tools__into.c
index 8440ec8aa256..8440ec8aa256 100644
--- a/graphics/urt/files/patch-tools::into.c
+++ b/graphics/urt/files/patch-tools__into.c
diff --git a/graphics/urt/files/patch-tools::makefile.src b/graphics/urt/files/patch-tools__makefile.src
index 5e1c1c8eaeb5..5e1c1c8eaeb5 100644
--- a/graphics/urt/files/patch-tools::makefile.src
+++ b/graphics/urt/files/patch-tools__makefile.src
diff --git a/graphics/urt/files/patch-tools::mcut.c b/graphics/urt/files/patch-tools__mcut.c
index b7268b3145d4..b7268b3145d4 100644
--- a/graphics/urt/files/patch-tools::mcut.c
+++ b/graphics/urt/files/patch-tools__mcut.c
diff --git a/graphics/urt/files/patch-tools::mergechan.c b/graphics/urt/files/patch-tools__mergechan.c
index bf2a7239bbfc..bf2a7239bbfc 100644
--- a/graphics/urt/files/patch-tools::mergechan.c
+++ b/graphics/urt/files/patch-tools__mergechan.c
diff --git a/graphics/urt/files/patch-tools::rlegrid.c b/graphics/urt/files/patch-tools__rlegrid.c
index 4ea848aebb0e..4ea848aebb0e 100644
--- a/graphics/urt/files/patch-tools::rlegrid.c
+++ b/graphics/urt/files/patch-tools__rlegrid.c
diff --git a/graphics/urt/files/patch-tools::rlehdr.c b/graphics/urt/files/patch-tools__rlehdr.c
index 112055bcd8f5..112055bcd8f5 100644
--- a/graphics/urt/files/patch-tools::rlehdr.c
+++ b/graphics/urt/files/patch-tools__rlehdr.c
diff --git a/graphics/urt/files/patch-tools::rleinterp.c b/graphics/urt/files/patch-tools__rleinterp.c
index 043153dc74fb..043153dc74fb 100644
--- a/graphics/urt/files/patch-tools::rleinterp.c
+++ b/graphics/urt/files/patch-tools__rleinterp.c
diff --git a/graphics/urt/files/patch-tools::rlepatch.c b/graphics/urt/files/patch-tools__rlepatch.c
index 8c4f71540109..8c4f71540109 100644
--- a/graphics/urt/files/patch-tools::rlepatch.c
+++ b/graphics/urt/files/patch-tools__rlepatch.c
diff --git a/graphics/white_dune/files/patch-src::Array.h b/graphics/white_dune/files/patch-src__Array.h
index c9c7b76f007a..c9c7b76f007a 100644
--- a/graphics/white_dune/files/patch-src::Array.h
+++ b/graphics/white_dune/files/patch-src__Array.h
diff --git a/graphics/white_dune/files/patch-src::Makefile.in b/graphics/white_dune/files/patch-src__Makefile.in
index 0770250471f0..0770250471f0 100644
--- a/graphics/white_dune/files/patch-src::Makefile.in
+++ b/graphics/white_dune/files/patch-src__Makefile.in
diff --git a/graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c b/graphics/white_dune/files/patch-src__SDLjoystick__bsd__SDL_sysjoystick.c
index 85fd346ae684..85fd346ae684 100644
--- a/graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c
+++ b/graphics/white_dune/files/patch-src__SDLjoystick__bsd__SDL_sysjoystick.c
diff --git a/graphics/white_dune/files/patch-src::swt::rc::Makefile.in b/graphics/white_dune/files/patch-src__swt__rc__Makefile.in
index 84847cabc7dd..84847cabc7dd 100644
--- a/graphics/white_dune/files/patch-src::swt::rc::Makefile.in
+++ b/graphics/white_dune/files/patch-src__swt__rc__Makefile.in
diff --git a/graphics/white_dune/files/patch-src::swt::tests::Makefile.in b/graphics/white_dune/files/patch-src__swt__tests__Makefile.in
index 989b3e61e789..989b3e61e789 100644
--- a/graphics/white_dune/files/patch-src::swt::tests::Makefile.in
+++ b/graphics/white_dune/files/patch-src__swt__tests__Makefile.in
diff --git a/graphics/wmicons/files/patch-Icons::Makefile.in b/graphics/wmicons/files/patch-Icons__Makefile.in
index 3661bd6472d7..3661bd6472d7 100644
--- a/graphics/wmicons/files/patch-Icons::Makefile.in
+++ b/graphics/wmicons/files/patch-Icons__Makefile.in
diff --git a/graphics/yafray/files/patch-src::loader::gram_loader.h b/graphics/yafray/files/patch-src__loader__gram_loader.h
index 2f43ae477901..2f43ae477901 100644
--- a/graphics/yafray/files/patch-src::loader::gram_loader.h
+++ b/graphics/yafray/files/patch-src__loader__gram_loader.h
diff --git a/hebrew/he2/files/patch-he2::hebSegment.cxx b/hebrew/he2/files/patch-he2__hebSegment.cxx
index 0efc6bd8ebe6..0efc6bd8ebe6 100644
--- a/hebrew/he2/files/patch-he2::hebSegment.cxx
+++ b/hebrew/he2/files/patch-he2__hebSegment.cxx
diff --git a/hebrew/he2/files/patch-he2::hebString.cxx b/hebrew/he2/files/patch-he2__hebString.cxx
index 2353599dc048..2353599dc048 100644
--- a/hebrew/he2/files/patch-he2::hebString.cxx
+++ b/hebrew/he2/files/patch-he2__hebString.cxx
diff --git a/irc/dancer/files/patch-src::list.h b/irc/dancer/files/patch-src__list.h
index 59e8dd3fb7af..59e8dd3fb7af 100644
--- a/irc/dancer/files/patch-src::list.h
+++ b/irc/dancer/files/patch-src__list.h
diff --git a/irc/ninja/files/patch-source::ircaux.c b/irc/ninja/files/patch-source__ircaux.c
index 6cda7ec0b761..6cda7ec0b761 100644
--- a/irc/ninja/files/patch-source::ircaux.c
+++ b/irc/ninja/files/patch-source__ircaux.c
diff --git a/japanese/ebview/files/patch-src::ebview-client.c b/japanese/ebview/files/patch-src__ebview-client.c
index 1e7efe467716..1e7efe467716 100644
--- a/japanese/ebview/files/patch-src::ebview-client.c
+++ b/japanese/ebview/files/patch-src__ebview-client.c
diff --git a/japanese/ebview/files/patch-src::ebview.c b/japanese/ebview/files/patch-src__ebview.c
index 7cd42ceafd68..7cd42ceafd68 100644
--- a/japanese/ebview/files/patch-src::ebview.c
+++ b/japanese/ebview/files/patch-src__ebview.c
diff --git a/japanese/jvim3/files/patch-src::unix.c b/japanese/jvim3/files/patch-src__unix.c
index 5a7f0e9efaa5..5a7f0e9efaa5 100644
--- a/japanese/jvim3/files/patch-src::unix.c
+++ b/japanese/jvim3/files/patch-src__unix.c
diff --git a/japanese/plain2/files/patch-src::macro.c b/japanese/plain2/files/patch-src__macro.c
index aa8e9b3e65c2..aa8e9b3e65c2 100644
--- a/japanese/plain2/files/patch-src::macro.c
+++ b/japanese/plain2/files/patch-src__macro.c
diff --git a/japanese/tomoe/files/patch-module::dict::Makefile.in b/japanese/tomoe/files/patch-module__dict__Makefile.in
index 8a8b8eb326eb..8a8b8eb326eb 100644
--- a/japanese/tomoe/files/patch-module::dict::Makefile.in
+++ b/japanese/tomoe/files/patch-module__dict__Makefile.in
diff --git a/lang/Sather/files/patch-Emacs::sather-mode.texinfo b/lang/Sather/files/patch-Emacs__sather-mode.texinfo
index 4e90bc1793dd..4e90bc1793dd 100644
--- a/lang/Sather/files/patch-Emacs::sather-mode.texinfo
+++ b/lang/Sather/files/patch-Emacs__sather-mode.texinfo
diff --git a/lang/Sather/files/patch-Emacs::sather-tutorial.texinfo b/lang/Sather/files/patch-Emacs__sather-tutorial.texinfo
index fdb309dfa5d3..fdb309dfa5d3 100644
--- a/lang/Sather/files/patch-Emacs::sather-tutorial.texinfo
+++ b/lang/Sather/files/patch-Emacs__sather-tutorial.texinfo
diff --git a/lang/Sather/files/patch-Emacs::sather.texinfo b/lang/Sather/files/patch-Emacs__sather.texinfo
index 9cf230d89eb3..9cf230d89eb3 100644
--- a/lang/Sather/files/patch-Emacs::sather.texinfo
+++ b/lang/Sather/files/patch-Emacs__sather.texinfo
diff --git a/lang/cocor/files/patch-cplus2::unix.mk b/lang/cocor/files/patch-cplus2__unix.mk
index ff44a81d1ab5..ff44a81d1ab5 100644
--- a/lang/cocor/files/patch-cplus2::unix.mk
+++ b/lang/cocor/files/patch-cplus2__unix.mk
diff --git a/lang/cocor/files/patch-taste_cp::unix.mk b/lang/cocor/files/patch-taste_cp__unix.mk
index 436111d962ef..436111d962ef 100644
--- a/lang/cocor/files/patch-taste_cp::unix.mk
+++ b/lang/cocor/files/patch-taste_cp__unix.mk
diff --git a/lang/ezm3/files/patch-libs::m3core::src::unix::freebsd-4.alpha::Unix.i3 b/lang/ezm3/files/patch-libs__m3core__src__unix__freebsd-4.alpha__Unix.i3
index 6b34063f83e6..6b34063f83e6 100644
--- a/lang/ezm3/files/patch-libs::m3core::src::unix::freebsd-4.alpha::Unix.i3
+++ b/lang/ezm3/files/patch-libs__m3core__src__unix__freebsd-4.alpha__Unix.i3
diff --git a/lang/ezm3/files/patch-libs::m3core::src::unix::freebsd-4.sparc64::Unix.i3 b/lang/ezm3/files/patch-libs__m3core__src__unix__freebsd-4.sparc64__Unix.i3
index 4d6c503a2eb5..4d6c503a2eb5 100644
--- a/lang/ezm3/files/patch-libs::m3core::src::unix::freebsd-4.sparc64::Unix.i3
+++ b/lang/ezm3/files/patch-libs__m3core__src__unix__freebsd-4.sparc64__Unix.i3
diff --git a/lang/icc/files/patch-bin::icc b/lang/icc/files/patch-bin__icc
index c839ac96d8b3..c839ac96d8b3 100644
--- a/lang/icc/files/patch-bin::icc
+++ b/lang/icc/files/patch-bin__icc
diff --git a/lang/icc/files/patch-bin::icpc b/lang/icc/files/patch-bin__icpc
index 7ea91465461a..7ea91465461a 100644
--- a/lang/icc/files/patch-bin::icpc
+++ b/lang/icc/files/patch-bin__icpc
diff --git a/lang/icc/files/patch-include::dvec.h b/lang/icc/files/patch-include__dvec.h
index a8f4ff75ca64..a8f4ff75ca64 100644
--- a/lang/icc/files/patch-include::dvec.h
+++ b/lang/icc/files/patch-include__dvec.h
diff --git a/lang/icc/files/patch-include::fvec.h b/lang/icc/files/patch-include__fvec.h
index 0ec03efd745f..0ec03efd745f 100644
--- a/lang/icc/files/patch-include::fvec.h
+++ b/lang/icc/files/patch-include__fvec.h
diff --git a/lang/icc/files/patch-include::ivec.h b/lang/icc/files/patch-include__ivec.h
index f250e87f4c94..f250e87f4c94 100644
--- a/lang/icc/files/patch-include::ivec.h
+++ b/lang/icc/files/patch-include__ivec.h
diff --git a/lang/icc/files/patch-include::mathimf.h b/lang/icc/files/patch-include__mathimf.h
index 8de149da80b2..8de149da80b2 100644
--- a/lang/icc/files/patch-include::mathimf.h
+++ b/lang/icc/files/patch-include__mathimf.h
diff --git a/lang/icc/files/patch-include::xmmintrin.h b/lang/icc/files/patch-include__xmmintrin.h
index 7169899b6abf..7169899b6abf 100644
--- a/lang/icc/files/patch-include::xmmintrin.h
+++ b/lang/icc/files/patch-include__xmmintrin.h
diff --git a/lang/ifc/files/patch-bin::ifort b/lang/ifc/files/patch-bin__ifort
index d421591ae4a3..d421591ae4a3 100644
--- a/lang/ifc/files/patch-bin::ifort
+++ b/lang/ifc/files/patch-bin__ifort
diff --git a/lang/moscow_ml/files/patch-..::examples::calc::Makefile b/lang/moscow_ml/files/patch-..__examples__calc__Makefile
index 1743a873889f..1743a873889f 100644
--- a/lang/moscow_ml/files/patch-..::examples::calc::Makefile
+++ b/lang/moscow_ml/files/patch-..__examples__calc__Makefile
diff --git a/lang/moscow_ml/files/patch-config::Makefile b/lang/moscow_ml/files/patch-config__Makefile
index 7883a321c191..7883a321c191 100644
--- a/lang/moscow_ml/files/patch-config::Makefile
+++ b/lang/moscow_ml/files/patch-config__Makefile
diff --git a/lang/moscow_ml/files/patch-config::auto_aux::endian.c b/lang/moscow_ml/files/patch-config__auto_aux__endian.c
index 6242749ff309..6242749ff309 100644
--- a/lang/moscow_ml/files/patch-config::auto_aux::endian.c
+++ b/lang/moscow_ml/files/patch-config__auto_aux__endian.c
diff --git a/lang/moscow_ml/files/patch-config::auto_aux::hasgot b/lang/moscow_ml/files/patch-config__auto_aux__hasgot
index 496e137b5f6e..496e137b5f6e 100644
--- a/lang/moscow_ml/files/patch-config::auto_aux::hasgot
+++ b/lang/moscow_ml/files/patch-config__auto_aux__hasgot
diff --git a/lang/moscow_ml/files/patch-doc::Makefile b/lang/moscow_ml/files/patch-doc__Makefile
index 0a5efbec50c9..0a5efbec50c9 100644
--- a/lang/moscow_ml/files/patch-doc::Makefile
+++ b/lang/moscow_ml/files/patch-doc__Makefile
diff --git a/lang/moscow_ml/files/patch-doc::helpsigs::Makefile b/lang/moscow_ml/files/patch-doc__helpsigs__Makefile
index d69795e4ab14..d69795e4ab14 100644
--- a/lang/moscow_ml/files/patch-doc::helpsigs::Makefile
+++ b/lang/moscow_ml/files/patch-doc__helpsigs__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::Makefile b/lang/moscow_ml/files/patch-dynlibs__Makefile
index 34f68ae4b2a3..34f68ae4b2a3 100644
--- a/lang/moscow_ml/files/patch-dynlibs::Makefile
+++ b/lang/moscow_ml/files/patch-dynlibs__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::crypt::Makefile b/lang/moscow_ml/files/patch-dynlibs__crypt__Makefile
index 935ea600f9a7..935ea600f9a7 100644
--- a/lang/moscow_ml/files/patch-dynlibs::crypt::Makefile
+++ b/lang/moscow_ml/files/patch-dynlibs__crypt__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::interface::Makefile b/lang/moscow_ml/files/patch-dynlibs__interface__Makefile
index 925bfbff7c7b..925bfbff7c7b 100644
--- a/lang/moscow_ml/files/patch-dynlibs::interface::Makefile
+++ b/lang/moscow_ml/files/patch-dynlibs__interface__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::intinf::Makefile b/lang/moscow_ml/files/patch-dynlibs__intinf__Makefile
index 541ecaafcae7..541ecaafcae7 100644
--- a/lang/moscow_ml/files/patch-dynlibs::intinf::Makefile
+++ b/lang/moscow_ml/files/patch-dynlibs__intinf__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::mregex::Makefile b/lang/moscow_ml/files/patch-dynlibs__mregex__Makefile
index 7b362243b6bb..7b362243b6bb 100644
--- a/lang/moscow_ml/files/patch-dynlibs::mregex::Makefile
+++ b/lang/moscow_ml/files/patch-dynlibs__mregex__Makefile
diff --git a/lang/moscow_ml/files/patch-dynlibs::mregex::mregex.c b/lang/moscow_ml/files/patch-dynlibs__mregex__mregex.c
index aa1645c172cf..aa1645c172cf 100644
--- a/lang/moscow_ml/files/patch-dynlibs::mregex::mregex.c
+++ b/lang/moscow_ml/files/patch-dynlibs__mregex__mregex.c
diff --git a/lang/moscow_ml/files/patch-dynlibs::msocket::msocket.c b/lang/moscow_ml/files/patch-dynlibs__msocket__msocket.c
index e0f6e8d8482f..e0f6e8d8482f 100644
--- a/lang/moscow_ml/files/patch-dynlibs::msocket::msocket.c
+++ b/lang/moscow_ml/files/patch-dynlibs__msocket__msocket.c
diff --git a/lang/moscow_ml/files/patch-dynlibs::munix::munix.c b/lang/moscow_ml/files/patch-dynlibs__munix__munix.c
index f5dca2c3210e..f5dca2c3210e 100644
--- a/lang/moscow_ml/files/patch-dynlibs::munix::munix.c
+++ b/lang/moscow_ml/files/patch-dynlibs__munix__munix.c
diff --git a/lang/moscow_ml/files/patch-mosmlyac::Makefile b/lang/moscow_ml/files/patch-mosmlyac__Makefile
index 4d3ef386c11d..4d3ef386c11d 100644
--- a/lang/moscow_ml/files/patch-mosmlyac::Makefile
+++ b/lang/moscow_ml/files/patch-mosmlyac__Makefile
diff --git a/lang/moscow_ml/files/patch-runtime::Makefile b/lang/moscow_ml/files/patch-runtime__Makefile
index a52bf07ea01f..a52bf07ea01f 100644
--- a/lang/moscow_ml/files/patch-runtime::Makefile
+++ b/lang/moscow_ml/files/patch-runtime__Makefile
diff --git a/lang/moscow_ml/files/patch-runtime::config.h b/lang/moscow_ml/files/patch-runtime__config.h
index 375a849c33e9..375a849c33e9 100644
--- a/lang/moscow_ml/files/patch-runtime::config.h
+++ b/lang/moscow_ml/files/patch-runtime__config.h
diff --git a/lang/ohugs/files/patch-src::parser.y b/lang/ohugs/files/patch-src__parser.y
index 2a7d0ff9ced9..2a7d0ff9ced9 100644
--- a/lang/ohugs/files/patch-src::parser.y
+++ b/lang/ohugs/files/patch-src__parser.y
diff --git a/lang/ohugs/files/patch-src::prelude.h b/lang/ohugs/files/patch-src__prelude.h
index 0e04d8541e55..0e04d8541e55 100644
--- a/lang/ohugs/files/patch-src::prelude.h
+++ b/lang/ohugs/files/patch-src__prelude.h
diff --git a/lang/ohugs/files/patch-src::type.c b/lang/ohugs/files/patch-src__type.c
index eb1323acf007..eb1323acf007 100644
--- a/lang/ohugs/files/patch-src::type.c
+++ b/lang/ohugs/files/patch-src__type.c
diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend__zend.h
index 2b565146f7de..2b565146f7de 100644
--- a/lang/php5/files/patch-Zend::zend.h
+++ b/lang/php5/files/patch-Zend__zend.h
diff --git a/lang/php5/files/patch-main::php_config.h.in b/lang/php5/files/patch-main__php_config.h.in
index 3ce79e95c55a..3ce79e95c55a 100644
--- a/lang/php5/files/patch-main::php_config.h.in
+++ b/lang/php5/files/patch-main__php_config.h.in
diff --git a/lang/php53/files/patch-Zend::zend.h b/lang/php53/files/patch-Zend__zend.h
index 0fb2398f171d..0fb2398f171d 100644
--- a/lang/php53/files/patch-Zend::zend.h
+++ b/lang/php53/files/patch-Zend__zend.h
diff --git a/lang/php53/files/patch-main::php_config.h.in b/lang/php53/files/patch-main__php_config.h.in
index 8e9938876421..8e9938876421 100644
--- a/lang/php53/files/patch-main::php_config.h.in
+++ b/lang/php53/files/patch-main__php_config.h.in
diff --git a/lang/php55/files/patch-Zend::zend.h b/lang/php55/files/patch-Zend__zend.h
index 7dca382ebce9..7dca382ebce9 100644
--- a/lang/php55/files/patch-Zend::zend.h
+++ b/lang/php55/files/patch-Zend__zend.h
diff --git a/lang/php55/files/patch-main::php_config.h.in b/lang/php55/files/patch-main__php_config.h.in
index 36cc08c6e92b..36cc08c6e92b 100644
--- a/lang/php55/files/patch-main::php_config.h.in
+++ b/lang/php55/files/patch-main__php_config.h.in
diff --git a/lang/sr/files/patch-lexed::sr.yy.c b/lang/sr/files/patch-lexed__sr.yy.c
index 0c50a44b4c3b..0c50a44b4c3b 100644
--- a/lang/sr/files/patch-lexed::sr.yy.c
+++ b/lang/sr/files/patch-lexed__sr.yy.c
diff --git a/lang/sr/files/patch-lexed::srlatex.yy.c b/lang/sr/files/patch-lexed__srlatex.yy.c
index 993bf2eb2f0e..993bf2eb2f0e 100644
--- a/lang/sr/files/patch-lexed::srlatex.yy.c
+++ b/lang/sr/files/patch-lexed__srlatex.yy.c
diff --git a/lang/sr/files/patch-lexed::srtex.yy.c b/lang/sr/files/patch-lexed__srtex.yy.c
index ada806b2aafb..ada806b2aafb 100644
--- a/lang/sr/files/patch-lexed::srtex.yy.c
+++ b/lang/sr/files/patch-lexed__srtex.yy.c
diff --git a/lang/sr/files/patch-rts::alloc.c b/lang/sr/files/patch-rts__alloc.c
index 2fbbd27bce9a..2fbbd27bce9a 100644
--- a/lang/sr/files/patch-rts::alloc.c
+++ b/lang/sr/files/patch-rts__alloc.c
diff --git a/lang/sr/files/patch-rts::array.c b/lang/sr/files/patch-rts__array.c
index 6d4ce2b41871..6d4ce2b41871 100644
--- a/lang/sr/files/patch-rts::array.c
+++ b/lang/sr/files/patch-rts__array.c
diff --git a/lang/sr/files/patch-rts::io.c b/lang/sr/files/patch-rts__io.c
index 4b856851b0d2..4b856851b0d2 100644
--- a/lang/sr/files/patch-rts::io.c
+++ b/lang/sr/files/patch-rts__io.c
diff --git a/lang/sr/files/patch-rts::main.c b/lang/sr/files/patch-rts__main.c
index d33a6092a3ae..d33a6092a3ae 100644
--- a/lang/sr/files/patch-rts::main.c
+++ b/lang/sr/files/patch-rts__main.c
diff --git a/lang/sr/files/patch-rts::math.c b/lang/sr/files/patch-rts__math.c
index b8e282a679f0..b8e282a679f0 100644
--- a/lang/sr/files/patch-rts::math.c
+++ b/lang/sr/files/patch-rts__math.c
diff --git a/lang/sr/files/patch-rts::misc.c b/lang/sr/files/patch-rts__misc.c
index 3a1c363fdbbb..3a1c363fdbbb 100644
--- a/lang/sr/files/patch-rts::misc.c
+++ b/lang/sr/files/patch-rts__misc.c
diff --git a/lang/sr/files/patch-rts::oper.c b/lang/sr/files/patch-rts__oper.c
index 2fb5331748aa..2fb5331748aa 100644
--- a/lang/sr/files/patch-rts::oper.c
+++ b/lang/sr/files/patch-rts__oper.c
diff --git a/lang/sr/files/patch-rts::scan.c b/lang/sr/files/patch-rts__scan.c
index b950d7df1f4e..b950d7df1f4e 100644
--- a/lang/sr/files/patch-rts::scan.c
+++ b/lang/sr/files/patch-rts__scan.c
diff --git a/lang/sr/files/patch-rts::socket.c b/lang/sr/files/patch-rts__socket.c
index 21e82b50ef57..21e82b50ef57 100644
--- a/lang/sr/files/patch-rts::socket.c
+++ b/lang/sr/files/patch-rts__socket.c
diff --git a/lang/sr/files/patch-sr::output.c b/lang/sr/files/patch-sr__output.c
index 47a11243a8f1..47a11243a8f1 100644
--- a/lang/sr/files/patch-sr::output.c
+++ b/lang/sr/files/patch-sr__output.c
diff --git a/lang/sr/files/patch-sr::protos.h b/lang/sr/files/patch-sr__protos.h
index e6e5d6bdc535..e6e5d6bdc535 100644
--- a/lang/sr/files/patch-sr::protos.h
+++ b/lang/sr/files/patch-sr__protos.h
diff --git a/mail/cyrus-imapd23/files/patch-imap::Makefile.in b/mail/cyrus-imapd23/files/patch-imap__Makefile.in
index e1a94d35f26f..e1a94d35f26f 100644
--- a/mail/cyrus-imapd23/files/patch-imap::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-imap__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-imtest::imtest.c b/mail/cyrus-imapd23/files/patch-imtest__imtest.c
index 30b84fb9556a..30b84fb9556a 100644
--- a/mail/cyrus-imapd23/files/patch-imtest::imtest.c
+++ b/mail/cyrus-imapd23/files/patch-imtest__imtest.c
diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib__Makefile.in
index 543ece89f131..543ece89f131 100644
--- a/mail/cyrus-imapd23/files/patch-lib::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-lib__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-lib::charset.c b/mail/cyrus-imapd23/files/patch-lib__charset.c
index 704401378fd8..704401378fd8 100644
--- a/mail/cyrus-imapd23/files/patch-lib::charset.c
+++ b/mail/cyrus-imapd23/files/patch-lib__charset.c
diff --git a/mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c b/mail/cyrus-imapd23/files/patch-lib__cyrusdb_berkeley.c
index 76d4b7f7c3ea..76d4b7f7c3ea 100644
--- a/mail/cyrus-imapd23/files/patch-lib::cyrusdb_berkeley.c
+++ b/mail/cyrus-imapd23/files/patch-lib__cyrusdb_berkeley.c
diff --git a/mail/cyrus-imapd23/files/patch-lib::imapoptions b/mail/cyrus-imapd23/files/patch-lib__imapoptions
index 8c79e3b2e8f4..8c79e3b2e8f4 100644
--- a/mail/cyrus-imapd23/files/patch-lib::imapoptions
+++ b/mail/cyrus-imapd23/files/patch-lib__imapoptions
diff --git a/mail/cyrus-imapd23/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd23/files/patch-lib__libcyr_cfg.c
index 5cbb64001209..5cbb64001209 100644
--- a/mail/cyrus-imapd23/files/patch-lib::libcyr_cfg.c
+++ b/mail/cyrus-imapd23/files/patch-lib__libcyr_cfg.c
diff --git a/mail/cyrus-imapd23/files/patch-man::Makefile.in b/mail/cyrus-imapd23/files/patch-man__Makefile.in
index 1b0061897d43..1b0061897d43 100644
--- a/mail/cyrus-imapd23/files/patch-man::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-man__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-master::Makefile.in b/mail/cyrus-imapd23/files/patch-master__Makefile.in
index c828109f247e..c828109f247e 100644
--- a/mail/cyrus-imapd23/files/patch-master::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-master__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd23/files/patch-notifyd__Makefile.in
index d49703fa25b4..d49703fa25b4 100644
--- a/mail/cyrus-imapd23/files/patch-notifyd::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-notifyd__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-perl::imap::IMAP.xs b/mail/cyrus-imapd23/files/patch-perl__imap__IMAP.xs
index 77ec9d76b885..77ec9d76b885 100644
--- a/mail/cyrus-imapd23/files/patch-perl::imap::IMAP.xs
+++ b/mail/cyrus-imapd23/files/patch-perl__imap__IMAP.xs
diff --git a/mail/cyrus-imapd23/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd23/files/patch-perl__imap__Makefile.PL
index eb67dcfcf5b9..eb67dcfcf5b9 100644
--- a/mail/cyrus-imapd23/files/patch-perl::imap::Makefile.PL
+++ b/mail/cyrus-imapd23/files/patch-perl__imap__Makefile.PL
diff --git a/mail/cyrus-imapd23/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd23/files/patch-perl__sieve__managesieve__Makefile.PL
index 9b28ce08bdc6..9b28ce08bdc6 100644
--- a/mail/cyrus-imapd23/files/patch-perl::sieve::managesieve::Makefile.PL
+++ b/mail/cyrus-imapd23/files/patch-perl__sieve__managesieve__Makefile.PL
diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve__Makefile.in
index ef0d76b256be..ef0d76b256be 100644
--- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-sieve__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd23/files/patch-timsieved__Makefile.in
index 4e0bc2841c2c..4e0bc2841c2c 100644
--- a/mail/cyrus-imapd23/files/patch-timsieved::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-timsieved__Makefile.in
diff --git a/mail/cyrus-imapd23/files/patch-tools::mkimap b/mail/cyrus-imapd23/files/patch-tools__mkimap
index 9ee1539e3776..9ee1539e3776 100644
--- a/mail/cyrus-imapd23/files/patch-tools::mkimap
+++ b/mail/cyrus-imapd23/files/patch-tools__mkimap
diff --git a/mail/cyrus-imapd24/files/patch-imap::Makefile.in b/mail/cyrus-imapd24/files/patch-imap__Makefile.in
index e1a94d35f26f..e1a94d35f26f 100644
--- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-imap__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest__imtest.c
index 30b84fb9556a..30b84fb9556a 100644
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ b/mail/cyrus-imapd24/files/patch-imtest__imtest.c
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib__Makefile.in
index 543ece89f131..543ece89f131 100644
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-lib__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib__imapoptions
index 8c79e3b2e8f4..8c79e3b2e8f4 100644
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ b/mail/cyrus-imapd24/files/patch-lib__imapoptions
diff --git a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c
index 5cbb64001209..5cbb64001209 100644
--- a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c
+++ b/mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c
diff --git a/mail/cyrus-imapd24/files/patch-lib::util.c b/mail/cyrus-imapd24/files/patch-lib__util.c
index aca6416970c3..aca6416970c3 100644
--- a/mail/cyrus-imapd24/files/patch-lib::util.c
+++ b/mail/cyrus-imapd24/files/patch-lib__util.c
diff --git a/mail/cyrus-imapd24/files/patch-man::Makefile.in b/mail/cyrus-imapd24/files/patch-man__Makefile.in
index 1b0061897d43..1b0061897d43 100644
--- a/mail/cyrus-imapd24/files/patch-man::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-man__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master__Makefile.in
index 28b103ab7cb4..28b103ab7cb4 100644
--- a/mail/cyrus-imapd24/files/patch-master::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-master__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd__Makefile.in
index d49703fa25b4..d49703fa25b4 100644
--- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-notifyd__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl__imap__Makefile.PL
index eb67dcfcf5b9..eb67dcfcf5b9 100644
--- a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
+++ b/mail/cyrus-imapd24/files/patch-perl__imap__Makefile.PL
diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl__sieve__managesieve__Makefile.PL
index 9b28ce08bdc6..9b28ce08bdc6 100644
--- a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
+++ b/mail/cyrus-imapd24/files/patch-perl__sieve__managesieve__Makefile.PL
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve__Makefile.in
index ef0d76b256be..ef0d76b256be 100644
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-sieve__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved__Makefile.in
index 4e0bc2841c2c..4e0bc2841c2c 100644
--- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-timsieved__Makefile.in
diff --git a/mail/cyrus-imapd24/files/patch-tools::mkimap b/mail/cyrus-imapd24/files/patch-tools__mkimap
index 9ee1539e3776..9ee1539e3776 100644
--- a/mail/cyrus-imapd24/files/patch-tools::mkimap
+++ b/mail/cyrus-imapd24/files/patch-tools__mkimap
diff --git a/mail/exim-monitor/files/patch-OS::Makefile-Base b/mail/exim-monitor/files/patch-OS__Makefile-Base
index 9dc53c993786..9dc53c993786 100644
--- a/mail/exim-monitor/files/patch-OS::Makefile-Base
+++ b/mail/exim-monitor/files/patch-OS__Makefile-Base
diff --git a/mail/exim-monitor/files/patch-OS::Makefile-FreeBSD b/mail/exim-monitor/files/patch-OS__Makefile-FreeBSD
index 58f6355e13d8..58f6355e13d8 100644
--- a/mail/exim-monitor/files/patch-OS::Makefile-FreeBSD
+++ b/mail/exim-monitor/files/patch-OS__Makefile-FreeBSD
diff --git a/mail/exim-monitor/files/patch-src::EDITME b/mail/exim-monitor/files/patch-src__EDITME
index 0ee15f3d818a..0ee15f3d818a 100644
--- a/mail/exim-monitor/files/patch-src::EDITME
+++ b/mail/exim-monitor/files/patch-src__EDITME
diff --git a/mail/exim/files/patch-OS::Makefile-FreeBSD b/mail/exim/files/patch-OS__Makefile-FreeBSD
index 239f5bca9637..239f5bca9637 100644
--- a/mail/exim/files/patch-OS::Makefile-FreeBSD
+++ b/mail/exim/files/patch-OS__Makefile-FreeBSD
diff --git a/mail/exim/files/patch-scripts::exim_install b/mail/exim/files/patch-scripts__exim_install
index 7a2fec05545a..7a2fec05545a 100644
--- a/mail/exim/files/patch-scripts::exim_install
+++ b/mail/exim/files/patch-scripts__exim_install
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src__EDITME
index 1725c6839eff..1725c6839eff 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src__EDITME
diff --git a/mail/exim/files/patch-src::auths::call_radius.c b/mail/exim/files/patch-src__auths__call_radius.c
index 59c14cc2b725..59c14cc2b725 100644
--- a/mail/exim/files/patch-src::auths::call_radius.c
+++ b/mail/exim/files/patch-src__auths__call_radius.c
diff --git a/mail/exim/files/patch-src::configure.default b/mail/exim/files/patch-src__configure.default
index 24bf1df70d9d..24bf1df70d9d 100644
--- a/mail/exim/files/patch-src::configure.default
+++ b/mail/exim/files/patch-src__configure.default
diff --git a/mail/filtermail/files/patch-src::Makefile.in b/mail/filtermail/files/patch-src__Makefile.in
index 2cb285285df6..2cb285285df6 100644
--- a/mail/filtermail/files/patch-src::Makefile.in
+++ b/mail/filtermail/files/patch-src__Makefile.in
diff --git a/mail/filtermail/files/patch-src::filter.hh b/mail/filtermail/files/patch-src__filter.hh
index 5366038c8ecd..5366038c8ecd 100644
--- a/mail/filtermail/files/patch-src::filter.hh
+++ b/mail/filtermail/files/patch-src__filter.hh
diff --git a/mail/filtermail/files/patch-src::preferences.cc b/mail/filtermail/files/patch-src__preferences.cc
index b7eb55b3aa1b..b7eb55b3aa1b 100644
--- a/mail/filtermail/files/patch-src::preferences.cc
+++ b/mail/filtermail/files/patch-src__preferences.cc
diff --git a/mail/ftrack/files/patch-hpp::constant.hpp b/mail/ftrack/files/patch-hpp__constant.hpp
index 1c225217a585..1c225217a585 100644
--- a/mail/ftrack/files/patch-hpp::constant.hpp
+++ b/mail/ftrack/files/patch-hpp__constant.hpp
diff --git a/mail/ftrack/files/patch-hpp::ufmtypes.h b/mail/ftrack/files/patch-hpp__ufmtypes.h
index 1885dbbc641a..1885dbbc641a 100644
--- a/mail/ftrack/files/patch-hpp::ufmtypes.h
+++ b/mail/ftrack/files/patch-hpp__ufmtypes.h
diff --git a/mail/ftrack/files/patch-src::ftrack.cpp b/mail/ftrack/files/patch-src__ftrack.cpp
index 0177d5af32ec..0177d5af32ec 100644
--- a/mail/ftrack/files/patch-src::ftrack.cpp
+++ b/mail/ftrack/files/patch-src__ftrack.cpp
diff --git a/mail/ftrack/files/patch-src::ustr.cpp b/mail/ftrack/files/patch-src__ustr.cpp
index 09741fdcd6f8..09741fdcd6f8 100644
--- a/mail/ftrack/files/patch-src::ustr.cpp
+++ b/mail/ftrack/files/patch-src__ustr.cpp
diff --git a/mail/ftrack/files/patch-src::utils.cpp b/mail/ftrack/files/patch-src__utils.cpp
index 9f8364ebbcf8..9f8364ebbcf8 100644
--- a/mail/ftrack/files/patch-src::utils.cpp
+++ b/mail/ftrack/files/patch-src__utils.cpp
diff --git a/mail/horde3-imp/files/patch-config::conf.xml b/mail/horde3-imp/files/patch-config__conf.xml
index 09d8f92142cb..09d8f92142cb 100644
--- a/mail/horde3-imp/files/patch-config::conf.xml
+++ b/mail/horde3-imp/files/patch-config__conf.xml
diff --git a/mail/horde3-turba/files/patch-config::sources.php.dist b/mail/horde3-turba/files/patch-config__sources.php.dist
index aeb73b0e369d..aeb73b0e369d 100644
--- a/mail/horde3-turba/files/patch-config::sources.php.dist
+++ b/mail/horde3-turba/files/patch-config__sources.php.dist
diff --git a/mail/mailman/files/patch-Mailman::Defaults.py.in b/mail/mailman/files/patch-Mailman__Defaults.py.in
index 4cc7974b8e2b..4cc7974b8e2b 100644
--- a/mail/mailman/files/patch-Mailman::Defaults.py.in
+++ b/mail/mailman/files/patch-Mailman__Defaults.py.in
diff --git a/mail/mailman/files/patch-Mailman::htmlformat.py b/mail/mailman/files/patch-Mailman__htmlformat.py
index b4e2b0409bfc..b4e2b0409bfc 100644
--- a/mail/mailman/files/patch-Mailman::htmlformat.py
+++ b/mail/mailman/files/patch-Mailman__htmlformat.py
diff --git a/mail/mailman/files/patch-misc::mailman.in b/mail/mailman/files/patch-misc__mailman.in
index 728fc537b3f6..728fc537b3f6 100644
--- a/mail/mailman/files/patch-misc::mailman.in
+++ b/mail/mailman/files/patch-misc__mailman.in
diff --git a/mail/p3scan/files/patch-ripmime::build_ripOLE b/mail/p3scan/files/patch-ripmime__build_ripOLE
index 5389503a6ae9..5389503a6ae9 100644
--- a/mail/p3scan/files/patch-ripmime::build_ripOLE
+++ b/mail/p3scan/files/patch-ripmime__build_ripOLE
diff --git a/mail/p3scan/files/patch-ripmime::build_tnef b/mail/p3scan/files/patch-ripmime__build_tnef
index 103d4235fe61..103d4235fe61 100644
--- a/mail/p3scan/files/patch-ripmime::build_tnef
+++ b/mail/p3scan/files/patch-ripmime__build_tnef
diff --git a/mail/p3scan/files/patch-ripmime::tnef::Makefile b/mail/p3scan/files/patch-ripmime__tnef__Makefile
index cd1d0d3800bf..cd1d0d3800bf 100644
--- a/mail/p3scan/files/patch-ripmime::tnef::Makefile
+++ b/mail/p3scan/files/patch-ripmime__tnef__Makefile
diff --git a/mail/popd/files/patch-lib::funcs.c b/mail/popd/files/patch-lib__funcs.c
index ff835dd6eb14..ff835dd6eb14 100644
--- a/mail/popd/files/patch-lib::funcs.c
+++ b/mail/popd/files/patch-lib__funcs.c
diff --git a/mail/popd/files/patch-lib::mbox_maildir.c b/mail/popd/files/patch-lib__mbox_maildir.c
index e3a164cb8f2d..e3a164cb8f2d 100644
--- a/mail/popd/files/patch-lib::mbox_maildir.c
+++ b/mail/popd/files/patch-lib__mbox_maildir.c
diff --git a/mail/popd/files/patch-src::popd.8 b/mail/popd/files/patch-src__popd.8
index f9b96e85fe0b..f9b96e85fe0b 100644
--- a/mail/popd/files/patch-src::popd.8
+++ b/mail/popd/files/patch-src__popd.8
diff --git a/mail/popd/files/patch-src::popd.c b/mail/popd/files/patch-src__popd.c
index 2216463c13a5..2216463c13a5 100644
--- a/mail/popd/files/patch-src::popd.c
+++ b/mail/popd/files/patch-src__popd.c
diff --git a/mail/popd/files/patch-src::popd.conf.5 b/mail/popd/files/patch-src__popd.conf.5
index 4c56b744b11c..4c56b744b11c 100644
--- a/mail/popd/files/patch-src::popd.conf.5
+++ b/mail/popd/files/patch-src__popd.conf.5
diff --git a/mail/postfix/files/patch-src::util::sys_defs.h b/mail/postfix/files/patch-src__util__sys_defs.h
index a11384454237..a11384454237 100644
--- a/mail/postfix/files/patch-src::util::sys_defs.h
+++ b/mail/postfix/files/patch-src__util__sys_defs.h
diff --git a/mail/postfix210/files/patch-src::util::sys_defs.h b/mail/postfix210/files/patch-src__util__sys_defs.h
index a11384454237..a11384454237 100644
--- a/mail/postfix210/files/patch-src::util::sys_defs.h
+++ b/mail/postfix210/files/patch-src__util__sys_defs.h
diff --git a/mail/postfix27/files/patch-src::util::sys_defs.h b/mail/postfix27/files/patch-src__util__sys_defs.h
index f2b5e8eaba6d..f2b5e8eaba6d 100644
--- a/mail/postfix27/files/patch-src::util::sys_defs.h
+++ b/mail/postfix27/files/patch-src__util__sys_defs.h
diff --git a/mail/postfix28/files/patch-src::util::sys_defs.h b/mail/postfix28/files/patch-src__util__sys_defs.h
index 636c464aef1c..636c464aef1c 100644
--- a/mail/postfix28/files/patch-src::util::sys_defs.h
+++ b/mail/postfix28/files/patch-src__util__sys_defs.h
diff --git a/mail/postfix29/files/patch-src::util::sys_defs.h b/mail/postfix29/files/patch-src__util__sys_defs.h
index d2f18d16894f..d2f18d16894f 100644
--- a/mail/postfix29/files/patch-src::util::sys_defs.h
+++ b/mail/postfix29/files/patch-src__util__sys_defs.h
diff --git a/mail/qscan/files/patch-src::qscan.c b/mail/qscan/files/patch-src__qscan.c
index 081a7bdff6eb..081a7bdff6eb 100644
--- a/mail/qscan/files/patch-src::qscan.c
+++ b/mail/qscan/files/patch-src__qscan.c
diff --git a/mail/qscan/files/patch-src::qscan.h b/mail/qscan/files/patch-src__qscan.h
index e2ff1b78cb83..e2ff1b78cb83 100644
--- a/mail/qscan/files/patch-src::qscan.h
+++ b/mail/qscan/files/patch-src__qscan.h
diff --git a/math/arpack++/files/patch-include::arlutil.h b/math/arpack++/files/patch-include__arlutil.h
index 40e7ac7f0b53..40e7ac7f0b53 100644
--- a/math/arpack++/files/patch-include::arlutil.h
+++ b/math/arpack++/files/patch-include__arlutil.h
diff --git a/math/blocksolve95/files/patch-bmake::common b/math/blocksolve95/files/patch-bmake__common
index 7c426bf835a8..7c426bf835a8 100644
--- a/math/blocksolve95/files/patch-bmake::common
+++ b/math/blocksolve95/files/patch-bmake__common
diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd b/math/blocksolve95/files/patch-bmake__freebsd__freebsd
index d3334f6431fc..d3334f6431fc 100644
--- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd
+++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd
diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.O
index 1829d187a1a5..1829d187a1a5 100644
--- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O
+++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.O
diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.site
index bab70597d456..bab70597d456 100644
--- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site
+++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.site
diff --git a/math/blocksolve95/files/patch-examples::makefile b/math/blocksolve95/files/patch-examples__makefile
index fab4c12b501b..fab4c12b501b 100644
--- a/math/blocksolve95/files/patch-examples::makefile
+++ b/math/blocksolve95/files/patch-examples__makefile
diff --git a/math/blocksolve95/files/patch-include::BSdepend.h b/math/blocksolve95/files/patch-include__BSdepend.h
index a6868374dc19..a6868374dc19 100644
--- a/math/blocksolve95/files/patch-include::BSdepend.h
+++ b/math/blocksolve95/files/patch-include__BSdepend.h
diff --git a/math/emc2/files/patch-libI77::fio.h b/math/emc2/files/patch-libI77__fio.h
index 1ebd63157a40..1ebd63157a40 100644
--- a/math/emc2/files/patch-libI77::fio.h
+++ b/math/emc2/files/patch-libI77__fio.h
diff --git a/math/fftw/files/patch-doc::fftw.texi b/math/fftw/files/patch-doc__fftw.texi
index ff55063443d1..ff55063443d1 100644
--- a/math/fftw/files/patch-doc::fftw.texi
+++ b/math/fftw/files/patch-doc__fftw.texi
diff --git a/math/gdcalc/files/patch-src::dcalc.c b/math/gdcalc/files/patch-src__dcalc.c
index 1d6a2c591136..1d6a2c591136 100644
--- a/math/gdcalc/files/patch-src::dcalc.c
+++ b/math/gdcalc/files/patch-src__dcalc.c
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2__Makefile.in
index a69067182f13..a69067182f13 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2__Makefile.in
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib__Makefile.in
index 3c88d3c6119c..3c88d3c6119c 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib__Makefile.in
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin__Makefile.in
index c7d66c786d8f..c7d66c786d8f 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin__Makefile.in
diff --git a/math/gretl/files/patch-plugin::workbook.c b/math/gretl/files/patch-plugin__workbook.c
index d91482092391..d91482092391 100644
--- a/math/gretl/files/patch-plugin::workbook.c
+++ b/math/gretl/files/patch-plugin__workbook.c
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share__Makefile.in
index 147ec53b6811..147ec53b6811 100644
--- a/math/gretl/files/patch-share::Makefile.in
+++ b/math/gretl/files/patch-share__Makefile.in
diff --git a/math/gretl/files/patch-share::bcih::Makefile.in b/math/gretl/files/patch-share__bcih__Makefile.in
index 188de04e97d5..188de04e97d5 100644
--- a/math/gretl/files/patch-share::bcih::Makefile.in
+++ b/math/gretl/files/patch-share__bcih__Makefile.in
diff --git a/math/petsc/files/patch-bmake::common::rules.shared.basic b/math/petsc/files/patch-bmake__common__rules.shared.basic
index f64f611487b7..f64f611487b7 100644
--- a/math/petsc/files/patch-bmake::common::rules.shared.basic
+++ b/math/petsc/files/patch-bmake__common__rules.shared.basic
diff --git a/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h b/math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h
index 4deb3db1d37b..4deb3db1d37b 100644
--- a/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h
+++ b/math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h
diff --git a/math/ploticus/files/patch-src::reslimits.c b/math/ploticus/files/patch-src__reslimits.c
index 5083f4650bcd..5083f4650bcd 100644
--- a/math/ploticus/files/patch-src::reslimits.c
+++ b/math/ploticus/files/patch-src__reslimits.c
diff --git a/math/qhull5/files/patch-eg::Makefile.in b/math/qhull5/files/patch-eg__Makefile.in
index f9877a8061e3..f9877a8061e3 100644
--- a/math/qhull5/files/patch-eg::Makefile.in
+++ b/math/qhull5/files/patch-eg__Makefile.in
diff --git a/math/qhull5/files/patch-src::Makefile.in b/math/qhull5/files/patch-src__Makefile.in
index 9623670c7d08..9623670c7d08 100644
--- a/math/qhull5/files/patch-src::Makefile.in
+++ b/math/qhull5/files/patch-src__Makefile.in
diff --git a/math/spar/files/patch-calculator::Makefile.in b/math/spar/files/patch-calculator__Makefile.in
index 725ba36e31f9..725ba36e31f9 100644
--- a/math/spar/files/patch-calculator::Makefile.in
+++ b/math/spar/files/patch-calculator__Makefile.in
diff --git a/math/spar/files/patch-lib::randist::rand.c b/math/spar/files/patch-lib__randist__rand.c
index 792b9fa2ae9a..792b9fa2ae9a 100644
--- a/math/spar/files/patch-lib::randist::rand.c
+++ b/math/spar/files/patch-lib__randist__rand.c
diff --git a/misc/amanda-server/files/patch-amandad-src::Makefile.in b/misc/amanda-server/files/patch-amandad-src__Makefile.in
index 0e3a9389165b..0e3a9389165b 100644
--- a/misc/amanda-server/files/patch-amandad-src::Makefile.in
+++ b/misc/amanda-server/files/patch-amandad-src__Makefile.in
diff --git a/misc/amanda-server/files/patch-amar-src::Makefile.in b/misc/amanda-server/files/patch-amar-src__Makefile.in
index c7941f44904e..c7941f44904e 100644
--- a/misc/amanda-server/files/patch-amar-src::Makefile.in
+++ b/misc/amanda-server/files/patch-amar-src__Makefile.in
diff --git a/misc/amanda-server/files/patch-client-src::sendbackup-dump.c b/misc/amanda-server/files/patch-client-src__sendbackup-dump.c
index 5df8dc8b57e8..5df8dc8b57e8 100644
--- a/misc/amanda-server/files/patch-client-src::sendbackup-dump.c
+++ b/misc/amanda-server/files/patch-client-src__sendbackup-dump.c
diff --git a/misc/amanda-server/files/patch-common-src::Makefile.in b/misc/amanda-server/files/patch-common-src__Makefile.in
index 0cb609a3a730..0cb609a3a730 100644
--- a/misc/amanda-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda-server/files/patch-common-src__Makefile.in
diff --git a/misc/amanda-server/files/patch-man::Makefile.in b/misc/amanda-server/files/patch-man__Makefile.in
index daeea0759ce8..daeea0759ce8 100644
--- a/misc/amanda-server/files/patch-man::Makefile.in
+++ b/misc/amanda-server/files/patch-man__Makefile.in
diff --git a/misc/amanda-server/files/patch-ndmp-src::Makefile.in b/misc/amanda-server/files/patch-ndmp-src__Makefile.in
index 2dd3f4b9f32d..2dd3f4b9f32d 100644
--- a/misc/amanda-server/files/patch-ndmp-src::Makefile.in
+++ b/misc/amanda-server/files/patch-ndmp-src__Makefile.in
diff --git a/misc/amanda-server/files/patch-perl::Amanda::Process.pm b/misc/amanda-server/files/patch-perl__Amanda__Process.pm
index 806659b3f979..806659b3f979 100644
--- a/misc/amanda-server/files/patch-perl::Amanda::Process.pm
+++ b/misc/amanda-server/files/patch-perl__Amanda__Process.pm
diff --git a/misc/amanda-server/files/patch-perl::Makefile.in b/misc/amanda-server/files/patch-perl__Makefile.in
index a2bed44a04be..a2bed44a04be 100644
--- a/misc/amanda-server/files/patch-perl::Makefile.in
+++ b/misc/amanda-server/files/patch-perl__Makefile.in
diff --git a/misc/amanda-server/files/patch-perl::amglue::Makefile.in b/misc/amanda-server/files/patch-perl__amglue__Makefile.in
index 96d2bc290602..96d2bc290602 100644
--- a/misc/amanda-server/files/patch-perl::amglue::Makefile.in
+++ b/misc/amanda-server/files/patch-perl__amglue__Makefile.in
diff --git a/misc/amanda-server/files/patch-xfer-src::Makefile.in b/misc/amanda-server/files/patch-xfer-src__Makefile.in
index cb48325de180..cb48325de180 100644
--- a/misc/amanda-server/files/patch-xfer-src::Makefile.in
+++ b/misc/amanda-server/files/patch-xfer-src__Makefile.in
diff --git a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda25-server/files/patch-server-src__amcrypt-ossl-asym.sh.in
index eeb0ea70129c..eeb0ea70129c 100644
--- a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
+++ b/misc/amanda25-server/files/patch-server-src__amcrypt-ossl-asym.sh.in
diff --git a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda25-server/files/patch-server-src__amcrypt-ossl.sh.in
index 2eb587feb9af..2eb587feb9af 100644
--- a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in
+++ b/misc/amanda25-server/files/patch-server-src__amcrypt-ossl.sh.in
diff --git a/misc/amanda26-server/files/patch-amandad-src::Makefile.in b/misc/amanda26-server/files/patch-amandad-src__Makefile.in
index 9a80b4b90f95..9a80b4b90f95 100644
--- a/misc/amanda26-server/files/patch-amandad-src::Makefile.in
+++ b/misc/amanda26-server/files/patch-amandad-src__Makefile.in
diff --git a/misc/amanda26-server/files/patch-amar-src::Makefile.in b/misc/amanda26-server/files/patch-amar-src__Makefile.in
index c7941f44904e..c7941f44904e 100644
--- a/misc/amanda26-server/files/patch-amar-src::Makefile.in
+++ b/misc/amanda26-server/files/patch-amar-src__Makefile.in
diff --git a/misc/amanda26-server/files/patch-changer-src::chg-glue.pl b/misc/amanda26-server/files/patch-changer-src__chg-glue.pl
index 20467d2116fd..20467d2116fd 100644
--- a/misc/amanda26-server/files/patch-changer-src::chg-glue.pl
+++ b/misc/amanda26-server/files/patch-changer-src__chg-glue.pl
diff --git a/misc/amanda26-server/files/patch-common-src::Makefile.in b/misc/amanda26-server/files/patch-common-src__Makefile.in
index 9da99a06935e..9da99a06935e 100644
--- a/misc/amanda26-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda26-server/files/patch-common-src__Makefile.in
diff --git a/misc/amanda26-server/files/patch-common-src::glib-util.c b/misc/amanda26-server/files/patch-common-src__glib-util.c
index eb92dddcfc54..eb92dddcfc54 100644
--- a/misc/amanda26-server/files/patch-common-src::glib-util.c
+++ b/misc/amanda26-server/files/patch-common-src__glib-util.c
diff --git a/misc/amanda26-server/files/patch-man::Makefile.in b/misc/amanda26-server/files/patch-man__Makefile.in
index daeea0759ce8..daeea0759ce8 100644
--- a/misc/amanda26-server/files/patch-man::Makefile.in
+++ b/misc/amanda26-server/files/patch-man__Makefile.in
diff --git a/misc/amanda26-server/files/patch-perl::Amanda::Process.pm b/misc/amanda26-server/files/patch-perl__Amanda__Process.pm
index 806659b3f979..806659b3f979 100644
--- a/misc/amanda26-server/files/patch-perl::Amanda::Process.pm
+++ b/misc/amanda26-server/files/patch-perl__Amanda__Process.pm
diff --git a/misc/amanda26-server/files/patch-perl::Makefile.in b/misc/amanda26-server/files/patch-perl__Makefile.in
index b32626c1144e..b32626c1144e 100644
--- a/misc/amanda26-server/files/patch-perl::Makefile.in
+++ b/misc/amanda26-server/files/patch-perl__Makefile.in
diff --git a/misc/amanda26-server/files/patch-server-src::amcleanup.pl b/misc/amanda26-server/files/patch-server-src__amcleanup.pl
index fbd45ccbea63..fbd45ccbea63 100644
--- a/misc/amanda26-server/files/patch-server-src::amcleanup.pl
+++ b/misc/amanda26-server/files/patch-server-src__amcleanup.pl
diff --git a/misc/amanda32-server/files/patch-amandad-src::Makefile.in b/misc/amanda32-server/files/patch-amandad-src__Makefile.in
index 0e3a9389165b..0e3a9389165b 100644
--- a/misc/amanda32-server/files/patch-amandad-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-amandad-src__Makefile.in
diff --git a/misc/amanda32-server/files/patch-amar-src::Makefile.in b/misc/amanda32-server/files/patch-amar-src__Makefile.in
index c7941f44904e..c7941f44904e 100644
--- a/misc/amanda32-server/files/patch-amar-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-amar-src__Makefile.in
diff --git a/misc/amanda32-server/files/patch-client-src::sendbackup-dump.c b/misc/amanda32-server/files/patch-client-src__sendbackup-dump.c
index 5df8dc8b57e8..5df8dc8b57e8 100644
--- a/misc/amanda32-server/files/patch-client-src::sendbackup-dump.c
+++ b/misc/amanda32-server/files/patch-client-src__sendbackup-dump.c
diff --git a/misc/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src__Makefile.in
index 16be032af49a..16be032af49a 100644
--- a/misc/amanda32-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-common-src__Makefile.in
diff --git a/misc/amanda32-server/files/patch-man::Makefile.in b/misc/amanda32-server/files/patch-man__Makefile.in
index daeea0759ce8..daeea0759ce8 100644
--- a/misc/amanda32-server/files/patch-man::Makefile.in
+++ b/misc/amanda32-server/files/patch-man__Makefile.in
diff --git a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in b/misc/amanda32-server/files/patch-ndmp-src__Makefile.in
index 2dd3f4b9f32d..2dd3f4b9f32d 100644
--- a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-ndmp-src__Makefile.in
diff --git a/misc/amanda32-server/files/patch-perl::Amanda::Process.pm b/misc/amanda32-server/files/patch-perl__Amanda__Process.pm
index 806659b3f979..806659b3f979 100644
--- a/misc/amanda32-server/files/patch-perl::Amanda::Process.pm
+++ b/misc/amanda32-server/files/patch-perl__Amanda__Process.pm
diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl__Makefile.in
index a2bed44a04be..a2bed44a04be 100644
--- a/misc/amanda32-server/files/patch-perl::Makefile.in
+++ b/misc/amanda32-server/files/patch-perl__Makefile.in
diff --git a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in b/misc/amanda32-server/files/patch-perl__amglue__Makefile.in
index 96d2bc290602..96d2bc290602 100644
--- a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in
+++ b/misc/amanda32-server/files/patch-perl__amglue__Makefile.in
diff --git a/misc/amanda32-server/files/patch-xfer-src::Makefile.in b/misc/amanda32-server/files/patch-xfer-src__Makefile.in
index e9c3e7838a30..e9c3e7838a30 100644
--- a/misc/amanda32-server/files/patch-xfer-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-xfer-src__Makefile.in
diff --git a/misc/gregexp/files/patch-src::main.c b/misc/gregexp/files/patch-src__main.c
index 78569bc147dd..78569bc147dd 100644
--- a/misc/gregexp/files/patch-src::main.c
+++ b/misc/gregexp/files/patch-src__main.c
diff --git a/multimedia/mplayerxp/files/patch-loader::Makefile b/multimedia/mplayerxp/files/patch-loader__Makefile
index 7aa5cff5c6a5..7aa5cff5c6a5 100644
--- a/multimedia/mplayerxp/files/patch-loader::Makefile
+++ b/multimedia/mplayerxp/files/patch-loader__Makefile
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp::Makefile b/multimedia/mplayerxp/files/patch-mplayerxp__Makefile
index 43b3618ef302..43b3618ef302 100644
--- a/multimedia/mplayerxp/files/patch-mplayerxp::Makefile
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__Makefile
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp::sig_hand.c b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.c
index bc36b560a373..bc36b560a373 100644
--- a/multimedia/mplayerxp/files/patch-mplayerxp::sig_hand.c
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.c
diff --git a/multimedia/openquicktime/files/patch-audioplugin::MP3::Makefile.in b/multimedia/openquicktime/files/patch-audioplugin__MP3__Makefile.in
index 6a5573fc0aa4..6a5573fc0aa4 100644
--- a/multimedia/openquicktime/files/patch-audioplugin::MP3::Makefile.in
+++ b/multimedia/openquicktime/files/patch-audioplugin__MP3__Makefile.in
diff --git a/multimedia/openquicktime/files/patch-videoplugin::PHOTO_JPEG::Makefile.in b/multimedia/openquicktime/files/patch-videoplugin__PHOTO_JPEG__Makefile.in
index 951c97c63619..951c97c63619 100644
--- a/multimedia/openquicktime/files/patch-videoplugin::PHOTO_JPEG::Makefile.in
+++ b/multimedia/openquicktime/files/patch-videoplugin__PHOTO_JPEG__Makefile.in
diff --git a/multimedia/quark/files/patch-charm-quark::charm-quark b/multimedia/quark/files/patch-charm-quark__charm-quark
index 205eeda7bc41..205eeda7bc41 100644
--- a/multimedia/quark/files/patch-charm-quark::charm-quark
+++ b/multimedia/quark/files/patch-charm-quark__charm-quark
diff --git a/multimedia/smpeg/files/patch-video::video.h b/multimedia/smpeg/files/patch-video__video.h
index da1cd1b8485f..da1cd1b8485f 100644
--- a/multimedia/smpeg/files/patch-video::video.h
+++ b/multimedia/smpeg/files/patch-video__video.h
diff --git a/multimedia/xawtv/files/patch-common::vbi-data.c b/multimedia/xawtv/files/patch-common__vbi-data.c
index 33471b7fde5e..33471b7fde5e 100644
--- a/multimedia/xawtv/files/patch-common::vbi-data.c
+++ b/multimedia/xawtv/files/patch-common__vbi-data.c
diff --git a/multimedia/xawtv/files/patch-console::fbtools.c b/multimedia/xawtv/files/patch-console__fbtools.c
index 478e5e96008b..478e5e96008b 100644
--- a/multimedia/xawtv/files/patch-console::fbtools.c
+++ b/multimedia/xawtv/files/patch-console__fbtools.c
diff --git a/multimedia/xawtv/files/patch-console::scantv.c b/multimedia/xawtv/files/patch-console__scantv.c
index 968457a392a1..968457a392a1 100644
--- a/multimedia/xawtv/files/patch-console::scantv.c
+++ b/multimedia/xawtv/files/patch-console__scantv.c
diff --git a/multimedia/xawtv/files/patch-console::showqt.c b/multimedia/xawtv/files/patch-console__showqt.c
index 970608babebe..970608babebe 100644
--- a/multimedia/xawtv/files/patch-console::showqt.c
+++ b/multimedia/xawtv/files/patch-console__showqt.c
diff --git a/multimedia/xawtv/files/patch-console::vbi-tty.c b/multimedia/xawtv/files/patch-console__vbi-tty.c
index 1265408050b0..1265408050b0 100644
--- a/multimedia/xawtv/files/patch-console::vbi-tty.c
+++ b/multimedia/xawtv/files/patch-console__vbi-tty.c
diff --git a/multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk b/multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk
index 999c06b91421..999c06b91421 100644
--- a/multimedia/xawtv/files/patch-libng::contrib-plugins::Subdir.mk
+++ b/multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk
diff --git a/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c b/multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c
index 62801a53a196..62801a53a196 100644
--- a/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c
+++ b/multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c
diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11__Subdir.mk
index 3b528cedfef5..3b528cedfef5 100644
--- a/multimedia/xawtv/files/patch-x11::Subdir.mk
+++ b/multimedia/xawtv/files/patch-x11__Subdir.mk
diff --git a/multimedia/xtheater/files/patch-plugins::ui::gtk::uiopt.c b/multimedia/xtheater/files/patch-plugins__ui__gtk__uiopt.c
index 52c9799240c8..52c9799240c8 100644
--- a/multimedia/xtheater/files/patch-plugins::ui::gtk::uiopt.c
+++ b/multimedia/xtheater/files/patch-plugins__ui__gtk__uiopt.c
diff --git a/net-im/icb/files/patch-icb::c_log.c b/net-im/icb/files/patch-icb__c_log.c
index e6992aece038..e6992aece038 100644
--- a/net-im/icb/files/patch-icb::c_log.c
+++ b/net-im/icb/files/patch-icb__c_log.c
diff --git a/net-im/icb/files/patch-icb::icb.h b/net-im/icb/files/patch-icb__icb.h
index 5867fa4c90df..5867fa4c90df 100644
--- a/net-im/icb/files/patch-icb::icb.h
+++ b/net-im/icb/files/patch-icb__icb.h
diff --git a/net-im/icb/files/patch-icb::strccmp.c b/net-im/icb/files/patch-icb__strccmp.c
index b68e9f210bcd..b68e9f210bcd 100644
--- a/net-im/icb/files/patch-icb::strccmp.c
+++ b/net-im/icb/files/patch-icb__strccmp.c
diff --git a/net-mgmt/aspathtree/files/patch-etc::ASpath-tree.config b/net-mgmt/aspathtree/files/patch-etc__ASpath-tree.config
index bbaa80f191ab..bbaa80f191ab 100644
--- a/net-mgmt/aspathtree/files/patch-etc::ASpath-tree.config
+++ b/net-mgmt/aspathtree/files/patch-etc__ASpath-tree.config
diff --git a/net-mgmt/aspathtree/files/patch-lib::getbgptable.pl b/net-mgmt/aspathtree/files/patch-lib__getbgptable.pl
index d428d27200d6..d428d27200d6 100644
--- a/net-mgmt/aspathtree/files/patch-lib::getbgptable.pl
+++ b/net-mgmt/aspathtree/files/patch-lib__getbgptable.pl
diff --git a/net-mgmt/bigsister/files/patch-tools::bb_start.pl b/net-mgmt/bigsister/files/patch-tools__bb_start.pl
index 5de2561a806f..5de2561a806f 100644
--- a/net-mgmt/bigsister/files/patch-tools::bb_start.pl
+++ b/net-mgmt/bigsister/files/patch-tools__bb_start.pl
diff --git a/net-mgmt/cdpr/files/patch-aa b/net-mgmt/cdpr/files/patch-cdpr.c
index 8c591de71e7e..8c591de71e7e 100644
--- a/net-mgmt/cdpr/files/patch-aa
+++ b/net-mgmt/cdpr/files/patch-cdpr.c
diff --git a/net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh b/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh
index 04944850c639..04944850c639 100644
--- a/net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh
+++ b/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh
index a3b7bafbcc18..a3b7bafbcc18 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh
index 81d2d1b497a8..81d2d1b497a8 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh
index 73a5b121621e..73a5b121621e 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh
index 301579739cc2..301579739cc2 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh
index 624fd85175ba..624fd85175ba 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh
index d3e1118f829d..d3e1118f829d 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh
index b5352ae38c19..b5352ae38c19 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh
+++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc
index ea5de5ca0d1f..ea5de5ca0d1f 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc
index 06aa42814714..06aa42814714 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc
index 33f4f19ba9d4..33f4f19ba9d4 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc
index 736a89066122..736a89066122 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc
index 87dce681b4f1..87dce681b4f1 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc
index d60c99e2a6b0..d60c99e2a6b0 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc
index e9c91b97b5c6..e9c91b97b5c6 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc
index 85b4536529e8..85b4536529e8 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc
index d9880ef1758e..d9880ef1758e 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc
index 4ac063a72e69..4ac063a72e69 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc
diff --git a/net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y b/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y
index 19f5a595becd..19f5a595becd 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y
+++ b/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y
diff --git a/net-mgmt/cflowd/files/patch-classes::src::Signal.cc b/net-mgmt/cflowd/files/patch-classes__src__Signal.cc
index aafc0dc77f59..aafc0dc77f59 100644
--- a/net-mgmt/cflowd/files/patch-classes::src::Signal.cc
+++ b/net-mgmt/cflowd/files/patch-classes__src__Signal.cc
diff --git a/net-mgmt/confregdecode/files/patch-ab b/net-mgmt/confregdecode/files/patch-Makefile
index 892247713a88..892247713a88 100644
--- a/net-mgmt/confregdecode/files/patch-ab
+++ b/net-mgmt/confregdecode/files/patch-Makefile
diff --git a/net-mgmt/icmpmonitor/Makefile b/net-mgmt/icmpmonitor/Makefile
index 575397a73e52..18fed7ee23c0 100644
--- a/net-mgmt/icmpmonitor/Makefile
+++ b/net-mgmt/icmpmonitor/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiple host icmp monitoring tool
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 
 PLIST_FILES=	man/man1/icmpmonitor.1.gz sbin/icmpmonitor
 
diff --git a/net-mgmt/icmpmonitor/files/patch-aa b/net-mgmt/icmpmonitor/files/patch-icmpmonitor.c
index b13715ae0e7f..b13715ae0e7f 100644
--- a/net-mgmt/icmpmonitor/files/patch-aa
+++ b/net-mgmt/icmpmonitor/files/patch-icmpmonitor.c
diff --git a/net-mgmt/ipaudit/files/patch-src::Makefile b/net-mgmt/ipaudit/files/patch-src__Makefile
index 7024a9dec573..7024a9dec573 100644
--- a/net-mgmt/ipaudit/files/patch-src::Makefile
+++ b/net-mgmt/ipaudit/files/patch-src__Makefile
diff --git a/net-mgmt/ipaudit/files/patch-src::hash.h b/net-mgmt/ipaudit/files/patch-src__hash.h
index ed2cf54dd670..ed2cf54dd670 100644
--- a/net-mgmt/ipaudit/files/patch-src::hash.h
+++ b/net-mgmt/ipaudit/files/patch-src__hash.h
diff --git a/net-mgmt/mrtg-ping-probe/files/patch-ab b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-cfg
index f16832bbc659..f16832bbc659 100644
--- a/net-mgmt/mrtg-ping-probe/files/patch-ab
+++ b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-cfg
diff --git a/net-mgmt/mrtg-ping-probe/files/patch-aa b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
index 600a64ec2fc9..600a64ec2fc9 100644
--- a/net-mgmt/mrtg-ping-probe/files/patch-aa
+++ b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
diff --git a/net-mgmt/netmask/files/patch-aa b/net-mgmt/netmask/files/patch-netmask.c
index f6142c16da70..f6142c16da70 100644
--- a/net-mgmt/netmask/files/patch-aa
+++ b/net-mgmt/netmask/files/patch-netmask.c
diff --git a/net-mgmt/netmask/files/patch-ab b/net-mgmt/netmask/files/patch-netmask.texi
index df6d8e0d8b12..df6d8e0d8b12 100644
--- a/net-mgmt/netmask/files/patch-ab
+++ b/net-mgmt/netmask/files/patch-netmask.texi
diff --git a/net-mgmt/nitpicker/files/patch-ae b/net-mgmt/nitpicker/files/patch-Makefile
index 56f591257d21..56f591257d21 100644
--- a/net-mgmt/nitpicker/files/patch-ae
+++ b/net-mgmt/nitpicker/files/patch-Makefile
diff --git a/net-mgmt/nitpicker/files/patch-aa b/net-mgmt/nitpicker/files/patch-src_Makefile
index bcec6e517d14..bcec6e517d14 100644
--- a/net-mgmt/nitpicker/files/patch-aa
+++ b/net-mgmt/nitpicker/files/patch-src_Makefile
diff --git a/net-mgmt/nitpicker/files/patch-ad b/net-mgmt/nitpicker/files/patch-tools_dumpit_Makefile
index ffb6df2cebc5..ffb6df2cebc5 100644
--- a/net-mgmt/nitpicker/files/patch-ad
+++ b/net-mgmt/nitpicker/files/patch-tools_dumpit_Makefile
diff --git a/net-mgmt/nitpicker/files/patch-ab b/net-mgmt/nitpicker/files/patch-tools_parse_flowfile_src_Makefile_1
index f91dd794e110..f91dd794e110 100644
--- a/net-mgmt/nitpicker/files/patch-ab
+++ b/net-mgmt/nitpicker/files/patch-tools_parse_flowfile_src_Makefile_1
diff --git a/net-mgmt/nitpicker/files/patch-ac b/net-mgmt/nitpicker/files/patch-tools_parse_flowfile_src_Makefile_2
index 13530fd9a5d8..13530fd9a5d8 100644
--- a/net-mgmt/nitpicker/files/patch-ac
+++ b/net-mgmt/nitpicker/files/patch-tools_parse_flowfile_src_Makefile_2
diff --git a/net-mgmt/portmon/files/patch-extras::portmon.8 b/net-mgmt/portmon/files/patch-extras__portmon.8
index 08e061425b9c..08e061425b9c 100644
--- a/net-mgmt/portmon/files/patch-extras::portmon.8
+++ b/net-mgmt/portmon/files/patch-extras__portmon.8
diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc__Makefile.am
index 6a967375cf8d..6a967375cf8d 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
+++ b/net-mgmt/rancid-devel/files/patch-etc__Makefile.am
diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in b/net-mgmt/rancid-devel/files/patch-etc__Makefile.in
index 66e8a0709bb2..66e8a0709bb2 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
+++ b/net-mgmt/rancid-devel/files/patch-etc__Makefile.in
diff --git a/net-mgmt/scli/files/patch-ab b/net-mgmt/scli/files/patch-doc_modes.texinfo
index db0464b514f8..db0464b514f8 100644
--- a/net-mgmt/scli/files/patch-ab
+++ b/net-mgmt/scli/files/patch-doc_modes.texinfo
diff --git a/net-mgmt/scli/files/patch-ac b/net-mgmt/scli/files/patch-doc_scli.texinfo
index d466792c5ff7..d466792c5ff7 100644
--- a/net-mgmt/scli/files/patch-ac
+++ b/net-mgmt/scli/files/patch-doc_scli.texinfo
diff --git a/net-p2p/gnewtellium/files/patch-src::config.c b/net-p2p/gnewtellium/files/patch-src__config.c
index 54d3eba3f8be..54d3eba3f8be 100644
--- a/net-p2p/gnewtellium/files/patch-src::config.c
+++ b/net-p2p/gnewtellium/files/patch-src__config.c
diff --git a/net-p2p/libbt/files/patch-include::util.h b/net-p2p/libbt/files/patch-include__util.h
index 8ad3b431dd7b..8ad3b431dd7b 100644
--- a/net-p2p/libbt/files/patch-include::util.h
+++ b/net-p2p/libbt/files/patch-include__util.h
diff --git a/net-p2p/libbt/files/patch-src::peer.c b/net-p2p/libbt/files/patch-src__peer.c
index 6c2104deda6c..6c2104deda6c 100644
--- a/net-p2p/libbt/files/patch-src::peer.c
+++ b/net-p2p/libbt/files/patch-src__peer.c
diff --git a/net-p2p/napshare/files/patch-ab b/net-p2p/napshare/files/patch-Makefile.in
index a11691a4ff67..a11691a4ff67 100644
--- a/net-p2p/napshare/files/patch-ab
+++ b/net-p2p/napshare/files/patch-Makefile.in
diff --git a/net-p2p/napshare/files/patch-aa b/net-p2p/napshare/files/patch-src_hosts.c
index 9eb943e6f166..9eb943e6f166 100644
--- a/net-p2p/napshare/files/patch-aa
+++ b/net-p2p/napshare/files/patch-src_hosts.c
diff --git a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp b/net/DarwinStreamingServer/files/patch-MP3Broadcaster__BroadcasterMain.cpp
index 8bd95bf27ad5..8bd95bf27ad5 100644
--- a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp
+++ b/net/DarwinStreamingServer/files/patch-MP3Broadcaster__BroadcasterMain.cpp
diff --git a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj__PlaylistBroadcaster.cpp
index 9f119dac5ad4..9f119dac5ad4 100644
--- a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp
+++ b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj__PlaylistBroadcaster.cpp
diff --git a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp b/net/DarwinStreamingServer/files/patch-Server.tproj__main.cpp
index 92f1739f5f12..92f1739f5f12 100644
--- a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
+++ b/net/DarwinStreamingServer/files/patch-Server.tproj__main.cpp
diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin__src__streamingadminserver.pl
index 2d1c9206bbb5..2d1c9206bbb5 100644
--- a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
+++ b/net/DarwinStreamingServer/files/patch-WebAdmin__src__streamingadminserver.pl
diff --git a/net/asterisk/files/patch-agi::Makefile b/net/asterisk/files/patch-agi__Makefile
index 277e18e70b08..277e18e70b08 100644
--- a/net/asterisk/files/patch-agi::Makefile
+++ b/net/asterisk/files/patch-agi__Makefile
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels__Makefile
index 323c78d86f9a..323c78d86f9a 100644
--- a/net/asterisk/files/patch-channels::Makefile
+++ b/net/asterisk/files/patch-channels__Makefile
diff --git a/net/asterisk/files/patch-main::Makefile b/net/asterisk/files/patch-main__Makefile
index 4bb726d70c0f..4bb726d70c0f 100644
--- a/net/asterisk/files/patch-main::Makefile
+++ b/net/asterisk/files/patch-main__Makefile
diff --git a/net/asterisk/files/patch-main::db.c b/net/asterisk/files/patch-main__db.c
index 34c9bd20a8a0..34c9bd20a8a0 100644
--- a/net/asterisk/files/patch-main::db.c
+++ b/net/asterisk/files/patch-main__db.c
diff --git a/net/asterisk/files/patch-main::utils.c b/net/asterisk/files/patch-main__utils.c
index 8b6e268d1cb9..8b6e268d1cb9 100644
--- a/net/asterisk/files/patch-main::utils.c
+++ b/net/asterisk/files/patch-main__utils.c
diff --git a/net/asterisk11/files/patch-agi::Makefile b/net/asterisk11/files/patch-agi__Makefile
index 277e18e70b08..277e18e70b08 100644
--- a/net/asterisk11/files/patch-agi::Makefile
+++ b/net/asterisk11/files/patch-agi__Makefile
diff --git a/net/asterisk11/files/patch-channels::Makefile b/net/asterisk11/files/patch-channels__Makefile
index 323c78d86f9a..323c78d86f9a 100644
--- a/net/asterisk11/files/patch-channels::Makefile
+++ b/net/asterisk11/files/patch-channels__Makefile
diff --git a/net/asterisk11/files/patch-main::utils.c b/net/asterisk11/files/patch-main__utils.c
index 8b6e268d1cb9..8b6e268d1cb9 100644
--- a/net/asterisk11/files/patch-main::utils.c
+++ b/net/asterisk11/files/patch-main__utils.c
diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86__hinst
index 4b452be4dce0..4b452be4dce0 100644
--- a/net/citrix_ica/files/patch-linuxx86::hinst
+++ b/net/citrix_ica/files/patch-linuxx86__hinst
diff --git a/net/freeradius-client/files/patch-lib::config.c b/net/freeradius-client/files/patch-lib__config.c
index 337918e4c654..337918e4c654 100644
--- a/net/freeradius-client/files/patch-lib::config.c
+++ b/net/freeradius-client/files/patch-lib__config.c
diff --git a/net/freeradius-client/files/patch-lib::ip_util.c b/net/freeradius-client/files/patch-lib__ip_util.c
index 657b540fbe95..657b540fbe95 100644
--- a/net/freeradius-client/files/patch-lib::ip_util.c
+++ b/net/freeradius-client/files/patch-lib__ip_util.c
diff --git a/net/freeradius-client/files/patch-lib::options.h b/net/freeradius-client/files/patch-lib__options.h
index 5d2f000fc16c..5d2f000fc16c 100644
--- a/net/freeradius-client/files/patch-lib::options.h
+++ b/net/freeradius-client/files/patch-lib__options.h
diff --git a/net/freeradius-client/files/patch-lib::sendserver.c b/net/freeradius-client/files/patch-lib__sendserver.c
index 5d47a599a085..5d47a599a085 100644
--- a/net/freeradius-client/files/patch-lib::sendserver.c
+++ b/net/freeradius-client/files/patch-lib__sendserver.c
diff --git a/net/gq/files/patch-src::state.c b/net/gq/files/patch-src__state.c
index edc09cdb8360..edc09cdb8360 100644
--- a/net/gq/files/patch-src::state.c
+++ b/net/gq/files/patch-src__state.c
diff --git a/net/l2tpd/files/patch-doc::l2tp-secrets.5 b/net/l2tpd/files/patch-doc__l2tp-secrets.5
index 6495713b7900..6495713b7900 100644
--- a/net/l2tpd/files/patch-doc::l2tp-secrets.5
+++ b/net/l2tpd/files/patch-doc__l2tp-secrets.5
diff --git a/net/l2tpd/files/patch-doc::l2tpd.8 b/net/l2tpd/files/patch-doc__l2tpd.8
index da6d31397b2c..da6d31397b2c 100644
--- a/net/l2tpd/files/patch-doc::l2tpd.8
+++ b/net/l2tpd/files/patch-doc__l2tpd.8
diff --git a/net/l2tpd/files/patch-doc::l2tpd.conf.5 b/net/l2tpd/files/patch-doc__l2tpd.conf.5
index 1b76668b38bb..1b76668b38bb 100644
--- a/net/l2tpd/files/patch-doc::l2tpd.conf.5
+++ b/net/l2tpd/files/patch-doc__l2tpd.conf.5
diff --git a/net/l2tpd/files/patch-doc::l2tpd.conf.sample b/net/l2tpd/files/patch-doc__l2tpd.conf.sample
index 2e4377e31f30..2e4377e31f30 100644
--- a/net/l2tpd/files/patch-doc::l2tpd.conf.sample
+++ b/net/l2tpd/files/patch-doc__l2tpd.conf.sample
diff --git a/net/libsocketcpp/files/patch-src::tcpservertest.cpp b/net/libsocketcpp/files/patch-src__tcpservertest.cpp
index 2dcdfc1a999a..2dcdfc1a999a 100644
--- a/net/libsocketcpp/files/patch-src::tcpservertest.cpp
+++ b/net/libsocketcpp/files/patch-src__tcpservertest.cpp
diff --git a/net/libsocketcpp/files/patch-src::tcpsocket.cpp b/net/libsocketcpp/files/patch-src__tcpsocket.cpp
index 28b819805d55..28b819805d55 100644
--- a/net/libsocketcpp/files/patch-src::tcpsocket.cpp
+++ b/net/libsocketcpp/files/patch-src__tcpsocket.cpp
diff --git a/net/libsocketcpp/files/patch-src::tcptest.cpp b/net/libsocketcpp/files/patch-src__tcptest.cpp
index 6dfa402deb74..6dfa402deb74 100644
--- a/net/libsocketcpp/files/patch-src::tcptest.cpp
+++ b/net/libsocketcpp/files/patch-src__tcptest.cpp
diff --git a/net/libtcp4u/files/patch-Unix::Makefile b/net/libtcp4u/files/patch-Unix__Makefile
index 1754b721ed7b..1754b721ed7b 100644
--- a/net/libtcp4u/files/patch-Unix::Makefile
+++ b/net/libtcp4u/files/patch-Unix__Makefile
diff --git a/net/netdude/files/patch-protocols-ip::nd_ip.c b/net/netdude/files/patch-protocols-ip__nd_ip.c
index 182522670339..182522670339 100644
--- a/net/netdude/files/patch-protocols-ip::nd_ip.c
+++ b/net/netdude/files/patch-protocols-ip__nd_ip.c
diff --git a/net/nocatsplash/files/patch-src::http.c b/net/nocatsplash/files/patch-src__http.c
index fe05e81b9ac9..fe05e81b9ac9 100644
--- a/net/nocatsplash/files/patch-src::http.c
+++ b/net/nocatsplash/files/patch-src__http.c
diff --git a/net/nocatsplash/files/patch-src::splashd.c b/net/nocatsplash/files/patch-src__splashd.c
index a08519c35cff..a08519c35cff 100644
--- a/net/nocatsplash/files/patch-src::splashd.c
+++ b/net/nocatsplash/files/patch-src__splashd.c
diff --git a/net/openldap24-server/files/patch-include::ldap_defaults.h b/net/openldap24-server/files/patch-include__ldap_defaults.h
index 6ea31dbcd65c..6ea31dbcd65c 100644
--- a/net/openldap24-server/files/patch-include::ldap_defaults.h
+++ b/net/openldap24-server/files/patch-include__ldap_defaults.h
diff --git a/net/openldap24-server/files/patch-servers::slapd::Makefile.in b/net/openldap24-server/files/patch-servers__slapd__Makefile.in
index 6444fb575208..6444fb575208 100644
--- a/net/openldap24-server/files/patch-servers::slapd::Makefile.in
+++ b/net/openldap24-server/files/patch-servers__slapd__Makefile.in
diff --git a/net/p5-Net-XWhois/files/patch-examples::whois b/net/p5-Net-XWhois/files/patch-examples__whois
index 5c88382ef704..5c88382ef704 100644
--- a/net/p5-Net-XWhois/files/patch-examples::whois
+++ b/net/p5-Net-XWhois/files/patch-examples__whois
diff --git a/net/p5-Net-XWhois/files/patch-lib::Net::XWhois.pm b/net/p5-Net-XWhois/files/patch-lib__Net__XWhois.pm
index 20e88507110c..20e88507110c 100644
--- a/net/p5-Net-XWhois/files/patch-lib::Net::XWhois.pm
+++ b/net/p5-Net-XWhois/files/patch-lib__Net__XWhois.pm
diff --git a/net/pfinger/files/patch-src::configfile.c b/net/pfinger/files/patch-src__configfile.c
index ebdeeee673e2..ebdeeee673e2 100644
--- a/net/pfinger/files/patch-src::configfile.c
+++ b/net/pfinger/files/patch-src__configfile.c
diff --git a/net/pfinger/files/patch-src::utmplib.c b/net/pfinger/files/patch-src__utmplib.c
index aabfdf62f837..aabfdf62f837 100644
--- a/net/pfinger/files/patch-src::utmplib.c
+++ b/net/pfinger/files/patch-src__utmplib.c
diff --git a/net/portfwd/files/patch-doc::Makefile.in b/net/portfwd/files/patch-doc__Makefile.in
index a0be9053fd18..a0be9053fd18 100644
--- a/net/portfwd/files/patch-doc::Makefile.in
+++ b/net/portfwd/files/patch-doc__Makefile.in
diff --git a/net/pygopherd/files/patch-doc::pygopherd.8 b/net/pygopherd/files/patch-doc__pygopherd.8
index 6c462c896cfe..6c462c896cfe 100644
--- a/net/pygopherd/files/patch-doc::pygopherd.8
+++ b/net/pygopherd/files/patch-doc__pygopherd.8
diff --git a/net/qadsl/files/patch-etc::Makefile.in b/net/qadsl/files/patch-etc__Makefile.in
index e7759548c1b7..e7759548c1b7 100644
--- a/net/qadsl/files/patch-etc::Makefile.in
+++ b/net/qadsl/files/patch-etc__Makefile.in
diff --git a/net/qadsl/files/patch-man::qadsl.8 b/net/qadsl/files/patch-man__qadsl.8
index 6b9a278099c6..6b9a278099c6 100644
--- a/net/qadsl/files/patch-man::qadsl.8
+++ b/net/qadsl/files/patch-man__qadsl.8
diff --git a/net/qadsl/files/patch-man::qadsl.conf.5 b/net/qadsl/files/patch-man__qadsl.conf.5
index 4703815bb0d5..4703815bb0d5 100644
--- a/net/qadsl/files/patch-man::qadsl.conf.5
+++ b/net/qadsl/files/patch-man__qadsl.conf.5
diff --git a/net/qadsl/files/patch-src::http.c b/net/qadsl/files/patch-src__http.c
index bd995479330a..bd995479330a 100644
--- a/net/qadsl/files/patch-src::http.c
+++ b/net/qadsl/files/patch-src__http.c
diff --git a/net/qadsl/files/patch-src::lock.c b/net/qadsl/files/patch-src__lock.c
index bf00326fbb4e..bf00326fbb4e 100644
--- a/net/qadsl/files/patch-src::lock.c
+++ b/net/qadsl/files/patch-src__lock.c
diff --git a/net/qadsl/files/patch-src::log.c b/net/qadsl/files/patch-src__log.c
index face4f2bb455..face4f2bb455 100644
--- a/net/qadsl/files/patch-src::log.c
+++ b/net/qadsl/files/patch-src__log.c
diff --git a/net/rude/files/patch-crude::Makefile.in b/net/rude/files/patch-crude__Makefile.in
index a0075a180071..a0075a180071 100644
--- a/net/rude/files/patch-crude::Makefile.in
+++ b/net/rude/files/patch-crude__Makefile.in
diff --git a/net/rude/files/patch-crude::main.c b/net/rude/files/patch-crude__main.c
index b7b047412909..b7b047412909 100644
--- a/net/rude/files/patch-crude::main.c
+++ b/net/rude/files/patch-crude__main.c
diff --git a/net/rude/files/patch-grude::grude b/net/rude/files/patch-grude__grude
index bc46e52f68d8..bc46e52f68d8 100644
--- a/net/rude/files/patch-grude::grude
+++ b/net/rude/files/patch-grude__grude
diff --git a/net/rude/files/patch-include::rude.h b/net/rude/files/patch-include__rude.h
index 0c89c7c4f599..0c89c7c4f599 100644
--- a/net/rude/files/patch-include::rude.h
+++ b/net/rude/files/patch-include__rude.h
diff --git a/net/rude/files/patch-rude::Makefile.in b/net/rude/files/patch-rude__Makefile.in
index 361cd96a7929..361cd96a7929 100644
--- a/net/rude/files/patch-rude::Makefile.in
+++ b/net/rude/files/patch-rude__Makefile.in
diff --git a/net/rude/files/patch-rude::main.c b/net/rude/files/patch-rude__main.c
index 0f835cd476a8..0f835cd476a8 100644
--- a/net/rude/files/patch-rude::main.c
+++ b/net/rude/files/patch-rude__main.c
diff --git a/net/ser/files/patch-mem::mem.h b/net/ser/files/patch-mem__mem.h
index 81e7c3d59e99..81e7c3d59e99 100644
--- a/net/ser/files/patch-mem::mem.h
+++ b/net/ser/files/patch-mem__mem.h
diff --git a/net/ser/files/patch-modules::acc::acc_mod.c b/net/ser/files/patch-modules__acc__acc_mod.c
index 59df9ddd442d..59df9ddd442d 100644
--- a/net/ser/files/patch-modules::acc::acc_mod.c
+++ b/net/ser/files/patch-modules__acc__acc_mod.c
diff --git a/net/ser/files/patch-modules::acc::etc::radiusclient.conf b/net/ser/files/patch-modules__acc__etc__radiusclient.conf
index 3d13a5648be6..3d13a5648be6 100644
--- a/net/ser/files/patch-modules::acc::etc::radiusclient.conf
+++ b/net/ser/files/patch-modules__acc__etc__radiusclient.conf
diff --git a/net/ser/files/patch-modules::auth::auth_mod.c b/net/ser/files/patch-modules__auth__auth_mod.c
index 2d08c8f5edff..2d08c8f5edff 100644
--- a/net/ser/files/patch-modules::auth::auth_mod.c
+++ b/net/ser/files/patch-modules__auth__auth_mod.c
diff --git a/net/ser/files/patch-modules::auth::auth_mod.h b/net/ser/files/patch-modules__auth__auth_mod.h
index 8d3304af4139..8d3304af4139 100644
--- a/net/ser/files/patch-modules::auth::auth_mod.h
+++ b/net/ser/files/patch-modules__auth__auth_mod.h
diff --git a/net/ser/files/patch-modules::auth::common.c b/net/ser/files/patch-modules__auth__common.c
index d15db240bedc..d15db240bedc 100644
--- a/net/ser/files/patch-modules::auth::common.c
+++ b/net/ser/files/patch-modules__auth__common.c
diff --git a/net/ser/files/patch-modules::auth::doc::auth_user.sgml b/net/ser/files/patch-modules__auth__doc__auth_user.sgml
index c67c487a48e2..c67c487a48e2 100644
--- a/net/ser/files/patch-modules::auth::doc::auth_user.sgml
+++ b/net/ser/files/patch-modules__auth__doc__auth_user.sgml
diff --git a/net/ser/files/patch-modules::auth_radius::authrad_mod.c b/net/ser/files/patch-modules__auth_radius__authrad_mod.c
index faf1196f43ea..faf1196f43ea 100644
--- a/net/ser/files/patch-modules::auth_radius::authrad_mod.c
+++ b/net/ser/files/patch-modules__auth_radius__authrad_mod.c
diff --git a/net/ser/files/patch-modules::check_ua::Makefile b/net/ser/files/patch-modules__check_ua__Makefile
index c851e5e6168f..c851e5e6168f 100644
--- a/net/ser/files/patch-modules::check_ua::Makefile
+++ b/net/ser/files/patch-modules__check_ua__Makefile
diff --git a/net/ser/files/patch-modules::check_ua::check_ua.c b/net/ser/files/patch-modules__check_ua__check_ua.c
index 2b70a6d83c8d..2b70a6d83c8d 100644
--- a/net/ser/files/patch-modules::check_ua::check_ua.c
+++ b/net/ser/files/patch-modules__check_ua__check_ua.c
diff --git a/net/ser/files/patch-modules::check_ua::tailq.h b/net/ser/files/patch-modules__check_ua__tailq.h
index 3e713ea72af8..3e713ea72af8 100644
--- a/net/ser/files/patch-modules::check_ua::tailq.h
+++ b/net/ser/files/patch-modules__check_ua__tailq.h
diff --git a/net/ser/files/patch-modules::group_radius::grouprad_mod.c b/net/ser/files/patch-modules__group_radius__grouprad_mod.c
index 51da6a47c822..51da6a47c822 100644
--- a/net/ser/files/patch-modules::group_radius::grouprad_mod.c
+++ b/net/ser/files/patch-modules__group_radius__grouprad_mod.c
diff --git a/net/ser/files/patch-modules::mysql::my_con.c b/net/ser/files/patch-modules__mysql__my_con.c
index 50c1d6070e42..50c1d6070e42 100644
--- a/net/ser/files/patch-modules::mysql::my_con.c
+++ b/net/ser/files/patch-modules__mysql__my_con.c
diff --git a/net/ser/files/patch-modules::nathelper::moh.c b/net/ser/files/patch-modules__nathelper__moh.c
index 5c8ae4f33059..5c8ae4f33059 100644
--- a/net/ser/files/patch-modules::nathelper::moh.c
+++ b/net/ser/files/patch-modules__nathelper__moh.c
diff --git a/net/ser/files/patch-modules::nathelper::nathelper.c b/net/ser/files/patch-modules__nathelper__nathelper.c
index d85865e0eaa0..d85865e0eaa0 100644
--- a/net/ser/files/patch-modules::nathelper::nathelper.c
+++ b/net/ser/files/patch-modules__nathelper__nathelper.c
diff --git a/net/ser/files/patch-modules::nathelper::nathelper.h b/net/ser/files/patch-modules__nathelper__nathelper.h
index e47acf6edf18..e47acf6edf18 100644
--- a/net/ser/files/patch-modules::nathelper::nathelper.h
+++ b/net/ser/files/patch-modules__nathelper__nathelper.h
diff --git a/net/ser/files/patch-modules::nathelper::natping.c b/net/ser/files/patch-modules__nathelper__natping.c
index ecd5ec1b0f3a..ecd5ec1b0f3a 100644
--- a/net/ser/files/patch-modules::nathelper::natping.c
+++ b/net/ser/files/patch-modules__nathelper__natping.c
diff --git a/net/ser/files/patch-modules::postgres::db_val.c b/net/ser/files/patch-modules__postgres__db_val.c
index 5cbb27866ac7..5cbb27866ac7 100644
--- a/net/ser/files/patch-modules::postgres::db_val.c
+++ b/net/ser/files/patch-modules__postgres__db_val.c
diff --git a/net/ser/files/patch-modules::postgres::dbase.c b/net/ser/files/patch-modules__postgres__dbase.c
index dfdc17ff258e..dfdc17ff258e 100644
--- a/net/ser/files/patch-modules::postgres::dbase.c
+++ b/net/ser/files/patch-modules__postgres__dbase.c
diff --git a/net/ser/files/patch-modules::registrar::doc::registrar_user.sgml b/net/ser/files/patch-modules__registrar__doc__registrar_user.sgml
index 24ba9046222b..24ba9046222b 100644
--- a/net/ser/files/patch-modules::registrar::doc::registrar_user.sgml
+++ b/net/ser/files/patch-modules__registrar__doc__registrar_user.sgml
diff --git a/net/ser/files/patch-modules::registrar::reg_mod.c b/net/ser/files/patch-modules__registrar__reg_mod.c
index 14d4f5629dc8..14d4f5629dc8 100644
--- a/net/ser/files/patch-modules::registrar::reg_mod.c
+++ b/net/ser/files/patch-modules__registrar__reg_mod.c
diff --git a/net/ser/files/patch-modules::registrar::reg_mod.h b/net/ser/files/patch-modules__registrar__reg_mod.h
index 6e2dfdd85859..6e2dfdd85859 100644
--- a/net/ser/files/patch-modules::registrar::reg_mod.h
+++ b/net/ser/files/patch-modules__registrar__reg_mod.h
diff --git a/net/ser/files/patch-modules::registrar::reply.c b/net/ser/files/patch-modules__registrar__reply.c
index f48757ecf6ce..f48757ecf6ce 100644
--- a/net/ser/files/patch-modules::registrar::reply.c
+++ b/net/ser/files/patch-modules__registrar__reply.c
diff --git a/net/ser/files/patch-modules::tm::t_lookup.c b/net/ser/files/patch-modules__tm__t_lookup.c
index 18a3ddf1abf4..18a3ddf1abf4 100644
--- a/net/ser/files/patch-modules::tm::t_lookup.c
+++ b/net/ser/files/patch-modules__tm__t_lookup.c
diff --git a/net/ser/files/patch-modules::tm::t_msgbuilder.c b/net/ser/files/patch-modules__tm__t_msgbuilder.c
index 159c904895dd..159c904895dd 100644
--- a/net/ser/files/patch-modules::tm::t_msgbuilder.c
+++ b/net/ser/files/patch-modules__tm__t_msgbuilder.c
diff --git a/net/ser/files/patch-modules::uri_radius::urirad_mod.c b/net/ser/files/patch-modules__uri_radius__urirad_mod.c
index dcb04ae5aa28..dcb04ae5aa28 100644
--- a/net/ser/files/patch-modules::uri_radius::urirad_mod.c
+++ b/net/ser/files/patch-modules__uri_radius__urirad_mod.c
diff --git a/net/ser/files/patch-modules::usrloc::urecord.c b/net/ser/files/patch-modules__usrloc__urecord.c
index 33be6b49cd95..33be6b49cd95 100644
--- a/net/ser/files/patch-modules::usrloc::urecord.c
+++ b/net/ser/files/patch-modules__usrloc__urecord.c
diff --git a/net/ser/files/patch-parser::msg_parser.h b/net/ser/files/patch-parser__msg_parser.h
index 56625ccee28c..56625ccee28c 100644
--- a/net/ser/files/patch-parser::msg_parser.h
+++ b/net/ser/files/patch-parser__msg_parser.h
diff --git a/net/ser/files/patch-parser::parse_hostport.c b/net/ser/files/patch-parser__parse_hostport.c
index b00d03bd6219..b00d03bd6219 100644
--- a/net/ser/files/patch-parser::parse_hostport.c
+++ b/net/ser/files/patch-parser__parse_hostport.c
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf
index 99b35a2822f4..99b35a2822f4 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf b/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf
index 1aaf39698bcb..1aaf39698bcb 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def
index 79c1e70adfbf..79c1e70adfbf 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def
diff --git a/net/tightvnc/files/patch-Xvnc::config::imake::imakemdep.h b/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h
index 1aaeade24b1f..1aaeade24b1f 100644
--- a/net/tightvnc/files/patch-Xvnc::config::imake::imakemdep.h
+++ b/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h
diff --git a/net/tightvnc/files/patch-Xvnc::include::Xos.h b/net/tightvnc/files/patch-Xvnc__include__Xos.h
index e843b940fc00..e843b940fc00 100644
--- a/net/tightvnc/files/patch-Xvnc::include::Xos.h
+++ b/net/tightvnc/files/patch-Xvnc__include__Xos.h
diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
index 26bd2d6f5e73..26bd2d6f5e73 100644
--- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
index 42fc342840c6..42fc342840c6 100644
--- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::Imakefile b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile
index e2c803c61be1..e2c803c61be1 100644
--- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::Imakefile
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile
diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c
index 820b5ccac84f..820b5ccac84f 100644
--- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c
diff --git a/net/tightvnc/files/patch-vncviewer::Imakefile b/net/tightvnc/files/patch-vncviewer__Imakefile
index 0cf49c07a7c0..0cf49c07a7c0 100644
--- a/net/tightvnc/files/patch-vncviewer::Imakefile
+++ b/net/tightvnc/files/patch-vncviewer__Imakefile
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf b/net/tridiavnc/files/patch-Xvnc__config__cf__Imake.cf
index 65bdc1a4dd2d..65bdc1a4dd2d 100644
--- a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf
+++ b/net/tridiavnc/files/patch-Xvnc__config__cf__Imake.cf
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl b/net/tridiavnc/files/patch-Xvnc__config__cf__Imake.tmpl
index 0ce721d855ac..0ce721d855ac 100644
--- a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl
+++ b/net/tridiavnc/files/patch-Xvnc__config__cf__Imake.tmpl
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tridiavnc/files/patch-Xvnc__config__cf__vnclibs.def
index fd93bb5d35dd..fd93bb5d35dd 100644
--- a/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def
+++ b/net/tridiavnc/files/patch-Xvnc__config__cf__vnclibs.def
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf b/net/tridiavnc/files/patch-Xvnc__config__cf__xfree86.cf
index 5a19e04ef80d..5a19e04ef80d 100644
--- a/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf
+++ b/net/tridiavnc/files/patch-Xvnc__config__cf__xfree86.cf
diff --git a/net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h b/net/tridiavnc/files/patch-Xvnc__config__imake__imakemdep.h
index cc31a339f11d..cc31a339f11d 100644
--- a/net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h
+++ b/net/tridiavnc/files/patch-Xvnc__config__imake__imakemdep.h
diff --git a/net/tridiavnc/files/patch-Xvnc::include::Xos.h b/net/tridiavnc/files/patch-Xvnc__include__Xos.h
index 3ea59e29a87f..3ea59e29a87f 100644
--- a/net/tridiavnc/files/patch-Xvnc::include::Xos.h
+++ b/net/tridiavnc/files/patch-Xvnc__include__Xos.h
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
index 12392d7656a2..12392d7656a2 100644
--- a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
+++ b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__hw__vnc__rfb.h
index e09799ea6dcf..e09799ea6dcf 100644
--- a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h
+++ b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__hw__vnc__rfb.h
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
index 7e555741b9a6..7e555741b9a6 100644
--- a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
+++ b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
diff --git a/net/tridiavnc/files/patch-vncviewer::Imakefile b/net/tridiavnc/files/patch-vncviewer__Imakefile
index 077ad0a1cbe8..077ad0a1cbe8 100644
--- a/net/tridiavnc/files/patch-vncviewer::Imakefile
+++ b/net/tridiavnc/files/patch-vncviewer__Imakefile
diff --git a/net/vde/files/patch-qemu::Makefile b/net/vde/files/patch-qemu__Makefile
index 5ee3bbcf8e92..5ee3bbcf8e92 100644
--- a/net/vde/files/patch-qemu::Makefile
+++ b/net/vde/files/patch-qemu__Makefile
diff --git a/net/vde/files/patch-qemu::vdeq.c b/net/vde/files/patch-qemu__vdeq.c
index 9c34761c145e..9c34761c145e 100644
--- a/net/vde/files/patch-qemu::vdeq.c
+++ b/net/vde/files/patch-qemu__vdeq.c
diff --git a/net/vde/files/patch-slirpvde::Makefile b/net/vde/files/patch-slirpvde__Makefile
index c7ac0e723503..c7ac0e723503 100644
--- a/net/vde/files/patch-slirpvde::Makefile
+++ b/net/vde/files/patch-slirpvde__Makefile
diff --git a/net/vde/files/patch-slirpvde::ip.h b/net/vde/files/patch-slirpvde__ip.h
index 7f19d53739d6..7f19d53739d6 100644
--- a/net/vde/files/patch-slirpvde::ip.h
+++ b/net/vde/files/patch-slirpvde__ip.h
diff --git a/net/vde/files/patch-slirpvde::libslirp.h b/net/vde/files/patch-slirpvde__libslirp.h
index b8a62739b93f..b8a62739b93f 100644
--- a/net/vde/files/patch-slirpvde::libslirp.h
+++ b/net/vde/files/patch-slirpvde__libslirp.h
diff --git a/net/vde/files/patch-slirpvde::slirp_config.h b/net/vde/files/patch-slirpvde__slirp_config.h
index dfd1288b6c2e..dfd1288b6c2e 100644
--- a/net/vde/files/patch-slirpvde::slirp_config.h
+++ b/net/vde/files/patch-slirpvde__slirp_config.h
diff --git a/net/vde/files/patch-slirpvde::slirpvde.c b/net/vde/files/patch-slirpvde__slirpvde.c
index f76790701b07..f76790701b07 100644
--- a/net/vde/files/patch-slirpvde::slirpvde.c
+++ b/net/vde/files/patch-slirpvde__slirpvde.c
diff --git a/net/vde/files/patch-slirpvde::tcp.h b/net/vde/files/patch-slirpvde__tcp.h
index 1dade2d0986c..1dade2d0986c 100644
--- a/net/vde/files/patch-slirpvde::tcp.h
+++ b/net/vde/files/patch-slirpvde__tcp.h
diff --git a/net/vde/files/patch-vdetaplib::Makefile b/net/vde/files/patch-vdetaplib__Makefile
index ff72703ce702..ff72703ce702 100644
--- a/net/vde/files/patch-vdetaplib::Makefile
+++ b/net/vde/files/patch-vdetaplib__Makefile
diff --git a/net/vde/files/patch-vdetaplib::libvdetap.c b/net/vde/files/patch-vdetaplib__libvdetap.c
index 7c304913b035..7c304913b035 100644
--- a/net/vde/files/patch-vdetaplib::libvdetap.c
+++ b/net/vde/files/patch-vdetaplib__libvdetap.c
diff --git a/net/vde/files/patch-vdetaplib::test.c b/net/vde/files/patch-vdetaplib__test.c
index d26ffa326253..d26ffa326253 100644
--- a/net/vde/files/patch-vdetaplib::test.c
+++ b/net/vde/files/patch-vdetaplib__test.c
diff --git a/net/vde/files/patch-vdetaplib::vdetap.c b/net/vde/files/patch-vdetaplib__vdetap.c
index 3e5ded1cc07b..3e5ded1cc07b 100644
--- a/net/vde/files/patch-vdetaplib::vdetap.c
+++ b/net/vde/files/patch-vdetaplib__vdetap.c
diff --git a/net/yaph/files/patch-::config.h.in b/net/yaph/files/patch-__config.h.in
index 33ccc45e7027..33ccc45e7027 100644
--- a/net/yaph/files/patch-::config.h.in
+++ b/net/yaph/files/patch-__config.h.in
diff --git a/net/yaph/files/patch-::configure b/net/yaph/files/patch-__configure
index 6a1e88203f5a..6a1e88203f5a 100644
--- a/net/yaph/files/patch-::configure
+++ b/net/yaph/files/patch-__configure
diff --git a/net/yaph/files/patch-yaph::includes.h b/net/yaph/files/patch-yaph__includes.h
index e3bfc1d54292..e3bfc1d54292 100644
--- a/net/yaph/files/patch-yaph::includes.h
+++ b/net/yaph/files/patch-yaph__includes.h
diff --git a/net/yaph/files/patch-yaph::init.c b/net/yaph/files/patch-yaph__init.c
index 2868cbb32b81..2868cbb32b81 100644
--- a/net/yaph/files/patch-yaph::init.c
+++ b/net/yaph/files/patch-yaph__init.c
diff --git a/net/yptransitd/files/patch-src::confparse.y b/net/yptransitd/files/patch-src__confparse.y
index 295f15d1f967..295f15d1f967 100644
--- a/net/yptransitd/files/patch-src::confparse.y
+++ b/net/yptransitd/files/patch-src__confparse.y
diff --git a/net/yptransitd/files/patch-src::log.c b/net/yptransitd/files/patch-src__log.c
index d670d2f8e8fc..d670d2f8e8fc 100644
--- a/net/yptransitd/files/patch-src::log.c
+++ b/net/yptransitd/files/patch-src__log.c
diff --git a/news/husky-fidoconf-devel/files/patch-doc::Makefile b/news/husky-fidoconf-devel/files/patch-doc__Makefile
index 49145a202f3c..49145a202f3c 100644
--- a/news/husky-fidoconf-devel/files/patch-doc::Makefile
+++ b/news/husky-fidoconf-devel/files/patch-doc__Makefile
diff --git a/news/husky-fidoconf-devel/files/patch-man::Makefile b/news/husky-fidoconf-devel/files/patch-man__Makefile
index 1cd2d80c8698..1cd2d80c8698 100644
--- a/news/husky-fidoconf-devel/files/patch-man::Makefile
+++ b/news/husky-fidoconf-devel/files/patch-man__Makefile
diff --git a/news/husky-fidoconf-devel/files/patch-man::linkedto.1 b/news/husky-fidoconf-devel/files/patch-man__linkedto.1
index 6889e664cc9d..6889e664cc9d 100644
--- a/news/husky-fidoconf-devel/files/patch-man::linkedto.1
+++ b/news/husky-fidoconf-devel/files/patch-man__linkedto.1
diff --git a/news/husky-fidoconf/files/patch-doc::Makefile b/news/husky-fidoconf/files/patch-doc__Makefile
index fcc92c4b3050..fcc92c4b3050 100644
--- a/news/husky-fidoconf/files/patch-doc::Makefile
+++ b/news/husky-fidoconf/files/patch-doc__Makefile
diff --git a/news/husky-fidoconf/files/patch-man::linkedto.1 b/news/husky-fidoconf/files/patch-man__linkedto.1
index 6889e664cc9d..6889e664cc9d 100644
--- a/news/husky-fidoconf/files/patch-man::linkedto.1
+++ b/news/husky-fidoconf/files/patch-man__linkedto.1
diff --git a/news/husky-hpt-devel/files/patch-doc::Makefile b/news/husky-hpt-devel/files/patch-doc__Makefile
index 892cb45eb8ba..892cb45eb8ba 100644
--- a/news/husky-hpt-devel/files/patch-doc::Makefile
+++ b/news/husky-hpt-devel/files/patch-doc__Makefile
diff --git a/news/husky-hpt/files/patch-doc::Makefile b/news/husky-hpt/files/patch-doc__Makefile
index 25d8a1f819ed..25d8a1f819ed 100644
--- a/news/husky-hpt/files/patch-doc::Makefile
+++ b/news/husky-hpt/files/patch-doc__Makefile
diff --git a/news/husky-htick-devel/files/patch-doc::Makefile b/news/husky-htick-devel/files/patch-doc__Makefile
index 9c47bae730d7..9c47bae730d7 100644
--- a/news/husky-htick-devel/files/patch-doc::Makefile
+++ b/news/husky-htick-devel/files/patch-doc__Makefile
diff --git a/news/husky-htick/files/patch-doc::Makefile b/news/husky-htick/files/patch-doc__Makefile
index c34d627b865b..c34d627b865b 100644
--- a/news/husky-htick/files/patch-doc::Makefile
+++ b/news/husky-htick/files/patch-doc__Makefile
diff --git a/news/newspost/files/patch-base::socket.c b/news/newspost/files/patch-base__socket.c
index d7dbf7b75d6b..d7dbf7b75d6b 100644
--- a/news/newspost/files/patch-base::socket.c
+++ b/news/newspost/files/patch-base__socket.c
diff --git a/news/noffle/files/patch-src::client.c b/news/noffle/files/patch-src__client.c
index eb40947712b4..eb40947712b4 100644
--- a/news/noffle/files/patch-src::client.c
+++ b/news/noffle/files/patch-src__client.c
diff --git a/news/yencode/files/patch-lib::Makefile.in b/news/yencode/files/patch-lib__Makefile.in
index 320118e11668..320118e11668 100644
--- a/news/yencode/files/patch-lib::Makefile.in
+++ b/news/yencode/files/patch-lib__Makefile.in
diff --git a/palm/libmal/files/patch-malsync::mal::client::unix::MAL31DBConfig.c b/palm/libmal/files/patch-malsync__mal__client__unix__MAL31DBConfig.c
index 632abf83d515..632abf83d515 100644
--- a/palm/libmal/files/patch-malsync::mal::client::unix::MAL31DBConfig.c
+++ b/palm/libmal/files/patch-malsync__mal__client__unix__MAL31DBConfig.c
diff --git a/ports-mgmt/bpm/files/patch-src::refresh.c b/ports-mgmt/bpm/files/patch-src__refresh.c
index 9214865d503d..9214865d503d 100644
--- a/ports-mgmt/bpm/files/patch-src::refresh.c
+++ b/ports-mgmt/bpm/files/patch-src__refresh.c
diff --git a/print/freetype/files/patch-lib::arch::unix::Makefile.in b/print/freetype/files/patch-lib__arch__unix__Makefile.in
index a97729fb0760..a97729fb0760 100644
--- a/print/freetype/files/patch-lib::arch::unix::Makefile.in
+++ b/print/freetype/files/patch-lib__arch__unix__Makefile.in
diff --git a/print/gribouy/files/patch-src::gribouy-curve.c b/print/gribouy/files/patch-src__gribouy-curve.c
index ff1888fb3525..ff1888fb3525 100644
--- a/print/gribouy/files/patch-src::gribouy-curve.c
+++ b/print/gribouy/files/patch-src__gribouy-curve.c
diff --git a/print/gribouy/files/patch-src::gribouy-main.c b/print/gribouy/files/patch-src__gribouy-main.c
index fc24fea27562..fc24fea27562 100644
--- a/print/gribouy/files/patch-src::gribouy-main.c
+++ b/print/gribouy/files/patch-src__gribouy-main.c
diff --git a/print/magicfilter/files/patch-file::file.c b/print/magicfilter/files/patch-file__file.c
index 4a377f9ed4c8..4a377f9ed4c8 100644
--- a/print/magicfilter/files/patch-file::file.c
+++ b/print/magicfilter/files/patch-file__file.c
diff --git a/print/mup/files/patch-mup::grpsyl.c b/print/mup/files/patch-mup__grpsyl.c
index b43c7e4070be..b43c7e4070be 100644
--- a/print/mup/files/patch-mup::grpsyl.c
+++ b/print/mup/files/patch-mup__grpsyl.c
diff --git a/print/mup/files/patch-mupdisp::dispttyp.h b/print/mup/files/patch-mupdisp__dispttyp.h
index 3904bf0268ad..3904bf0268ad 100644
--- a/print/mup/files/patch-mupdisp::dispttyp.h
+++ b/print/mup/files/patch-mupdisp__dispttyp.h
diff --git a/print/mup/files/patch-mupdisp::mupdisp.c b/print/mup/files/patch-mupdisp__mupdisp.c
index 0b51e3b452c1..0b51e3b452c1 100644
--- a/print/mup/files/patch-mupdisp::mupdisp.c
+++ b/print/mup/files/patch-mupdisp__mupdisp.c
diff --git a/print/mup/files/patch-mupdisp::mupdisp.h b/print/mup/files/patch-mupdisp__mupdisp.h
index bf8350db6af4..bf8350db6af4 100644
--- a/print/mup/files/patch-mupdisp::mupdisp.h
+++ b/print/mup/files/patch-mupdisp__mupdisp.h
diff --git a/science/getdp/files/patch-doc::texinfo::texinfo.tex b/science/getdp/files/patch-doc__texinfo__texinfo.tex
index b8d8a16c8b3c..b8d8a16c8b3c 100644
--- a/science/getdp/files/patch-doc::texinfo::texinfo.tex
+++ b/science/getdp/files/patch-doc__texinfo__texinfo.tex
diff --git a/science/mpqc/files/patch-::configure.in b/science/mpqc/files/patch-__configure.in
index f3d3b70bc7e6..f3d3b70bc7e6 100644
--- a/science/mpqc/files/patch-::configure.in
+++ b/science/mpqc/files/patch-__configure.in
diff --git a/science/mpqc/files/patch-misc::scint.h b/science/mpqc/files/patch-misc__scint.h
index 87e80e523713..87e80e523713 100644
--- a/science/mpqc/files/patch-misc::scint.h
+++ b/science/mpqc/files/patch-misc__scint.h
diff --git a/science/mpqc/files/patch-symmetry::pointgrp.cc b/science/mpqc/files/patch-symmetry__pointgrp.cc
index 2a5f8722f240..2a5f8722f240 100644
--- a/science/mpqc/files/patch-symmetry::pointgrp.cc
+++ b/science/mpqc/files/patch-symmetry__pointgrp.cc
diff --git a/security/bfbtester/files/patch-src::bfbt::exec.c b/security/bfbtester/files/patch-src__bfbt__exec.c
index de43066f9b9a..de43066f9b9a 100644
--- a/security/bfbtester/files/patch-src::bfbt::exec.c
+++ b/security/bfbtester/files/patch-src__bfbt__exec.c
diff --git a/security/courier-authlib/files/patch-liblock::locktest.c b/security/courier-authlib/files/patch-liblock__locktest.c
index 3f77f4b30a26..3f77f4b30a26 100644
--- a/security/courier-authlib/files/patch-liblock::locktest.c
+++ b/security/courier-authlib/files/patch-liblock__locktest.c
diff --git a/security/courier-authlib/files/patch-userdb::pw2userdb.in b/security/courier-authlib/files/patch-userdb__pw2userdb.in
index 7cb79aa49b02..7cb79aa49b02 100644
--- a/security/courier-authlib/files/patch-userdb::pw2userdb.in
+++ b/security/courier-authlib/files/patch-userdb__pw2userdb.in
diff --git a/security/cyrus-sasl2/files/patch-include::sasl.h b/security/cyrus-sasl2/files/patch-include__sasl.h
index 8647ba06a5c2..8647ba06a5c2 100644
--- a/security/cyrus-sasl2/files/patch-include::sasl.h
+++ b/security/cyrus-sasl2/files/patch-include__sasl.h
diff --git a/security/cyrus-sasl2/files/patch-plugins::ldapdb.c b/security/cyrus-sasl2/files/patch-plugins__ldapdb.c
index 23a7df8b3a57..23a7df8b3a57 100644
--- a/security/cyrus-sasl2/files/patch-plugins::ldapdb.c
+++ b/security/cyrus-sasl2/files/patch-plugins__ldapdb.c
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
index df4ecbb209a2..df4ecbb209a2 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
+++ b/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd__configure
index f7dbb286e9d4..f7dbb286e9d4 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd__configure
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c b/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c
index 7de41fe20d25..7de41fe20d25 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c
+++ b/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c
diff --git a/security/ftimes/files/patch-etc::xmagic::xmagic.base b/security/ftimes/files/patch-etc__xmagic__xmagic.base
index c19e01bf0ab2..c19e01bf0ab2 100644
--- a/security/ftimes/files/patch-etc::xmagic::xmagic.base
+++ b/security/ftimes/files/patch-etc__xmagic__xmagic.base
diff --git a/security/isakmpd/files/patch-samples::Makefile b/security/isakmpd/files/patch-samples__Makefile
index 516941d79013..516941d79013 100644
--- a/security/isakmpd/files/patch-samples::Makefile
+++ b/security/isakmpd/files/patch-samples__Makefile
diff --git a/security/p5-Authen-Smb/files/patch-smbval::smbencrypt.c b/security/p5-Authen-Smb/files/patch-smbval__smbencrypt.c
index 6b41d46e0406..6b41d46e0406 100644
--- a/security/p5-Authen-Smb/files/patch-smbval::smbencrypt.c
+++ b/security/p5-Authen-Smb/files/patch-smbval__smbencrypt.c
diff --git a/security/p5-Crypt-OpenSSL-DSA/files/patch-lib::Crypt::OpenSSL::DSA.pm b/security/p5-Crypt-OpenSSL-DSA/files/patch-lib__Crypt__OpenSSL__DSA.pm
index 970776000954..970776000954 100644
--- a/security/p5-Crypt-OpenSSL-DSA/files/patch-lib::Crypt::OpenSSL::DSA.pm
+++ b/security/p5-Crypt-OpenSSL-DSA/files/patch-lib__Crypt__OpenSSL__DSA.pm
diff --git a/security/tinyca/files/patch-lib::CA.pm b/security/tinyca/files/patch-lib__CA.pm
index 9d490e3c5a55..9d490e3c5a55 100644
--- a/security/tinyca/files/patch-lib::CA.pm
+++ b/security/tinyca/files/patch-lib__CA.pm
diff --git a/security/tripwire/files/patch-install::install.cfg b/security/tripwire/files/patch-install__install.cfg
index e60e9edb0db8..e60e9edb0db8 100644
--- a/security/tripwire/files/patch-install::install.cfg
+++ b/security/tripwire/files/patch-install__install.cfg
diff --git a/security/tripwire/files/patch-man::man4::twconfig.4 b/security/tripwire/files/patch-man__man4__twconfig.4
index 409f5190bf6e..409f5190bf6e 100644
--- a/security/tripwire/files/patch-man::man4::twconfig.4
+++ b/security/tripwire/files/patch-man__man4__twconfig.4
diff --git a/security/tripwire/files/patch-man::man4::twpolicy.4 b/security/tripwire/files/patch-man__man4__twpolicy.4
index 0d6ab39a39dd..0d6ab39a39dd 100644
--- a/security/tripwire/files/patch-man::man4::twpolicy.4
+++ b/security/tripwire/files/patch-man__man4__twpolicy.4
diff --git a/security/tripwire/files/patch-man::man5::Makefile.in b/security/tripwire/files/patch-man__man5__Makefile.in
index 1ca27b160c59..1ca27b160c59 100644
--- a/security/tripwire/files/patch-man::man5::Makefile.in
+++ b/security/tripwire/files/patch-man__man5__Makefile.in
diff --git a/security/tripwire/files/patch-man::man::Makefile.in b/security/tripwire/files/patch-man__man__Makefile.in
index 6c890a92e7bc..6c890a92e7bc 100644
--- a/security/tripwire/files/patch-man::man::Makefile.in
+++ b/security/tripwire/files/patch-man__man__Makefile.in
diff --git a/security/tripwire/files/patch-src::core::msystem.h b/security/tripwire/files/patch-src__core__msystem.h
index 1bb9e29934e2..1bb9e29934e2 100644
--- a/security/tripwire/files/patch-src::core::msystem.h
+++ b/security/tripwire/files/patch-src__core__msystem.h
diff --git a/security/unicornscan/files/patch-libs::Makefile b/security/unicornscan/files/patch-libs__Makefile
index ee72e98bea78..ee72e98bea78 100644
--- a/security/unicornscan/files/patch-libs::Makefile
+++ b/security/unicornscan/files/patch-libs__Makefile
diff --git a/security/unicornscan/files/patch-src::Makefile b/security/unicornscan/files/patch-src__Makefile
index 4657bc84d3dc..4657bc84d3dc 100644
--- a/security/unicornscan/files/patch-src::Makefile
+++ b/security/unicornscan/files/patch-src__Makefile
diff --git a/security/unicornscan/files/patch-src::Makefile.inc b/security/unicornscan/files/patch-src__Makefile.inc
index f075f850d900..f075f850d900 100644
--- a/security/unicornscan/files/patch-src::Makefile.inc
+++ b/security/unicornscan/files/patch-src__Makefile.inc
diff --git a/security/unicornscan/files/patch-src::config.h b/security/unicornscan/files/patch-src__config.h
index e9e452f4a8cb..e9e452f4a8cb 100644
--- a/security/unicornscan/files/patch-src::config.h
+++ b/security/unicornscan/files/patch-src__config.h
diff --git a/security/xinetd/files/patch-xinetd::builtins.c b/security/xinetd/files/patch-xinetd__builtins.c
index 49e31e8fce2c..49e31e8fce2c 100644
--- a/security/xinetd/files/patch-xinetd::builtins.c
+++ b/security/xinetd/files/patch-xinetd__builtins.c
diff --git a/security/xinetd/files/patch-xinetd::xconfig.h b/security/xinetd/files/patch-xinetd__xconfig.h
index 2f25829c7be8..2f25829c7be8 100644
--- a/security/xinetd/files/patch-xinetd::xconfig.h
+++ b/security/xinetd/files/patch-xinetd__xconfig.h
diff --git a/sysutils/adtool/files/patch-src::tools::Makefile.in b/sysutils/adtool/files/patch-src__tools__Makefile.in
index 1bc038c40742..1bc038c40742 100644
--- a/sysutils/adtool/files/patch-src::tools::Makefile.in
+++ b/sysutils/adtool/files/patch-src__tools__Makefile.in
diff --git a/sysutils/ah-tty/files/patch-include::LDL.h b/sysutils/ah-tty/files/patch-include__LDL.h
index f66c552369cc..f66c552369cc 100644
--- a/sysutils/ah-tty/files/patch-include::LDL.h
+++ b/sysutils/ah-tty/files/patch-include__LDL.h
diff --git a/sysutils/cdrdao/files/patch-dao::cdrdao.man b/sysutils/cdrdao/files/patch-dao__cdrdao.man
index 3fccc147cc37..3fccc147cc37 100644
--- a/sysutils/cdrdao/files/patch-dao::cdrdao.man
+++ b/sysutils/cdrdao/files/patch-dao__cdrdao.man
diff --git a/sysutils/cdrdao/files/patch-dao::main.cc b/sysutils/cdrdao/files/patch-dao__main.cc
index 01782c823acb..01782c823acb 100644
--- a/sysutils/cdrdao/files/patch-dao::main.cc
+++ b/sysutils/cdrdao/files/patch-dao__main.cc
diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul
index e63ce76c6b21..e63ce76c6b21 100644
--- a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
+++ b/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul
diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc b/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc
index 1134a8b59a9f..1134a8b59a9f 100644
--- a/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc
+++ b/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc
diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc b/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc
index 6647a3309f0d..6647a3309f0d 100644
--- a/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc
+++ b/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc
diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc b/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc
index 2e5bde7b6ebc..2e5bde7b6ebc 100644
--- a/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc
+++ b/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc
diff --git a/sysutils/heirloom/files/patch-build::mk.config b/sysutils/heirloom/files/patch-build__mk.config
index 2223817c89b7..2223817c89b7 100644
--- a/sysutils/heirloom/files/patch-build::mk.config
+++ b/sysutils/heirloom/files/patch-build__mk.config
diff --git a/sysutils/heirloom/files/patch-man::man.dfl.in b/sysutils/heirloom/files/patch-man__man.dfl.in
index 5b58aac5b0d3..5b58aac5b0d3 100644
--- a/sysutils/heirloom/files/patch-man::man.dfl.in
+++ b/sysutils/heirloom/files/patch-man__man.dfl.in
diff --git a/sysutils/heirloom/files/patch-ps::ps.c b/sysutils/heirloom/files/patch-ps__ps.c
index adba8e5dcc85..adba8e5dcc85 100644
--- a/sysutils/heirloom/files/patch-ps::ps.c
+++ b/sysutils/heirloom/files/patch-ps__ps.c
diff --git a/sysutils/heirloom/files/patch-stty::stty.c b/sysutils/heirloom/files/patch-stty__stty.c
index 636eb2250fb2..636eb2250fb2 100644
--- a/sysutils/heirloom/files/patch-stty::stty.c
+++ b/sysutils/heirloom/files/patch-stty__stty.c
diff --git a/sysutils/heirloom/files/patch-su::su.dfl.in b/sysutils/heirloom/files/patch-su__su.dfl.in
index c7ee4dc5ff47..c7ee4dc5ff47 100644
--- a/sysutils/heirloom/files/patch-su::su.dfl.in
+++ b/sysutils/heirloom/files/patch-su__su.dfl.in
diff --git a/sysutils/heirloom/files/patch-tar::tar.dfl b/sysutils/heirloom/files/patch-tar__tar.dfl
index e526c171ec55..e526c171ec55 100644
--- a/sysutils/heirloom/files/patch-tar::tar.dfl
+++ b/sysutils/heirloom/files/patch-tar__tar.dfl
diff --git a/sysutils/hourglass/files/patch-src::Makefile.in b/sysutils/hourglass/files/patch-src__Makefile.in
index 9a32a01b04cc..9a32a01b04cc 100644
--- a/sysutils/hourglass/files/patch-src::Makefile.in
+++ b/sysutils/hourglass/files/patch-src__Makefile.in
diff --git a/sysutils/mapchan/files/patch-doc::mapchan.8 b/sysutils/mapchan/files/patch-doc__mapchan.8
index 1dd7cca2b615..1dd7cca2b615 100644
--- a/sysutils/mapchan/files/patch-doc::mapchan.8
+++ b/sysutils/mapchan/files/patch-doc__mapchan.8
diff --git a/sysutils/mapchan/files/patch-examples::default b/sysutils/mapchan/files/patch-examples__default
index 32e3ff0aaf8b..32e3ff0aaf8b 100644
--- a/sysutils/mapchan/files/patch-examples::default
+++ b/sysutils/mapchan/files/patch-examples__default
diff --git a/sysutils/modules/files/patch-doc::Makefile.in b/sysutils/modules/files/patch-doc__Makefile.in
index 2a0bd5bb618c..2a0bd5bb618c 100644
--- a/sysutils/modules/files/patch-doc::Makefile.in
+++ b/sysutils/modules/files/patch-doc__Makefile.in
diff --git a/sysutils/modules/files/patch-doc::module.1.in b/sysutils/modules/files/patch-doc__module.1.in
index 198a0e364630..198a0e364630 100644
--- a/sysutils/modules/files/patch-doc::module.1.in
+++ b/sysutils/modules/files/patch-doc__module.1.in
diff --git a/sysutils/modules/files/patch-doc::modulefile.5.in b/sysutils/modules/files/patch-doc__modulefile.5.in
index 885afd4ec197..885afd4ec197 100644
--- a/sysutils/modules/files/patch-doc::modulefile.5.in
+++ b/sysutils/modules/files/patch-doc__modulefile.5.in
diff --git a/sysutils/nvclock/files/patch-src::Makefile.in b/sysutils/nvclock/files/patch-src__Makefile.in
index ec731ffb031a..ec731ffb031a 100644
--- a/sysutils/nvclock/files/patch-src::Makefile.in
+++ b/sysutils/nvclock/files/patch-src__Makefile.in
diff --git a/sysutils/progsreiserfs/files/patch-libreiserfs::journal.c b/sysutils/progsreiserfs/files/patch-libreiserfs__journal.c
index fe5c6165905f..fe5c6165905f 100644
--- a/sysutils/progsreiserfs/files/patch-libreiserfs::journal.c
+++ b/sysutils/progsreiserfs/files/patch-libreiserfs__journal.c
diff --git a/sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul b/sysutils/sformat/files/patch-RULES__i386-freebsd-cc.rul
index 1b76323e1ac7..1b76323e1ac7 100644
--- a/sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul
+++ b/sysutils/sformat/files/patch-RULES__i386-freebsd-cc.rul
diff --git a/sysutils/sformat/files/patch-RULES::rules.cnf b/sysutils/sformat/files/patch-RULES__rules.cnf
index f7148061bd95..f7148061bd95 100644
--- a/sysutils/sformat/files/patch-RULES::rules.cnf
+++ b/sysutils/sformat/files/patch-RULES__rules.cnf
diff --git a/sysutils/sformat/files/patch-TARGETS::Targetdirs b/sysutils/sformat/files/patch-TARGETS__Targetdirs
index 9c4d8d735f34..9c4d8d735f34 100644
--- a/sysutils/sformat/files/patch-TARGETS::Targetdirs
+++ b/sysutils/sformat/files/patch-TARGETS__Targetdirs
diff --git a/sysutils/sformat/files/patch-libscg::scsiopen.c b/sysutils/sformat/files/patch-libscg__scsiopen.c
index 2a3e9878f1d3..2a3e9878f1d3 100644
--- a/sysutils/sformat/files/patch-libscg::scsiopen.c
+++ b/sysutils/sformat/files/patch-libscg__scsiopen.c
diff --git a/sysutils/sformat/files/patch-libscg::scsitransp.c b/sysutils/sformat/files/patch-libscg__scsitransp.c
index 057fec4f2bb9..057fec4f2bb9 100644
--- a/sysutils/sformat/files/patch-libscg::scsitransp.c
+++ b/sysutils/sformat/files/patch-libscg__scsitransp.c
diff --git a/sysutils/sformat/files/patch-sformat::bcrypt.c b/sysutils/sformat/files/patch-sformat__bcrypt.c
index de739861d7e4..de739861d7e4 100644
--- a/sysutils/sformat/files/patch-sformat::bcrypt.c
+++ b/sysutils/sformat/files/patch-sformat__bcrypt.c
diff --git a/sysutils/sformat/files/patch-sformat::datio.c b/sysutils/sformat/files/patch-sformat__datio.c
index 9162f6ee04f3..9162f6ee04f3 100644
--- a/sysutils/sformat/files/patch-sformat::datio.c
+++ b/sysutils/sformat/files/patch-sformat__datio.c
diff --git a/sysutils/sformat/files/patch-sformat::fmt.c b/sysutils/sformat/files/patch-sformat__fmt.c
index 27cf28ec66e6..27cf28ec66e6 100644
--- a/sysutils/sformat/files/patch-sformat::fmt.c
+++ b/sysutils/sformat/files/patch-sformat__fmt.c
diff --git a/sysutils/sformat/files/patch-sformat::sformat.1 b/sysutils/sformat/files/patch-sformat__sformat.1
index 3bb9faa35e40..3bb9faa35e40 100644
--- a/sysutils/sformat/files/patch-sformat::sformat.1
+++ b/sysutils/sformat/files/patch-sformat__sformat.1
diff --git a/sysutils/webmin/files/patch-usermin::config b/sysutils/webmin/files/patch-usermin__config
index e703c3f826c3..e703c3f826c3 100644
--- a/sysutils/webmin/files/patch-usermin::config
+++ b/sysutils/webmin/files/patch-usermin__config
diff --git a/textproc/aspell/files/patch-prog::checker_string.cpp b/textproc/aspell/files/patch-prog__checker_string.cpp
index 1a2c186186b0..1a2c186186b0 100644
--- a/textproc/aspell/files/patch-prog::checker_string.cpp
+++ b/textproc/aspell/files/patch-prog__checker_string.cpp
diff --git a/textproc/augeas/files/patch-gnulib::lib::Makefile.am b/textproc/augeas/files/patch-gnulib__lib__Makefile.am
index c89747137e5b..c89747137e5b 100644
--- a/textproc/augeas/files/patch-gnulib::lib::Makefile.am
+++ b/textproc/augeas/files/patch-gnulib__lib__Makefile.am
diff --git a/textproc/cbedic/files/patch-src::cbedic.cpp b/textproc/cbedic/files/patch-src__cbedic.cpp
index 1d7fcab02e72..1d7fcab02e72 100644
--- a/textproc/cbedic/files/patch-src::cbedic.cpp
+++ b/textproc/cbedic/files/patch-src__cbedic.cpp
diff --git a/textproc/docbook-to-man/files/patch-Instant::Imakefile b/textproc/docbook-to-man/files/patch-Instant__Imakefile
index 91ea4acd7823..91ea4acd7823 100644
--- a/textproc/docbook-to-man/files/patch-Instant::Imakefile
+++ b/textproc/docbook-to-man/files/patch-Instant__Imakefile
diff --git a/textproc/docbook-to-man/files/patch-Transpec::Imakefile b/textproc/docbook-to-man/files/patch-Transpec__Imakefile
index 0944099cd2bd..0944099cd2bd 100644
--- a/textproc/docbook-to-man/files/patch-Transpec::Imakefile
+++ b/textproc/docbook-to-man/files/patch-Transpec__Imakefile
diff --git a/textproc/docbook-to-man/files/patch-cmd::Imakefile b/textproc/docbook-to-man/files/patch-cmd__Imakefile
index 7104dc40892d..7104dc40892d 100644
--- a/textproc/docbook-to-man/files/patch-cmd::Imakefile
+++ b/textproc/docbook-to-man/files/patch-cmd__Imakefile
diff --git a/textproc/docbook-to-man/files/patch-cmd::docbook-to-man.sh b/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh
index 462f0707d5b7..462f0707d5b7 100644
--- a/textproc/docbook-to-man/files/patch-cmd::docbook-to-man.sh
+++ b/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh
diff --git a/textproc/dsssl-docbook-modular/files/patch-common::dbl1it.dsl b/textproc/dsssl-docbook-modular/files/patch-common__dbl1it.dsl
index fa8405f5dc24..fa8405f5dc24 100644
--- a/textproc/dsssl-docbook-modular/files/patch-common::dbl1it.dsl
+++ b/textproc/dsssl-docbook-modular/files/patch-common__dbl1it.dsl
diff --git a/textproc/dsssl-docbook-modular/files/patch-common::dbl1it.ent b/textproc/dsssl-docbook-modular/files/patch-common__dbl1it.ent
index cbfeed24cc93..cbfeed24cc93 100644
--- a/textproc/dsssl-docbook-modular/files/patch-common::dbl1it.ent
+++ b/textproc/dsssl-docbook-modular/files/patch-common__dbl1it.ent
diff --git a/textproc/dsssl-docbook-modular/files/patch-common::dbl1ru.ent b/textproc/dsssl-docbook-modular/files/patch-common__dbl1ru.ent
index 06f70b15dbff..06f70b15dbff 100644
--- a/textproc/dsssl-docbook-modular/files/patch-common::dbl1ru.ent
+++ b/textproc/dsssl-docbook-modular/files/patch-common__dbl1ru.ent
diff --git a/textproc/dsssl-docbook-modular/files/patch-common::dbl1zhcn.dsl b/textproc/dsssl-docbook-modular/files/patch-common__dbl1zhcn.dsl
index e18fbf18a6bb..e18fbf18a6bb 100644
--- a/textproc/dsssl-docbook-modular/files/patch-common::dbl1zhcn.dsl
+++ b/textproc/dsssl-docbook-modular/files/patch-common__dbl1zhcn.dsl
diff --git a/textproc/dsssl-docbook-modular/files/patch-html::dbverb.dsl b/textproc/dsssl-docbook-modular/files/patch-html__dbverb.dsl
index 67252887668f..67252887668f 100644
--- a/textproc/dsssl-docbook-modular/files/patch-html::dbverb.dsl
+++ b/textproc/dsssl-docbook-modular/files/patch-html__dbverb.dsl
diff --git a/textproc/dsssl-docbook-modular/files/patch-print::dbverb.dsl b/textproc/dsssl-docbook-modular/files/patch-print__dbverb.dsl
index 79aa222767b4..79aa222767b4 100644
--- a/textproc/dsssl-docbook-modular/files/patch-print::dbverb.dsl
+++ b/textproc/dsssl-docbook-modular/files/patch-print__dbverb.dsl
diff --git a/textproc/kmfl-sil-ezra/files/patch-Keyman::EZRAUNI24.KMN b/textproc/kmfl-sil-ezra/files/patch-Keyman__EZRAUNI24.KMN
index b25078756e07..b25078756e07 100644
--- a/textproc/kmfl-sil-ezra/files/patch-Keyman::EZRAUNI24.KMN
+++ b/textproc/kmfl-sil-ezra/files/patch-Keyman__EZRAUNI24.KMN
diff --git a/textproc/kmfl-sil-yi/files/patch-SourceFiles::Yi7.kmn b/textproc/kmfl-sil-yi/files/patch-SourceFiles__Yi7.kmn
index bb5fa6b87bbc..bb5fa6b87bbc 100644
--- a/textproc/kmfl-sil-yi/files/patch-SourceFiles::Yi7.kmn
+++ b/textproc/kmfl-sil-yi/files/patch-SourceFiles__Yi7.kmn
diff --git a/textproc/libxode/files/patch-src::Makefile.in b/textproc/libxode/files/patch-src__Makefile.in
index 79b7766473c4..79b7766473c4 100644
--- a/textproc/libxode/files/patch-src::Makefile.in
+++ b/textproc/libxode/files/patch-src__Makefile.in
diff --git a/textproc/libxslt/files/patch-python::Makefile.in b/textproc/libxslt/files/patch-python__Makefile.in
index dbd7d8e76bcd..dbd7d8e76bcd 100644
--- a/textproc/libxslt/files/patch-python::Makefile.in
+++ b/textproc/libxslt/files/patch-python__Makefile.in
diff --git a/textproc/libxslt/files/patch-python::tests::Makefile.in b/textproc/libxslt/files/patch-python__tests__Makefile.in
index 385552556c34..385552556c34 100644
--- a/textproc/libxslt/files/patch-python::tests::Makefile.in
+++ b/textproc/libxslt/files/patch-python__tests__Makefile.in
diff --git a/textproc/openfts/files/patch-doc::primer.html b/textproc/openfts/files/patch-doc__primer.html
index d7306923f853..d7306923f853 100644
--- a/textproc/openfts/files/patch-doc::primer.html
+++ b/textproc/openfts/files/patch-doc__primer.html
diff --git a/textproc/slides/files/patch-schema::dtd::slides-full.dtd b/textproc/slides/files/patch-schema__dtd__slides-full.dtd
index e49bdff98d26..e49bdff98d26 100644
--- a/textproc/slides/files/patch-schema::dtd::slides-full.dtd
+++ b/textproc/slides/files/patch-schema__dtd__slides-full.dtd
diff --git a/textproc/stardict3/files/patch-src::stardict-application-server.cpp b/textproc/stardict3/files/patch-src__stardict-application-server.cpp
index 9554dffcfe09..9554dffcfe09 100644
--- a/textproc/stardict3/files/patch-src::stardict-application-server.cpp
+++ b/textproc/stardict3/files/patch-src__stardict-application-server.cpp
diff --git a/textproc/texi2html/files/patch-doc::Makefile.in b/textproc/texi2html/files/patch-doc__Makefile.in
index 69d985dd382f..69d985dd382f 100644
--- a/textproc/texi2html/files/patch-doc::Makefile.in
+++ b/textproc/texi2html/files/patch-doc__Makefile.in
diff --git a/textproc/xmlwrapp/files/patch-src::libxml::node_manip.cxx b/textproc/xmlwrapp/files/patch-src__libxml__node_manip.cxx
index 89f0183b1d18..89f0183b1d18 100644
--- a/textproc/xmlwrapp/files/patch-src::libxml::node_manip.cxx
+++ b/textproc/xmlwrapp/files/patch-src__libxml__node_manip.cxx
diff --git a/www/aria/files/patch-po::Makefile.in.in b/www/aria/files/patch-po__Makefile.in.in
index acd689157917..acd689157917 100644
--- a/www/aria/files/patch-po::Makefile.in.in
+++ b/www/aria/files/patch-po__Makefile.in.in
diff --git a/www/aria/files/patch-src::GtrlSocket.cc b/www/aria/files/patch-src__GtrlSocket.cc
index 6654d1017149..6654d1017149 100644
--- a/www/aria/files/patch-src::GtrlSocket.cc
+++ b/www/aria/files/patch-src__GtrlSocket.cc
diff --git a/www/aria/files/patch-src::HistoryWindow.cc b/www/aria/files/patch-src__HistoryWindow.cc
index f6f8aed8cdd2..f6f8aed8cdd2 100644
--- a/www/aria/files/patch-src::HistoryWindow.cc
+++ b/www/aria/files/patch-src__HistoryWindow.cc
diff --git a/www/aria/files/patch-src::ItemCellPartial.h b/www/aria/files/patch-src__ItemCellPartial.h
index 03f0c7b8106a..03f0c7b8106a 100644
--- a/www/aria/files/patch-src::ItemCellPartial.h
+++ b/www/aria/files/patch-src__ItemCellPartial.h
diff --git a/www/aria/files/patch-src::ItemList.h b/www/aria/files/patch-src__ItemList.h
index ca2c8edbdcc0..ca2c8edbdcc0 100644
--- a/www/aria/files/patch-src::ItemList.h
+++ b/www/aria/files/patch-src__ItemList.h
diff --git a/www/aria/files/patch-src::ProxyList.cc b/www/aria/files/patch-src__ProxyList.cc
index 4ba2539c4877..4ba2539c4877 100644
--- a/www/aria/files/patch-src::ProxyList.cc
+++ b/www/aria/files/patch-src__ProxyList.cc
diff --git a/www/aria/files/patch-src::RetrieveFTP.h b/www/aria/files/patch-src__RetrieveFTP.h
index 56d625abb833..56d625abb833 100644
--- a/www/aria/files/patch-src::RetrieveFTP.h
+++ b/www/aria/files/patch-src__RetrieveFTP.h
diff --git a/www/aria/files/patch-src::gui_download.cc b/www/aria/files/patch-src__gui_download.cc
index be338bf8a891..be338bf8a891 100644
--- a/www/aria/files/patch-src::gui_download.cc
+++ b/www/aria/files/patch-src__gui_download.cc
diff --git a/www/aria/files/patch-src::gui_file.cc b/www/aria/files/patch-src__gui_file.cc
index 32a11ab2b4fe..32a11ab2b4fe 100644
--- a/www/aria/files/patch-src::gui_file.cc
+++ b/www/aria/files/patch-src__gui_file.cc
diff --git a/www/aria/files/patch-src::gui_main.cc b/www/aria/files/patch-src__gui_main.cc
index 7e5f03800dfa..7e5f03800dfa 100644
--- a/www/aria/files/patch-src::gui_main.cc
+++ b/www/aria/files/patch-src__gui_main.cc
diff --git a/www/aria/files/patch-src::gui_popup.cc b/www/aria/files/patch-src__gui_popup.cc
index 0f4308b8db11..0f4308b8db11 100644
--- a/www/aria/files/patch-src::gui_popup.cc
+++ b/www/aria/files/patch-src__gui_popup.cc
diff --git a/www/aria/files/patch-src::md5.c b/www/aria/files/patch-src__md5.c
index 2d2c158736f8..2d2c158736f8 100644
--- a/www/aria/files/patch-src::md5.c
+++ b/www/aria/files/patch-src__md5.c
diff --git a/www/boa/files/patch-docs::Makefile.in b/www/boa/files/patch-docs__Makefile.in
index e7856c6a9a2b..e7856c6a9a2b 100644
--- a/www/boa/files/patch-docs::Makefile.in
+++ b/www/boa/files/patch-docs__Makefile.in
diff --git a/www/boa/files/patch-docs::boa.texi b/www/boa/files/patch-docs__boa.texi
index 598c1df5ecf4..598c1df5ecf4 100644
--- a/www/boa/files/patch-docs::boa.texi
+++ b/www/boa/files/patch-docs__boa.texi
diff --git a/www/boa/files/patch-examples::boa.conf b/www/boa/files/patch-examples__boa.conf
index e3e1b3176822..e3e1b3176822 100644
--- a/www/boa/files/patch-examples::boa.conf
+++ b/www/boa/files/patch-examples__boa.conf
diff --git a/www/boa/files/patch-src::defines.h b/www/boa/files/patch-src__defines.h
index d5e8adbbd503..d5e8adbbd503 100644
--- a/www/boa/files/patch-src::defines.h
+++ b/www/boa/files/patch-src__defines.h
diff --git a/www/chimera/files/patch-compat::Imakefile b/www/chimera/files/patch-compat__Imakefile
index 8e9be8d5be71..8e9be8d5be71 100644
--- a/www/chimera/files/patch-compat::Imakefile
+++ b/www/chimera/files/patch-compat__Imakefile
diff --git a/www/chimera/files/patch-lib::Imakefile b/www/chimera/files/patch-lib__Imakefile
index 428053be6365..428053be6365 100644
--- a/www/chimera/files/patch-lib::Imakefile
+++ b/www/chimera/files/patch-lib__Imakefile
diff --git a/www/chimera/files/patch-libhtmlw::HTML-PSformat.c b/www/chimera/files/patch-libhtmlw__HTML-PSformat.c
index 154d1bff46c1..154d1bff46c1 100644
--- a/www/chimera/files/patch-libhtmlw::HTML-PSformat.c
+++ b/www/chimera/files/patch-libhtmlw__HTML-PSformat.c
diff --git a/www/crawl/files/patch-compat::gai-errnos.h b/www/crawl/files/patch-compat__gai-errnos.h
index 517c9ca5d38b..517c9ca5d38b 100644
--- a/www/crawl/files/patch-compat::gai-errnos.h
+++ b/www/crawl/files/patch-compat__gai-errnos.h
diff --git a/www/erwn/files/patch-src::erwindialogs.c b/www/erwn/files/patch-src__erwindialogs.c
index b637ec848ba0..b637ec848ba0 100644
--- a/www/erwn/files/patch-src::erwindialogs.c
+++ b/www/erwn/files/patch-src__erwindialogs.c
diff --git a/www/harvest/files/patch-components::broker::standard::glimpse::index::glimpse.c b/www/harvest/files/patch-components__broker__standard__glimpse__index__glimpse.c
index 20f50f7048f7..20f50f7048f7 100644
--- a/www/harvest/files/patch-components::broker::standard::glimpse::index::glimpse.c
+++ b/www/harvest/files/patch-components__broker__standard__glimpse__index__glimpse.c
diff --git a/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in b/www/harvest/files/patch-components__broker__zebra__yaz__lib__Makefile.in
index 3db09902635a..3db09902635a 100644
--- a/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in
+++ b/www/harvest/files/patch-components__broker__zebra__yaz__lib__Makefile.in
diff --git a/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in b/www/harvest/files/patch-components__gatherer__WordPerfect__wp2x-2.3__Makefile.in
index 5dbd8d4f8411..5dbd8d4f8411 100644
--- a/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in
+++ b/www/harvest/files/patch-components__gatherer__WordPerfect__wp2x-2.3__Makefile.in
diff --git a/www/harvest/files/patch-src::configure b/www/harvest/files/patch-src__configure
index 57494d959a81..57494d959a81 100644
--- a/www/harvest/files/patch-src::configure
+++ b/www/harvest/files/patch-src__configure
diff --git a/www/harvest/files/patch-src::gatherer::curl::lib::Makefile.in b/www/harvest/files/patch-src__gatherer__curl__lib__Makefile.in
index 592f6aa0ba2a..592f6aa0ba2a 100644
--- a/www/harvest/files/patch-src::gatherer::curl::lib::Makefile.in
+++ b/www/harvest/files/patch-src__gatherer__curl__lib__Makefile.in
diff --git a/www/hydra/files/patch-src::cgi_ssl.c b/www/hydra/files/patch-src__cgi_ssl.c
index bc8894a83588..bc8894a83588 100644
--- a/www/hydra/files/patch-src::cgi_ssl.c
+++ b/www/hydra/files/patch-src__cgi_ssl.c
diff --git a/www/hypermail/files/patch-docs::Makefile.in b/www/hypermail/files/patch-docs__Makefile.in
index 23af9a78274a..23af9a78274a 100644
--- a/www/hypermail/files/patch-docs::Makefile.in
+++ b/www/hypermail/files/patch-docs__Makefile.in
diff --git a/www/hypermail/files/patch-src::proto.h b/www/hypermail/files/patch-src__proto.h
index c66a4702a15c..c66a4702a15c 100644
--- a/www/hypermail/files/patch-src::proto.h
+++ b/www/hypermail/files/patch-src__proto.h
diff --git a/www/oops/files/patch-src::Makefile.in b/www/oops/files/patch-src__Makefile.in
index 8f8fe154ba1b..8f8fe154ba1b 100644
--- a/www/oops/files/patch-src::Makefile.in
+++ b/www/oops/files/patch-src__Makefile.in
diff --git a/www/php-screw/files/patch-tools::Makefile b/www/php-screw/files/patch-tools__Makefile
index cc3dd8308b3f..cc3dd8308b3f 100644
--- a/www/php-screw/files/patch-tools::Makefile
+++ b/www/php-screw/files/patch-tools__Makefile
diff --git a/www/suphp/files/patch-doc::suphp.conf-example b/www/suphp/files/patch-doc__suphp.conf-example
index d359454dc109..d359454dc109 100644
--- a/www/suphp/files/patch-doc::suphp.conf-example
+++ b/www/suphp/files/patch-doc__suphp.conf-example
diff --git a/www/swish++/files/patch-config::config.mk b/www/swish++/files/patch-config__config.mk
index ff2582bad417..ff2582bad417 100644
--- a/www/swish++/files/patch-config::config.mk
+++ b/www/swish++/files/patch-config__config.mk
diff --git a/www/swish++/files/patch-man::GNUmakefile b/www/swish++/files/patch-man__GNUmakefile
index 4b899d66c0dc..4b899d66c0dc 100644
--- a/www/swish++/files/patch-man::GNUmakefile
+++ b/www/swish++/files/patch-man__GNUmakefile
diff --git a/www/tidy-devel/files/patch-console::tidy.c b/www/tidy-devel/files/patch-console__tidy.c
index f3cc84f4d257..f3cc84f4d257 100644
--- a/www/tidy-devel/files/patch-console::tidy.c
+++ b/www/tidy-devel/files/patch-console__tidy.c
diff --git a/www/ump/files/patch-ump::UnixShell.c b/www/ump/files/patch-ump__UnixShell.c
index d14be21ca02d..d14be21ca02d 100644
--- a/www/ump/files/patch-ump::UnixShell.c
+++ b/www/ump/files/patch-ump__UnixShell.c
diff --git a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile b/x11-clocks/wmtimer/files/patch-wmtimer__Makefile
index 1da0510384d8..1da0510384d8 100644
--- a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
+++ b/x11-clocks/wmtimer/files/patch-wmtimer__Makefile
diff --git a/x11-servers/Xfstt/files/patch-doc::xfstt.1x b/x11-servers/Xfstt/files/patch-doc__xfstt.1x
index 68fb563154c9..68fb563154c9 100644
--- a/x11-servers/Xfstt/files/patch-doc::xfstt.1x
+++ b/x11-servers/Xfstt/files/patch-doc__xfstt.1x
diff --git a/x11-servers/Xfstt/files/patch-libfstt::arch.h b/x11-servers/Xfstt/files/patch-libfstt__arch.h
index 4815c3e222a8..4815c3e222a8 100644
--- a/x11-servers/Xfstt/files/patch-libfstt::arch.h
+++ b/x11-servers/Xfstt/files/patch-libfstt__arch.h
diff --git a/x11-servers/Xfstt/files/patch-libfstt::ttf.h b/x11-servers/Xfstt/files/patch-libfstt__ttf.h
index 8abc5c2fb420..8abc5c2fb420 100644
--- a/x11-servers/Xfstt/files/patch-libfstt::ttf.h
+++ b/x11-servers/Xfstt/files/patch-libfstt__ttf.h
diff --git a/x11-servers/Xfstt/files/patch-src::Makefile.in b/x11-servers/Xfstt/files/patch-src__Makefile.in
index d86fc6de4bc9..d86fc6de4bc9 100644
--- a/x11-servers/Xfstt/files/patch-src::Makefile.in
+++ b/x11-servers/Xfstt/files/patch-src__Makefile.in
diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery__Makefile.in
index 39cb5057a688..39cb5057a688 100644
--- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in
+++ b/x11-toolkits/bakery/files/patch-bakery__Makefile.in
diff --git a/x11-toolkits/movingmotif/files/patch-demo::Makefile.in b/x11-toolkits/movingmotif/files/patch-demo__Makefile.in
index 12b637cc2ebe..12b637cc2ebe 100644
--- a/x11-toolkits/movingmotif/files/patch-demo::Makefile.in
+++ b/x11-toolkits/movingmotif/files/patch-demo__Makefile.in
diff --git a/x11-toolkits/open-motif/files/patch-lib::Xm::ColorS.c b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
index 2e70cc3035fb..2e70cc3035fb 100644
--- a/x11-toolkits/open-motif/files/patch-lib::Xm::ColorS.c
+++ b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
diff --git a/x11-toolkits/p5-Gtk/files/patch-Gtk::Makefile.PL b/x11-toolkits/p5-Gtk/files/patch-Gtk__Makefile.PL
index eaac20c29644..eaac20c29644 100644
--- a/x11-toolkits/p5-Gtk/files/patch-Gtk::Makefile.PL
+++ b/x11-toolkits/p5-Gtk/files/patch-Gtk__Makefile.PL
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix__Makefile.in
index 6a53806ceffd..6a53806ceffd 100644
--- a/x11-toolkits/tk85/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix__Makefile.in
diff --git a/x11-toolkits/tk85/files/patch-unix::configure b/x11-toolkits/tk85/files/patch-unix__configure
index 7e2cd669c000..7e2cd669c000 100644
--- a/x11-toolkits/tk85/files/patch-unix::configure
+++ b/x11-toolkits/tk85/files/patch-unix__configure
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix__Makefile.in
index f93cefd929aa..f93cefd929aa 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix__Makefile.in
diff --git a/x11/9box/files/patch-src::Makefile b/x11/9box/files/patch-src__Makefile
index 654ee9c50f60..654ee9c50f60 100644
--- a/x11/9box/files/patch-src::Makefile
+++ b/x11/9box/files/patch-src__Makefile
diff --git a/x11/gdkxft/files/patch-src::gdkxft.conf b/x11/gdkxft/files/patch-src__gdkxft.conf
index 23953ffa9790..23953ffa9790 100644
--- a/x11/gdkxft/files/patch-src::gdkxft.conf
+++ b/x11/gdkxft/files/patch-src__gdkxft.conf
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout__applications.menu
index 116dad13f19b..116dad13f19b 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout__applications.menu
diff --git a/x11/imwheel/files/patch-getopt::Makefile.in b/x11/imwheel/files/patch-getopt__Makefile.in
index b1e87ba485c8..b1e87ba485c8 100644
--- a/x11/imwheel/files/patch-getopt::Makefile.in
+++ b/x11/imwheel/files/patch-getopt__Makefile.in
diff --git a/x11/imwheel/files/patch-getopt::getopt.c b/x11/imwheel/files/patch-getopt__getopt.c
index 47198b724f93..47198b724f93 100644
--- a/x11/imwheel/files/patch-getopt::getopt.c
+++ b/x11/imwheel/files/patch-getopt__getopt.c
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome__Makefile.in
index efac650ba5a4..efac650ba5a4 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome__Makefile.in
diff --git a/x11/rxvt-unicode/files/patch-src::command.C b/x11/rxvt-unicode/files/patch-src__command.C
index 748f2aaec7e9..748f2aaec7e9 100644
--- a/x11/rxvt-unicode/files/patch-src::command.C
+++ b/x11/rxvt-unicode/files/patch-src__command.C
diff --git a/x11/rxvt-unicode/files/patch-src::gentables b/x11/rxvt-unicode/files/patch-src__gentables
index 0c344b09a787..0c344b09a787 100644
--- a/x11/rxvt-unicode/files/patch-src::gentables
+++ b/x11/rxvt-unicode/files/patch-src__gentables
diff --git a/x11/wdm/files/patch-configs::wdm-config.in b/x11/wdm/files/patch-configs__wdm-config.in
index b42e5a5bddde..b42e5a5bddde 100644
--- a/x11/wdm/files/patch-configs::wdm-config.in
+++ b/x11/wdm/files/patch-configs__wdm-config.in
diff --git a/x11/wdm/files/patch-src::wdm::session.c b/x11/wdm/files/patch-src__wdm__session.c
index 035205602185..035205602185 100644
--- a/x11/wdm/files/patch-src::wdm::session.c
+++ b/x11/wdm/files/patch-src__wdm__session.c
diff --git a/x11/wmxss/files/patch-Src::Makefile b/x11/wmxss/files/patch-Src__Makefile
index 3c2c94ef54f2..3c2c94ef54f2 100644
--- a/x11/wmxss/files/patch-Src::Makefile
+++ b/x11/wmxss/files/patch-Src__Makefile
diff --git a/x11/xstroke/files/patch-etc::Imakefile b/x11/xstroke/files/patch-etc__Imakefile
index 42af7775852c..42af7775852c 100644
--- a/x11/xstroke/files/patch-etc::Imakefile
+++ b/x11/xstroke/files/patch-etc__Imakefile