From 7306e40da405ade4d9473a388a3dc20da3e8bc13 Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- audio/ample/files/patch-src::base64.c | 11 ---- audio/ample/files/patch-src__base64.c | 11 ++++ audio/extace/files/patch-src::color_win.c | 35 ------------ audio/extace/files/patch-src__color_win.c | 35 ++++++++++++ audio/flite/files/patch-include::cst_sts.h | 18 ------ audio/flite/files/patch-include__cst_sts.h | 18 ++++++ .../glame/files/patch-src::plugins::audio_io_oss.c | 17 ------ .../glame/files/patch-src__plugins__audio_io_oss.c | 17 ++++++ audio/gnomoradio/files/patch-rainbow::license.cc | 11 ---- .../files/patch-rainbow::rdf-resource.cc | 55 ------------------ audio/gnomoradio/files/patch-rainbow__license.cc | 11 ++++ .../files/patch-rainbow__rdf-resource.cc | 55 ++++++++++++++++++ audio/grip/files/patch-src::main.c | 11 ---- audio/grip/files/patch-src__main.c | 11 ++++ audio/id3ren/files/patch-man::Makefile | 12 ---- audio/id3ren/files/patch-man__Makefile | 12 ++++ .../patch-libsidplay::include::sidplay::SmartPtr.h | 26 --------- .../patch-libsidplay__include__sidplay__SmartPtr.h | 26 +++++++++ audio/mixmos/files/patch-src::mixer.h | 11 ---- audio/mixmos/files/patch-src::prefs.h | 11 ---- audio/mixmos/files/patch-src__mixer.h | 11 ++++ audio/mixmos/files/patch-src__prefs.h | 11 ++++ audio/mp3blaster/files/patch-src::main.cc | 11 ---- audio/mp3blaster/files/patch-src__main.cc | 11 ++++ audio/muse/files/patch-src::Makefile.in | 10 ---- audio/muse/files/patch-src::jmixer.cpp | 40 ------------- audio/muse/files/patch-src::libmpeg::mpegtoraw.cc | 22 -------- audio/muse/files/patch-src::outchannels.cpp | 15 ----- audio/muse/files/patch-src::pipe.cpp | 14 ----- audio/muse/files/patch-src::shout::sock.c | 14 ----- audio/muse/files/patch-src__Makefile.in | 10 ++++ audio/muse/files/patch-src__jmixer.cpp | 40 +++++++++++++ audio/muse/files/patch-src__libmpeg__mpegtoraw.cc | 22 ++++++++ audio/muse/files/patch-src__outchannels.cpp | 15 +++++ audio/muse/files/patch-src__pipe.cpp | 14 +++++ audio/muse/files/patch-src__shout__sock.c | 14 +++++ audio/napster/files/patch-doc::Makefile.in | 11 ---- audio/napster/files/patch-doc__Makefile.in | 11 ++++ audio/rioutil/files/patch-src::Makefile.in | 33 ----------- audio/rioutil/files/patch-src__Makefile.in | 33 +++++++++++ audio/rplay/files/patch-rplayd::rplayd.c | 16 ------ audio/rplay/files/patch-rplayd__rplayd.c | 16 ++++++ audio/soundtracker/files/patch-app::Makefile.in | 15 ----- audio/soundtracker/files/patch-app__Makefile.in | 15 +++++ audio/soundtracker/files/patch-po::ja.po | 65 ---------------------- audio/soundtracker/files/patch-po__ja.po | 65 ++++++++++++++++++++++ audio/umix/files/patch-src::driver_oss.c | 64 --------------------- audio/umix/files/patch-src__driver_oss.c | 64 +++++++++++++++++++++ audio/x11amp/files/patch-Effect::test::Makefile.in | 14 ----- .../x11amp/files/patch-Effect::voice::Makefile.in | 14 ----- audio/x11amp/files/patch-Effect::voice::about.c | 14 ----- audio/x11amp/files/patch-Effect__test__Makefile.in | 14 +++++ .../x11amp/files/patch-Effect__voice__Makefile.in | 14 +++++ audio/x11amp/files/patch-Effect__voice__about.c | 14 +++++ audio/x11amp/files/patch-General::ir::Makefile.in | 14 ----- audio/x11amp/files/patch-General::ir::about.c | 15 ----- audio/x11amp/files/patch-General__ir__Makefile.in | 14 +++++ audio/x11amp/files/patch-General__ir__about.c | 15 +++++ .../x11amp/files/patch-Input::cdaudio::Makefile.in | 14 ----- .../x11amp/files/patch-Input::mikmod::Makefile.in | 14 ----- .../x11amp/files/patch-Input::mpg123::Makefile.in | 23 -------- audio/x11amp/files/patch-Input::wav::Makefile.in | 14 ----- .../x11amp/files/patch-Input__cdaudio__Makefile.in | 14 +++++ .../x11amp/files/patch-Input__mikmod__Makefile.in | 14 +++++ .../x11amp/files/patch-Input__mpg123__Makefile.in | 23 ++++++++ audio/x11amp/files/patch-Input__wav__Makefile.in | 14 +++++ audio/x11amp/files/patch-Output::OSS::Makefile.in | 14 ----- audio/x11amp/files/patch-Output::OSS::OSS.h | 14 ----- audio/x11amp/files/patch-Output::esd::Makefile.in | 14 ----- audio/x11amp/files/patch-Output__OSS__Makefile.in | 14 +++++ audio/x11amp/files/patch-Output__OSS__OSS.h | 14 +++++ audio/x11amp/files/patch-Output__esd__Makefile.in | 14 +++++ audio/x11amp/files/patch-libx11amp::Makefile.in | 23 -------- audio/x11amp/files/patch-libx11amp::configure | 11 ---- audio/x11amp/files/patch-libx11amp__Makefile.in | 23 ++++++++ audio/x11amp/files/patch-libx11amp__configure | 11 ++++ audio/x11amp/files/patch-wmx11amp::Makefile.in | 14 ----- audio/x11amp/files/patch-wmx11amp__Makefile.in | 14 +++++ audio/x11amp/files/patch-x11amp::Makefile.in | 16 ------ audio/x11amp/files/patch-x11amp::main.c | 12 ---- audio/x11amp/files/patch-x11amp__Makefile.in | 16 ++++++ audio/x11amp/files/patch-x11amp__main.c | 12 ++++ audio/ximp3/files/patch-lib::L3.h | 28 ---------- audio/ximp3/files/patch-lib__L3.h | 28 ++++++++++ audio/xmixer/files/patch-Xw::Base.c | 13 ----- audio/xmixer/files/patch-Xw__Base.c | 13 +++++ 86 files changed, 843 insertions(+), 843 deletions(-) delete mode 100644 audio/ample/files/patch-src::base64.c create mode 100644 audio/ample/files/patch-src__base64.c delete mode 100644 audio/extace/files/patch-src::color_win.c create mode 100644 audio/extace/files/patch-src__color_win.c delete mode 100644 audio/flite/files/patch-include::cst_sts.h create mode 100644 audio/flite/files/patch-include__cst_sts.h delete mode 100644 audio/glame/files/patch-src::plugins::audio_io_oss.c create mode 100644 audio/glame/files/patch-src__plugins__audio_io_oss.c delete mode 100644 audio/gnomoradio/files/patch-rainbow::license.cc delete mode 100644 audio/gnomoradio/files/patch-rainbow::rdf-resource.cc create mode 100644 audio/gnomoradio/files/patch-rainbow__license.cc create mode 100644 audio/gnomoradio/files/patch-rainbow__rdf-resource.cc delete mode 100644 audio/grip/files/patch-src::main.c create mode 100644 audio/grip/files/patch-src__main.c delete mode 100644 audio/id3ren/files/patch-man::Makefile create mode 100644 audio/id3ren/files/patch-man__Makefile delete mode 100644 audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h create mode 100644 audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h delete mode 100644 audio/mixmos/files/patch-src::mixer.h delete mode 100644 audio/mixmos/files/patch-src::prefs.h create mode 100644 audio/mixmos/files/patch-src__mixer.h create mode 100644 audio/mixmos/files/patch-src__prefs.h delete mode 100644 audio/mp3blaster/files/patch-src::main.cc create mode 100644 audio/mp3blaster/files/patch-src__main.cc delete mode 100644 audio/muse/files/patch-src::Makefile.in delete mode 100644 audio/muse/files/patch-src::jmixer.cpp delete mode 100644 audio/muse/files/patch-src::libmpeg::mpegtoraw.cc delete mode 100644 audio/muse/files/patch-src::outchannels.cpp delete mode 100644 audio/muse/files/patch-src::pipe.cpp delete mode 100644 audio/muse/files/patch-src::shout::sock.c create mode 100644 audio/muse/files/patch-src__Makefile.in create mode 100644 audio/muse/files/patch-src__jmixer.cpp create mode 100644 audio/muse/files/patch-src__libmpeg__mpegtoraw.cc create mode 100644 audio/muse/files/patch-src__outchannels.cpp create mode 100644 audio/muse/files/patch-src__pipe.cpp create mode 100644 audio/muse/files/patch-src__shout__sock.c delete mode 100644 audio/napster/files/patch-doc::Makefile.in create mode 100644 audio/napster/files/patch-doc__Makefile.in delete mode 100644 audio/rioutil/files/patch-src::Makefile.in create mode 100644 audio/rioutil/files/patch-src__Makefile.in delete mode 100644 audio/rplay/files/patch-rplayd::rplayd.c create mode 100644 audio/rplay/files/patch-rplayd__rplayd.c delete mode 100644 audio/soundtracker/files/patch-app::Makefile.in create mode 100644 audio/soundtracker/files/patch-app__Makefile.in delete mode 100644 audio/soundtracker/files/patch-po::ja.po create mode 100644 audio/soundtracker/files/patch-po__ja.po delete mode 100644 audio/umix/files/patch-src::driver_oss.c create mode 100644 audio/umix/files/patch-src__driver_oss.c delete mode 100644 audio/x11amp/files/patch-Effect::test::Makefile.in delete mode 100644 audio/x11amp/files/patch-Effect::voice::Makefile.in delete mode 100644 audio/x11amp/files/patch-Effect::voice::about.c create mode 100644 audio/x11amp/files/patch-Effect__test__Makefile.in create mode 100644 audio/x11amp/files/patch-Effect__voice__Makefile.in create mode 100644 audio/x11amp/files/patch-Effect__voice__about.c delete mode 100644 audio/x11amp/files/patch-General::ir::Makefile.in delete mode 100644 audio/x11amp/files/patch-General::ir::about.c create mode 100644 audio/x11amp/files/patch-General__ir__Makefile.in create mode 100644 audio/x11amp/files/patch-General__ir__about.c delete mode 100644 audio/x11amp/files/patch-Input::cdaudio::Makefile.in delete mode 100644 audio/x11amp/files/patch-Input::mikmod::Makefile.in delete mode 100644 audio/x11amp/files/patch-Input::mpg123::Makefile.in delete mode 100644 audio/x11amp/files/patch-Input::wav::Makefile.in create mode 100644 audio/x11amp/files/patch-Input__cdaudio__Makefile.in create mode 100644 audio/x11amp/files/patch-Input__mikmod__Makefile.in create mode 100644 audio/x11amp/files/patch-Input__mpg123__Makefile.in create mode 100644 audio/x11amp/files/patch-Input__wav__Makefile.in delete mode 100644 audio/x11amp/files/patch-Output::OSS::Makefile.in delete mode 100644 audio/x11amp/files/patch-Output::OSS::OSS.h delete mode 100644 audio/x11amp/files/patch-Output::esd::Makefile.in create mode 100644 audio/x11amp/files/patch-Output__OSS__Makefile.in create mode 100644 audio/x11amp/files/patch-Output__OSS__OSS.h create mode 100644 audio/x11amp/files/patch-Output__esd__Makefile.in delete mode 100644 audio/x11amp/files/patch-libx11amp::Makefile.in delete mode 100644 audio/x11amp/files/patch-libx11amp::configure create mode 100644 audio/x11amp/files/patch-libx11amp__Makefile.in create mode 100644 audio/x11amp/files/patch-libx11amp__configure delete mode 100644 audio/x11amp/files/patch-wmx11amp::Makefile.in create mode 100644 audio/x11amp/files/patch-wmx11amp__Makefile.in delete mode 100644 audio/x11amp/files/patch-x11amp::Makefile.in delete mode 100644 audio/x11amp/files/patch-x11amp::main.c create mode 100644 audio/x11amp/files/patch-x11amp__Makefile.in create mode 100644 audio/x11amp/files/patch-x11amp__main.c delete mode 100644 audio/ximp3/files/patch-lib::L3.h create mode 100644 audio/ximp3/files/patch-lib__L3.h delete mode 100644 audio/xmixer/files/patch-Xw::Base.c create mode 100644 audio/xmixer/files/patch-Xw__Base.c (limited to 'audio') diff --git a/audio/ample/files/patch-src::base64.c b/audio/ample/files/patch-src::base64.c deleted file mode 100644 index 23e6d10f7f2b..000000000000 --- a/audio/ample/files/patch-src::base64.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/base64.c.orig Tue Nov 25 18:28:56 2003 -+++ src/base64.c Sat Jul 3 22:38:53 2004 -@@ -18,6 +18,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include -+ - #include - #include - #ifdef HAVE_SYS_TYPES_H diff --git a/audio/ample/files/patch-src__base64.c b/audio/ample/files/patch-src__base64.c new file mode 100644 index 000000000000..23e6d10f7f2b --- /dev/null +++ b/audio/ample/files/patch-src__base64.c @@ -0,0 +1,11 @@ +--- src/base64.c.orig Tue Nov 25 18:28:56 2003 ++++ src/base64.c Sat Jul 3 22:38:53 2004 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include ++ + #include + #include + #ifdef HAVE_SYS_TYPES_H diff --git a/audio/extace/files/patch-src::color_win.c b/audio/extace/files/patch-src::color_win.c deleted file mode 100644 index 08be78990228..000000000000 --- a/audio/extace/files/patch-src::color_win.c +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- src/color_win.c.orig Wed Feb 26 01:22:19 2003 -+++ src/color_win.c Fri May 23 18:26:18 2003 -@@ -579,12 +579,12 @@ - button = gtk_button_new_with_label("Set Color"); - gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", -- (GtkSignalFunc)color_button, (gpointer)SET_COLOR); -+ (GtkSignalFunc)color_button, (gint)SET_COLOR); - - button = gtk_button_new_with_label("Close"); - gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", -- (GtkSignalFunc)color_button, (gpointer)CLOSE); -+ (GtkSignalFunc)color_button, (gint)CLOSE); - - hbox = gtk_hbox_new(TRUE,0); - gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0); -@@ -592,12 +592,12 @@ - button = gtk_button_new_with_label("Save"); - gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", -- (GtkSignalFunc)color_button, (gpointer)SAVE); -+ (GtkSignalFunc)color_button, (gint)SAVE); - - button = gtk_button_new_with_label("Load"); - gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", -- (GtkSignalFunc)color_button, (gpointer)LOAD); -+ (GtkSignalFunc)color_button, (gint)LOAD); - - gtk_widget_show_all(grad_win); - } diff --git a/audio/extace/files/patch-src__color_win.c b/audio/extace/files/patch-src__color_win.c new file mode 100644 index 000000000000..08be78990228 --- /dev/null +++ b/audio/extace/files/patch-src__color_win.c @@ -0,0 +1,35 @@ + +$FreeBSD$ + +--- src/color_win.c.orig Wed Feb 26 01:22:19 2003 ++++ src/color_win.c Fri May 23 18:26:18 2003 +@@ -579,12 +579,12 @@ + button = gtk_button_new_with_label("Set Color"); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button), "clicked", +- (GtkSignalFunc)color_button, (gpointer)SET_COLOR); ++ (GtkSignalFunc)color_button, (gint)SET_COLOR); + + button = gtk_button_new_with_label("Close"); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button), "clicked", +- (GtkSignalFunc)color_button, (gpointer)CLOSE); ++ (GtkSignalFunc)color_button, (gint)CLOSE); + + hbox = gtk_hbox_new(TRUE,0); + gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0); +@@ -592,12 +592,12 @@ + button = gtk_button_new_with_label("Save"); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button), "clicked", +- (GtkSignalFunc)color_button, (gpointer)SAVE); ++ (GtkSignalFunc)color_button, (gint)SAVE); + + button = gtk_button_new_with_label("Load"); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button), "clicked", +- (GtkSignalFunc)color_button, (gpointer)LOAD); ++ (GtkSignalFunc)color_button, (gint)LOAD); + + gtk_widget_show_all(grad_win); + } diff --git a/audio/flite/files/patch-include::cst_sts.h b/audio/flite/files/patch-include::cst_sts.h deleted file mode 100644 index c27fd15d0595..000000000000 --- a/audio/flite/files/patch-include::cst_sts.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- include/cst_sts.h -+++ include/cst_sts.h -@@ -47,9 +47,9 @@ - /* else where, this information plus the indexes in the Unit relation */ - /* allow reconstruction of the signal itself */ - struct cst_sts_struct { -- const unsigned short *frame; -- const int size; /* in samples */ -- const unsigned char *residual; -+ unsigned short *frame; -+ int size; /* in samples */ -+ unsigned char *residual; - }; - typedef struct cst_sts_struct cst_sts; - diff --git a/audio/flite/files/patch-include__cst_sts.h b/audio/flite/files/patch-include__cst_sts.h new file mode 100644 index 000000000000..c27fd15d0595 --- /dev/null +++ b/audio/flite/files/patch-include__cst_sts.h @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- include/cst_sts.h ++++ include/cst_sts.h +@@ -47,9 +47,9 @@ + /* else where, this information plus the indexes in the Unit relation */ + /* allow reconstruction of the signal itself */ + struct cst_sts_struct { +- const unsigned short *frame; +- const int size; /* in samples */ +- const unsigned char *residual; ++ unsigned short *frame; ++ int size; /* in samples */ ++ unsigned char *residual; + }; + typedef struct cst_sts_struct cst_sts; + diff --git a/audio/glame/files/patch-src::plugins::audio_io_oss.c b/audio/glame/files/patch-src::plugins::audio_io_oss.c deleted file mode 100644 index f59657bd3244..000000000000 --- a/audio/glame/files/patch-src::plugins::audio_io_oss.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1 -+++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41 -@@ -26,9 +26,9 @@ - - #ifdef HAVE_OSS_LINUX - #include --#elif HAVE_OSS_SYS -+#elif defined(HAVE_OSS_SYS) - #include --#elif HAVE_OSS_MACHINE -+#elif defined(HAVE_OSS_MACHINE) - #include - #else - #error BUG in OSS configuration. diff --git a/audio/glame/files/patch-src__plugins__audio_io_oss.c b/audio/glame/files/patch-src__plugins__audio_io_oss.c new file mode 100644 index 000000000000..f59657bd3244 --- /dev/null +++ b/audio/glame/files/patch-src__plugins__audio_io_oss.c @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1 ++++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41 +@@ -26,9 +26,9 @@ + + #ifdef HAVE_OSS_LINUX + #include +-#elif HAVE_OSS_SYS ++#elif defined(HAVE_OSS_SYS) + #include +-#elif HAVE_OSS_MACHINE ++#elif defined(HAVE_OSS_MACHINE) + #include + #else + #error BUG in OSS configuration. diff --git a/audio/gnomoradio/files/patch-rainbow::license.cc b/audio/gnomoradio/files/patch-rainbow::license.cc deleted file mode 100644 index 0a77cd7e3776..000000000000 --- a/audio/gnomoradio/files/patch-rainbow::license.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- rainbow/license.cc.orig Wed Dec 22 11:05:36 2004 -+++ rainbow/license.cc Wed Dec 22 11:06:49 2004 -@@ -54,7 +54,7 @@ - } - - if (done) { -- signal > sig; -+ sigc::signal > sig; - sig.connect(slot); - sig(license); - } else { diff --git a/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc b/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc deleted file mode 100644 index 59e878ff7179..000000000000 --- a/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc +++ /dev/null @@ -1,55 +0,0 @@ ---- rainbow/rdf-resource.cc.orig Wed Dec 22 11:07:54 2004 -+++ rainbow/rdf-resource.cc Wed Dec 22 11:09:33 2004 -@@ -35,7 +35,7 @@ - resource = ref_ptr(p->second); - if (resource->downloaded) { // already downloaded - map::iterator el = resource->id_map.find(id); -- signal > sig; -+ sigc::signal > sig; - sig.connect(slot); - sig(el != resource->id_map.end() ? el->second : 0, resource); - return; -@@ -47,7 +47,7 @@ - Glib::ustring host, file; - unsigned short port; - if (!HttpClient::parse_url(uri, host, port, file)) { -- signal > sig; -+ sigc::signal > sig; - sig.connect(slot); - sig(0, resource); - return; -@@ -55,14 +55,14 @@ - } - - // connect mem_fun to appropriate signal -- map >*>::iterator sig; -+ map >*>::iterator sig; - sig = resource->signal_map.find(id); - if (sig != resource->signal_map.end()) { - // found existing signal for id - sig->second->connect(slot); - } else { - // need to create new signal to handle id -- signal > *signal_ = new signal >; -+ sigc::signal > *signal_ = new sigc::signal >; - signal_->connect(slot); - resource->signal_map.insert(make_pair(id, signal_)); - } -@@ -190,7 +190,7 @@ - - error: - // call all signals -- map >*>::iterator signal; -+ map >*>::iterator signal; - for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) { - map::iterator el = id_map.find(signal->first); - signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr(this)); -@@ -204,7 +204,7 @@ - - void Rainbow::RdfResource::clear_signal_map () - { -- map >*>::iterator signal; -+ map >*>::iterator signal; - for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) - delete signal->second; - signal_map.clear(); diff --git a/audio/gnomoradio/files/patch-rainbow__license.cc b/audio/gnomoradio/files/patch-rainbow__license.cc new file mode 100644 index 000000000000..0a77cd7e3776 --- /dev/null +++ b/audio/gnomoradio/files/patch-rainbow__license.cc @@ -0,0 +1,11 @@ +--- rainbow/license.cc.orig Wed Dec 22 11:05:36 2004 ++++ rainbow/license.cc Wed Dec 22 11:06:49 2004 +@@ -54,7 +54,7 @@ + } + + if (done) { +- signal > sig; ++ sigc::signal > sig; + sig.connect(slot); + sig(license); + } else { diff --git a/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc b/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc new file mode 100644 index 000000000000..59e878ff7179 --- /dev/null +++ b/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc @@ -0,0 +1,55 @@ +--- rainbow/rdf-resource.cc.orig Wed Dec 22 11:07:54 2004 ++++ rainbow/rdf-resource.cc Wed Dec 22 11:09:33 2004 +@@ -35,7 +35,7 @@ + resource = ref_ptr(p->second); + if (resource->downloaded) { // already downloaded + map::iterator el = resource->id_map.find(id); +- signal > sig; ++ sigc::signal > sig; + sig.connect(slot); + sig(el != resource->id_map.end() ? el->second : 0, resource); + return; +@@ -47,7 +47,7 @@ + Glib::ustring host, file; + unsigned short port; + if (!HttpClient::parse_url(uri, host, port, file)) { +- signal > sig; ++ sigc::signal > sig; + sig.connect(slot); + sig(0, resource); + return; +@@ -55,14 +55,14 @@ + } + + // connect mem_fun to appropriate signal +- map >*>::iterator sig; ++ map >*>::iterator sig; + sig = resource->signal_map.find(id); + if (sig != resource->signal_map.end()) { + // found existing signal for id + sig->second->connect(slot); + } else { + // need to create new signal to handle id +- signal > *signal_ = new signal >; ++ sigc::signal > *signal_ = new sigc::signal >; + signal_->connect(slot); + resource->signal_map.insert(make_pair(id, signal_)); + } +@@ -190,7 +190,7 @@ + + error: + // call all signals +- map >*>::iterator signal; ++ map >*>::iterator signal; + for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) { + map::iterator el = id_map.find(signal->first); + signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr(this)); +@@ -204,7 +204,7 @@ + + void Rainbow::RdfResource::clear_signal_map () + { +- map >*>::iterator signal; ++ map >*>::iterator signal; + for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) + delete signal->second; + signal_map.clear(); diff --git a/audio/grip/files/patch-src::main.c b/audio/grip/files/patch-src::main.c deleted file mode 100644 index 7da04c7fd540..000000000000 --- a/audio/grip/files/patch-src::main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.c.orig 2010-04-13 08:46:10.000000000 -0300 -+++ src/main.c 2010-04-13 08:46:45.000000000 -0300 -@@ -164,7 +164,7 @@ - GNOME_PARAM_POPT_TABLE,options, - GNOME_PROGRAM_STANDARD_PROPERTIES,NULL); - -- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8"); -+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - setenv("CHARSET","UTF-8",1); - - /* Session Management */ diff --git a/audio/grip/files/patch-src__main.c b/audio/grip/files/patch-src__main.c new file mode 100644 index 000000000000..7da04c7fd540 --- /dev/null +++ b/audio/grip/files/patch-src__main.c @@ -0,0 +1,11 @@ +--- src/main.c.orig 2010-04-13 08:46:10.000000000 -0300 ++++ src/main.c 2010-04-13 08:46:45.000000000 -0300 +@@ -164,7 +164,7 @@ + GNOME_PARAM_POPT_TABLE,options, + GNOME_PROGRAM_STANDARD_PROPERTIES,NULL); + +- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8"); ++ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + setenv("CHARSET","UTF-8",1); + + /* Session Management */ diff --git a/audio/id3ren/files/patch-man::Makefile b/audio/id3ren/files/patch-man::Makefile deleted file mode 100644 index d004277400af..000000000000 --- a/audio/id3ren/files/patch-man::Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- man/Makefile.orig Fri Jan 7 09:53:38 2005 -+++ man/Makefile Fri Jan 7 09:53:54 2005 -@@ -1,6 +1,6 @@ --RM = rm -f --INSTALL = install -m 755 --INSTALL_DIR = /usr/man/man1 -+RM ?= rm -f -+INSTALL = ${BSD_INSTALL_DATA} -+INSTALL_DIR = ${PREFIX}/man/man1 - INSTALL_NAME = id3ren.1.gz - - all: diff --git a/audio/id3ren/files/patch-man__Makefile b/audio/id3ren/files/patch-man__Makefile new file mode 100644 index 000000000000..d004277400af --- /dev/null +++ b/audio/id3ren/files/patch-man__Makefile @@ -0,0 +1,12 @@ +--- man/Makefile.orig Fri Jan 7 09:53:38 2005 ++++ man/Makefile Fri Jan 7 09:53:54 2005 +@@ -1,6 +1,6 @@ +-RM = rm -f +-INSTALL = install -m 755 +-INSTALL_DIR = /usr/man/man1 ++RM ?= rm -f ++INSTALL = ${BSD_INSTALL_DATA} ++INSTALL_DIR = ${PREFIX}/man/man1 + INSTALL_NAME = id3ren.1.gz + + all: diff --git a/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h b/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h deleted file mode 100644 index df50ab655518..000000000000 --- a/audio/libsidplay2/files/patch-libsidplay::include::sidplay::SmartPtr.h +++ /dev/null @@ -1,26 +0,0 @@ ---- libsidplay/include/sidplay/SmartPtr.h.orig Tue Jun 15 05:08:04 2004 -+++ libsidplay/include/sidplay/SmartPtr.h Wed Aug 18 00:47:50 2004 -@@ -211,16 +211,16 @@ - { - if ( bufferLen >= 1 ) - { -- pBufCurrent = ( bufBegin = buffer ); -- bufEnd = bufBegin + bufferLen; -- bufLen = bufferLen; -- status = true; -+ this->pBufCurrent = ( this->bufBegin = buffer ); -+ this->bufEnd = this->bufBegin + bufferLen; -+ this->bufLen = bufferLen; -+ this->status = true; - } - else - { -- pBufCurrent = bufBegin = bufEnd = 0; -- bufLen = 0; -- status = false; -+ this->pBufCurrent = this->bufBegin = this->bufEnd = 0; -+ this->bufLen = 0; -+ this->status = false; - } - } - }; diff --git a/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h b/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h new file mode 100644 index 000000000000..df50ab655518 --- /dev/null +++ b/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h @@ -0,0 +1,26 @@ +--- libsidplay/include/sidplay/SmartPtr.h.orig Tue Jun 15 05:08:04 2004 ++++ libsidplay/include/sidplay/SmartPtr.h Wed Aug 18 00:47:50 2004 +@@ -211,16 +211,16 @@ + { + if ( bufferLen >= 1 ) + { +- pBufCurrent = ( bufBegin = buffer ); +- bufEnd = bufBegin + bufferLen; +- bufLen = bufferLen; +- status = true; ++ this->pBufCurrent = ( this->bufBegin = buffer ); ++ this->bufEnd = this->bufBegin + bufferLen; ++ this->bufLen = bufferLen; ++ this->status = true; + } + else + { +- pBufCurrent = bufBegin = bufEnd = 0; +- bufLen = 0; +- status = false; ++ this->pBufCurrent = this->bufBegin = this->bufEnd = 0; ++ this->bufLen = 0; ++ this->status = false; + } + } + }; diff --git a/audio/mixmos/files/patch-src::mixer.h b/audio/mixmos/files/patch-src::mixer.h deleted file mode 100644 index da743376a0cb..000000000000 --- a/audio/mixmos/files/patch-src::mixer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mixer.h.orig Sat Jul 24 13:16:52 2004 -+++ src/mixer.h Sat Jul 24 13:17:30 2004 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/audio/mixmos/files/patch-src::prefs.h b/audio/mixmos/files/patch-src::prefs.h deleted file mode 100644 index 70d41b2d7333..000000000000 --- a/audio/mixmos/files/patch-src::prefs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prefs.h.orig Sat Jul 24 13:17:03 2004 -+++ src/prefs.h Sat Jul 24 13:17:16 2004 -@@ -20,7 +20,7 @@ - */ - - --#include -+#include - - #define config_filename "mixmos" - diff --git a/audio/mixmos/files/patch-src__mixer.h b/audio/mixmos/files/patch-src__mixer.h new file mode 100644 index 000000000000..da743376a0cb --- /dev/null +++ b/audio/mixmos/files/patch-src__mixer.h @@ -0,0 +1,11 @@ +--- src/mixer.h.orig Sat Jul 24 13:16:52 2004 ++++ src/mixer.h Sat Jul 24 13:17:30 2004 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/audio/mixmos/files/patch-src__prefs.h b/audio/mixmos/files/patch-src__prefs.h new file mode 100644 index 000000000000..70d41b2d7333 --- /dev/null +++ b/audio/mixmos/files/patch-src__prefs.h @@ -0,0 +1,11 @@ +--- src/prefs.h.orig Sat Jul 24 13:17:03 2004 ++++ src/prefs.h Sat Jul 24 13:17:16 2004 +@@ -20,7 +20,7 @@ + */ + + +-#include ++#include + + #define config_filename "mixmos" + diff --git a/audio/mp3blaster/files/patch-src::main.cc b/audio/mp3blaster/files/patch-src::main.cc deleted file mode 100644 index ba8b05bb8904..000000000000 --- a/audio/mp3blaster/files/patch-src::main.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.cc.orig Tue Aug 29 08:54:53 2006 -+++ src/main.cc Tue Aug 29 08:55:01 2006 -@@ -5448,7 +5448,7 @@ - { 0, 0, 0, 0} - }; - -- c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, -+ c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, - &long_index); - - if (c == EOF) diff --git a/audio/mp3blaster/files/patch-src__main.cc b/audio/mp3blaster/files/patch-src__main.cc new file mode 100644 index 000000000000..ba8b05bb8904 --- /dev/null +++ b/audio/mp3blaster/files/patch-src__main.cc @@ -0,0 +1,11 @@ +--- src/main.cc.orig Tue Aug 29 08:54:53 2006 ++++ src/main.cc Tue Aug 29 08:55:01 2006 +@@ -5448,7 +5448,7 @@ + { 0, 0, 0, 0} + }; + +- c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, ++ c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options, + &long_index); + + if (c == EOF) diff --git a/audio/muse/files/patch-src::Makefile.in b/audio/muse/files/patch-src::Makefile.in deleted file mode 100644 index abd4d08a05b1..000000000000 --- a/audio/muse/files/patch-src::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.in.orig Fri Aug 4 11:43:41 2006 -+++ src/Makefile.in Fri Aug 4 11:43:46 2006 -@@ -268,7 +268,6 @@ - $(top_srcdir)/src/libmpeg/libmpeg.a \ - $(top_srcdir)/src/shout/libshout.a \ - $(top_srcdir)/src/portaudio/libportaudio.a \ -- -lpthread \ - @M_LIBS@ \ - @LAME_LIBS@ \ - @OGG_LIBS@ \ diff --git a/audio/muse/files/patch-src::jmixer.cpp b/audio/muse/files/patch-src::jmixer.cpp deleted file mode 100644 index b00c3f06560c..000000000000 --- a/audio/muse/files/patch-src::jmixer.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- src/jmixer.cpp.orig 2004-12-16 20:04:31.000000000 +0900 -+++ src/jmixer.cpp 2012-05-29 07:39:23.000000000 +0900 -@@ -20,18 +20,19 @@ - */ - - #include --#include --#include --#include -+#include -+#include -+#include - #include - #include - #include - #include --#include -+#include -+#include - #include - --#include --#include -+#include -+#include - #include - #include - #include -@@ -640,7 +641,11 @@ - /* this is the function selecting files for the scandir - on freebsd systems you should change the following line to: - int selector(struct dirent *dir) { */ -+#if defined(__FreeBSD__) && __FreeBSD_version < 800501 -+int selector(struct dirent *dir) { -+#else - int selector(const struct dirent *dir) { -+#endif - if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0 - #ifdef HAVE_VORBIS - || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0 diff --git a/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc b/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc deleted file mode 100644 index 6032cdc86627..000000000000 --- a/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libmpeg/mpegtoraw.cc.orig Mon Dec 8 21:20:37 2003 -+++ src/libmpeg/mpegtoraw.cc Mon Apr 19 23:00:18 2004 -@@ -9,8 +9,8 @@ - #include - #endif - --#include --#include -+#include -+#include - #include - - #include "mpegsound.h" -@@ -419,7 +419,7 @@ - return true; - } - --#include -+#include - // Convert mpeg to raw - bool Mpegtoraw::run(int frames) { - clearrawdata(); diff --git a/audio/muse/files/patch-src::outchannels.cpp b/audio/muse/files/patch-src::outchannels.cpp deleted file mode 100644 index b35b3ac2c444..000000000000 --- a/audio/muse/files/patch-src::outchannels.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/outchannels.cpp.orig Thu Apr 15 22:12:15 2004 -+++ src/outchannels.cpp Mon Apr 19 22:37:58 2004 -@@ -24,11 +24,11 @@ - #include - #include - #include -+#include - #include - #include - #include - #include --#include - #include - #include - #include diff --git a/audio/muse/files/patch-src::pipe.cpp b/audio/muse/files/patch-src::pipe.cpp deleted file mode 100644 index aac653714a64..000000000000 --- a/audio/muse/files/patch-src::pipe.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/pipe.cpp.orig Sat Dec 24 18:19:31 2005 -+++ src/pipe.cpp Fri Aug 4 11:48:06 2006 -@@ -25,9 +25,9 @@ - */ - - #include --#include -+#include - #include --#include -+#include - - #include - #include diff --git a/audio/muse/files/patch-src::shout::sock.c b/audio/muse/files/patch-src::shout::sock.c deleted file mode 100644 index 19956755987e..000000000000 --- a/audio/muse/files/patch-src::shout::sock.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/shout/sock.c.orig Tue Mar 30 01:04:27 2004 -+++ src/shout/sock.c Mon Apr 19 23:32:09 2004 -@@ -336,7 +336,11 @@ - int rc = SOCK_ERROR; - va_list ap_retry; - -+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) -+ ap_retry = ap; -+#else - va_copy (ap_retry, ap); -+#endif - - len = vsnprintf (buff, sizeof (buffer), fmt, ap); - diff --git a/audio/muse/files/patch-src__Makefile.in b/audio/muse/files/patch-src__Makefile.in new file mode 100644 index 000000000000..abd4d08a05b1 --- /dev/null +++ b/audio/muse/files/patch-src__Makefile.in @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig Fri Aug 4 11:43:41 2006 ++++ src/Makefile.in Fri Aug 4 11:43:46 2006 +@@ -268,7 +268,6 @@ + $(top_srcdir)/src/libmpeg/libmpeg.a \ + $(top_srcdir)/src/shout/libshout.a \ + $(top_srcdir)/src/portaudio/libportaudio.a \ +- -lpthread \ + @M_LIBS@ \ + @LAME_LIBS@ \ + @OGG_LIBS@ \ diff --git a/audio/muse/files/patch-src__jmixer.cpp b/audio/muse/files/patch-src__jmixer.cpp new file mode 100644 index 000000000000..b00c3f06560c --- /dev/null +++ b/audio/muse/files/patch-src__jmixer.cpp @@ -0,0 +1,40 @@ +--- src/jmixer.cpp.orig 2004-12-16 20:04:31.000000000 +0900 ++++ src/jmixer.cpp 2012-05-29 07:39:23.000000000 +0900 +@@ -20,18 +20,19 @@ + */ + + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include ++#include + #include + +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -640,7 +641,11 @@ + /* this is the function selecting files for the scandir + on freebsd systems you should change the following line to: + int selector(struct dirent *dir) { */ ++#if defined(__FreeBSD__) && __FreeBSD_version < 800501 ++int selector(struct dirent *dir) { ++#else + int selector(const struct dirent *dir) { ++#endif + if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0 + #ifdef HAVE_VORBIS + || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0 diff --git a/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc b/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc new file mode 100644 index 000000000000..6032cdc86627 --- /dev/null +++ b/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc @@ -0,0 +1,22 @@ +--- src/libmpeg/mpegtoraw.cc.orig Mon Dec 8 21:20:37 2003 ++++ src/libmpeg/mpegtoraw.cc Mon Apr 19 23:00:18 2004 +@@ -9,8 +9,8 @@ + #include + #endif + +-#include +-#include ++#include ++#include + #include + + #include "mpegsound.h" +@@ -419,7 +419,7 @@ + return true; + } + +-#include ++#include + // Convert mpeg to raw + bool Mpegtoraw::run(int frames) { + clearrawdata(); diff --git a/audio/muse/files/patch-src__outchannels.cpp b/audio/muse/files/patch-src__outchannels.cpp new file mode 100644 index 000000000000..b35b3ac2c444 --- /dev/null +++ b/audio/muse/files/patch-src__outchannels.cpp @@ -0,0 +1,15 @@ +--- src/outchannels.cpp.orig Thu Apr 15 22:12:15 2004 ++++ src/outchannels.cpp Mon Apr 19 22:37:58 2004 +@@ -24,11 +24,11 @@ + #include + #include + #include ++#include + #include + #include + #include + #include +-#include + #include + #include + #include diff --git a/audio/muse/files/patch-src__pipe.cpp b/audio/muse/files/patch-src__pipe.cpp new file mode 100644 index 000000000000..aac653714a64 --- /dev/null +++ b/audio/muse/files/patch-src__pipe.cpp @@ -0,0 +1,14 @@ +--- src/pipe.cpp.orig Sat Dec 24 18:19:31 2005 ++++ src/pipe.cpp Fri Aug 4 11:48:06 2006 +@@ -25,9 +25,9 @@ + */ + + #include +-#include ++#include + #include +-#include ++#include + + #include + #include diff --git a/audio/muse/files/patch-src__shout__sock.c b/audio/muse/files/patch-src__shout__sock.c new file mode 100644 index 000000000000..19956755987e --- /dev/null +++ b/audio/muse/files/patch-src__shout__sock.c @@ -0,0 +1,14 @@ +--- src/shout/sock.c.orig Tue Mar 30 01:04:27 2004 ++++ src/shout/sock.c Mon Apr 19 23:32:09 2004 +@@ -336,7 +336,11 @@ + int rc = SOCK_ERROR; + va_list ap_retry; + ++#if (defined(__FreeBSD__) && __FreeBSD__ < 5) ++ ap_retry = ap; ++#else + va_copy (ap_retry, ap); ++#endif + + len = vsnprintf (buff, sizeof (buffer), fmt, ap); + diff --git a/audio/napster/files/patch-doc::Makefile.in b/audio/napster/files/patch-doc::Makefile.in deleted file mode 100644 index c7394856d010..000000000000 --- a/audio/napster/files/patch-doc::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Wed Jun 23 11:20:36 2004 -+++ doc/Makefile.in Wed Jun 23 11:22:22 2004 -@@ -124,7 +124,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - EXTRA_DIST = nap.1.in userguide.html napster.txt --htmldir = $(prefix)/doc/nap -+htmldir = $(prefix)/share/doc/nap - man_MANS = nap.1 - html_DATA = userguide.html - all: all-am diff --git a/audio/napster/files/patch-doc__Makefile.in b/audio/napster/files/patch-doc__Makefile.in new file mode 100644 index 000000000000..c7394856d010 --- /dev/null +++ b/audio/napster/files/patch-doc__Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Wed Jun 23 11:20:36 2004 ++++ doc/Makefile.in Wed Jun 23 11:22:22 2004 +@@ -124,7 +124,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = nap.1.in userguide.html napster.txt +-htmldir = $(prefix)/doc/nap ++htmldir = $(prefix)/share/doc/nap + man_MANS = nap.1 + html_DATA = userguide.html + all: all-am diff --git a/audio/rioutil/files/patch-src::Makefile.in b/audio/rioutil/files/patch-src::Makefile.in deleted file mode 100644 index e697fd437268..000000000000 --- a/audio/rioutil/files/patch-src::Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- src/Makefile.in.orig Fri Feb 15 20:49:03 2008 -+++ src/Makefile.in Fri Feb 15 20:49:33 2008 -@@ -51,7 +51,7 @@ - am__installdirs = "$(DESTDIR)$(bindir)" - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) --am_rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) -+am_rioutil_OBJECTS = main.$(OBJEXT) - rioutil_OBJECTS = $(am_rioutil_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -172,9 +172,9 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --INCLUDES = -I$(top_srcdir)/include -I/usr/local/include --rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h --@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -+INCLUDES = -I$(top_srcdir)/include -+rioutil_SOURCES = main.c main.h -+@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la - @MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit - @MACOSX_TRUE@PREBIND_FLAGS = -prebind - rioutil_LDFLAGS = $(PREBIND_FLAGS) -@@ -250,8 +250,6 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - - .c.o: diff --git a/audio/rioutil/files/patch-src__Makefile.in b/audio/rioutil/files/patch-src__Makefile.in new file mode 100644 index 000000000000..e697fd437268 --- /dev/null +++ b/audio/rioutil/files/patch-src__Makefile.in @@ -0,0 +1,33 @@ +--- src/Makefile.in.orig Fri Feb 15 20:49:03 2008 ++++ src/Makefile.in Fri Feb 15 20:49:33 2008 +@@ -51,7 +51,7 @@ + am__installdirs = "$(DESTDIR)$(bindir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +-am_rioutil_OBJECTS = main.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) ++am_rioutil_OBJECTS = main.$(OBJEXT) + rioutil_OBJECTS = $(am_rioutil_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -172,9 +172,9 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include +-rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h +-@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la ++INCLUDES = -I$(top_srcdir)/include ++rioutil_SOURCES = main.c main.h ++@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la + @MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit + @MACOSX_TRUE@PREBIND_FLAGS = -prebind + rioutil_LDFLAGS = $(PREBIND_FLAGS) +@@ -250,8 +250,6 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ + + .c.o: diff --git a/audio/rplay/files/patch-rplayd::rplayd.c b/audio/rplay/files/patch-rplayd::rplayd.c deleted file mode 100644 index e764578164ab..000000000000 --- a/audio/rplay/files/patch-rplayd::rplayd.c +++ /dev/null @@ -1,16 +0,0 @@ ---- rplayd/rplayd.c.orig Wed Mar 10 16:58:04 1999 -+++ rplayd/rplayd.c Fri Jan 31 02:12:40 2003 -@@ -421,10 +421,9 @@ - /* Fork */ - if (do_fork) - { -- int pid = fork(); -- if (pid != 0) -- { -- exit(0); -+ if (daemon(1, 1) < 0) { -+ report(REPORT_ERROR, "daemon: %s\n", sys_err_str(errno)); -+ done(1); - } - } - diff --git a/audio/rplay/files/patch-rplayd__rplayd.c b/audio/rplay/files/patch-rplayd__rplayd.c new file mode 100644 index 000000000000..e764578164ab --- /dev/null +++ b/audio/rplay/files/patch-rplayd__rplayd.c @@ -0,0 +1,16 @@ +--- rplayd/rplayd.c.orig Wed Mar 10 16:58:04 1999 ++++ rplayd/rplayd.c Fri Jan 31 02:12:40 2003 +@@ -421,10 +421,9 @@ + /* Fork */ + if (do_fork) + { +- int pid = fork(); +- if (pid != 0) +- { +- exit(0); ++ if (daemon(1, 1) < 0) { ++ report(REPORT_ERROR, "daemon: %s\n", sys_err_str(errno)); ++ done(1); + } + } + diff --git a/audio/soundtracker/files/patch-app::Makefile.in b/audio/soundtracker/files/patch-app::Makefile.in deleted file mode 100644 index b77dd5b8b80a..000000000000 --- a/audio/soundtracker/files/patch-app::Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- app/Makefile.in.orig Mon Jan 12 01:21:51 2004 -+++ app/Makefile.in Thu Jan 29 19:28:09 2004 -@@ -230,9 +230,9 @@ - - stdir = $(datadir)/soundtracker - --#INCLUDES = -DDATADIR=\"$(stdir)\" \ --# -DLOCALEDIR=\"$(datadir)/locale\" --INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" -+INCLUDES = -DDATADIR=\"$(stdir)\" \ -+ -DLOCALEDIR=\"$(datadir)/locale\" -+#INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" - subdir = app - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/audio/soundtracker/files/patch-app__Makefile.in b/audio/soundtracker/files/patch-app__Makefile.in new file mode 100644 index 000000000000..b77dd5b8b80a --- /dev/null +++ b/audio/soundtracker/files/patch-app__Makefile.in @@ -0,0 +1,15 @@ +--- app/Makefile.in.orig Mon Jan 12 01:21:51 2004 ++++ app/Makefile.in Thu Jan 29 19:28:09 2004 +@@ -230,9 +230,9 @@ + + stdir = $(datadir)/soundtracker + +-#INCLUDES = -DDATADIR=\"$(stdir)\" \ +-# -DLOCALEDIR=\"$(datadir)/locale\" +-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" ++INCLUDES = -DDATADIR=\"$(stdir)\" \ ++ -DLOCALEDIR=\"$(datadir)/locale\" ++#INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" + subdir = app + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/audio/soundtracker/files/patch-po::ja.po b/audio/soundtracker/files/patch-po::ja.po deleted file mode 100644 index 360d66a7d0fc..000000000000 --- a/audio/soundtracker/files/patch-po::ja.po +++ /dev/null @@ -1,65 +0,0 @@ ---- po/ja.po.orig Sat Feb 25 22:25:08 2006 -+++ po/ja.po Sun Feb 26 13:55:01 2006 -@@ -2,14 +2,14 @@ - # Copyright (C) 1998-2000 Michael Krause . - # Translators: Atsushi Yamagata , 1999, 2000. - # Yuuki NINOMIYA , 1999, 2000. --# Junichi Uekawa , 2002, 2003. -+# Junichi Uekawa , 2002, 2003, 2004. - # - msgid "" - msgstr "" - "Project-Id-Version: SoundTracker 0.3.10\n" - "Report-Msgid-Bugs-To: soundtracker-discuss@soundtracker.org\n" - "POT-Creation-Date: 2006-02-25 14:25+0100\n" --"PO-Revision-Date: 2003-08-05 06:54+0900\n" -+"PO-Revision-Date: 2004-01-12 12:13+0900\n" - "Last-Translator: Junichi Uekawa \n" - "Language-Team: Debian Japanese project \n" - "MIME-Version: 1.0\n" -@@ -553,6 +553,8 @@ - "Odd pattern rows contain data which will be lost after shrinking.\n" - "Do you want to continue anyway?" - msgstr "" -+"奇数のパターンの列は縮小すると失われます．\n" -+"続行しますか？" - - #: app/gui.c:506 - msgid "" -@@ -560,6 +562,8 @@ - "Some data at the end of the pattern will be lost.\n" - "Do you want to continue anyway?" - msgstr "" -+"拡張するにはパターンは長すぎます．\n" -+"パターンの最後のデータが一部失われる事になります．続行しますか？" - - #: app/gui.c:555 app/instrument-editor.c:212 app/sample-editor.c:1719 - #: app/sample-editor.c:1915 app/sample-editor.c:1959 -@@ -1034,9 +1038,8 @@ - msgstr "オクターブ下げる" - - #: app/menubar.c:526 --#, fuzzy - msgid "P_aste" --msgstr "貼付" -+msgstr "貼付(_a)" - - #: app/menubar.c:531 - msgid "_Jazz Edit Mode" -@@ -1087,14 +1090,12 @@ - msgstr "パターンを読み込み(_o)" - - #: app/menubar.c:599 --#, fuzzy - msgid "Sh_rink Current Pattern" --msgstr "現在のパターン" -+msgstr "現在のパターンを縮小(_r)" - - #: app/menubar.c:601 --#, fuzzy - msgid "_Expand Current Pattern" --msgstr "現在のパターンを保存(_S)" -+msgstr "現在のパターンを拡張(_E)" - - #: app/menubar.c:608 - msgid "_Toggle Current Channel Permanentness" diff --git a/audio/soundtracker/files/patch-po__ja.po b/audio/soundtracker/files/patch-po__ja.po new file mode 100644 index 000000000000..360d66a7d0fc --- /dev/null +++ b/audio/soundtracker/files/patch-po__ja.po @@ -0,0 +1,65 @@ +--- po/ja.po.orig Sat Feb 25 22:25:08 2006 ++++ po/ja.po Sun Feb 26 13:55:01 2006 +@@ -2,14 +2,14 @@ + # Copyright (C) 1998-2000 Michael Krause . + # Translators: Atsushi Yamagata , 1999, 2000. + # Yuuki NINOMIYA , 1999, 2000. +-# Junichi Uekawa , 2002, 2003. ++# Junichi Uekawa , 2002, 2003, 2004. + # + msgid "" + msgstr "" + "Project-Id-Version: SoundTracker 0.3.10\n" + "Report-Msgid-Bugs-To: soundtracker-discuss@soundtracker.org\n" + "POT-Creation-Date: 2006-02-25 14:25+0100\n" +-"PO-Revision-Date: 2003-08-05 06:54+0900\n" ++"PO-Revision-Date: 2004-01-12 12:13+0900\n" + "Last-Translator: Junichi Uekawa \n" + "Language-Team: Debian Japanese project \n" + "MIME-Version: 1.0\n" +@@ -553,6 +553,8 @@ + "Odd pattern rows contain data which will be lost after shrinking.\n" + "Do you want to continue anyway?" + msgstr "" ++"奇数のパターンの列は縮小すると失われます．\n" ++"続行しますか？" + + #: app/gui.c:506 + msgid "" +@@ -560,6 +562,8 @@ + "Some data at the end of the pattern will be lost.\n" + "Do you want to continue anyway?" + msgstr "" ++"拡張するにはパターンは長すぎます．\n" ++"パターンの最後のデータが一部失われる事になります．続行しますか？" + + #: app/gui.c:555 app/instrument-editor.c:212 app/sample-editor.c:1719 + #: app/sample-editor.c:1915 app/sample-editor.c:1959 +@@ -1034,9 +1038,8 @@ + msgstr "オクターブ下げる" + + #: app/menubar.c:526 +-#, fuzzy + msgid "P_aste" +-msgstr "貼付" ++msgstr "貼付(_a)" + + #: app/menubar.c:531 + msgid "_Jazz Edit Mode" +@@ -1087,14 +1090,12 @@ + msgstr "パターンを読み込み(_o)" + + #: app/menubar.c:599 +-#, fuzzy + msgid "Sh_rink Current Pattern" +-msgstr "現在のパターン" ++msgstr "現在のパターンを縮小(_r)" + + #: app/menubar.c:601 +-#, fuzzy + msgid "_Expand Current Pattern" +-msgstr "現在のパターンを保存(_S)" ++msgstr "現在のパターンを拡張(_E)" + + #: app/menubar.c:608 + msgid "_Toggle Current Channel Permanentness" diff --git a/audio/umix/files/patch-src::driver_oss.c b/audio/umix/files/patch-src::driver_oss.c deleted file mode 100644 index d7a1340b3dce..000000000000 --- a/audio/umix/files/patch-src::driver_oss.c +++ /dev/null @@ -1,64 +0,0 @@ ---- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003 -+++ src/driver_oss.c Tue Feb 20 22:44:43 2007 -@@ -27,7 +27,7 @@ - #if defined(__linux__) - #include - #elif defined(__FreeBSD__) -- #include "machine/soundcard.h" -+ #include - #elif defined(__NetBSD__) - #include - #endif -@@ -253,8 +253,10 @@ - * oss_open() before initializing. */ - int oss_init(void) - { -+#if 0 - /* this is an OSS structure, defined in soundcard.h */ - struct mixer_info oss_info; -+#endif - int old_mixer; - int ch; - int i; -@@ -288,9 +290,13 @@ - mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; - mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); - -+#if 0 - /* get the mixer name */ - eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); - strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); -+#else -+ strncpy(mixer_ptr->name, "", 1); -+#endif - - mixer_ptr->curr_chan = 0; - #ifdef UMIX_DEBUG -@@ -329,9 +335,11 @@ - oss_set_curr_chan(i); - oss_update(OSS_UPD_READ); - } -+#if 0 - /* init the modify counter */ - eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); - mixer_ptr->modifycount = oss_info.modify_counter; -+#endif - - #ifdef UMIX_DEBUG - err_msg("oss_init: initialized #%d with %d channels", -@@ -388,6 +396,7 @@ - * the device and compares it to the old */ - static int oss_check_update(void) - { -+#if 0 - struct mixer_info oss_info; - - eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); -@@ -396,6 +405,7 @@ - mixer_ptr->modifycount = oss_info.modify_counter; - return 1; - } -+#endif - - return 0; - } diff --git a/audio/umix/files/patch-src__driver_oss.c b/audio/umix/files/patch-src__driver_oss.c new file mode 100644 index 000000000000..d7a1340b3dce --- /dev/null +++ b/audio/umix/files/patch-src__driver_oss.c @@ -0,0 +1,64 @@ +--- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003 ++++ src/driver_oss.c Tue Feb 20 22:44:43 2007 +@@ -27,7 +27,7 @@ + #if defined(__linux__) + #include + #elif defined(__FreeBSD__) +- #include "machine/soundcard.h" ++ #include + #elif defined(__NetBSD__) + #include + #endif +@@ -253,8 +253,10 @@ + * oss_open() before initializing. */ + int oss_init(void) + { ++#if 0 + /* this is an OSS structure, defined in soundcard.h */ + struct mixer_info oss_info; ++#endif + int old_mixer; + int ch; + int i; +@@ -288,9 +290,13 @@ + mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; + mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); + ++#if 0 + /* get the mixer name */ + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); + strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); ++#else ++ strncpy(mixer_ptr->name, "", 1); ++#endif + + mixer_ptr->curr_chan = 0; + #ifdef UMIX_DEBUG +@@ -329,9 +335,11 @@ + oss_set_curr_chan(i); + oss_update(OSS_UPD_READ); + } ++#if 0 + /* init the modify counter */ + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); + mixer_ptr->modifycount = oss_info.modify_counter; ++#endif + + #ifdef UMIX_DEBUG + err_msg("oss_init: initialized #%d with %d channels", +@@ -388,6 +396,7 @@ + * the device and compares it to the old */ + static int oss_check_update(void) + { ++#if 0 + struct mixer_info oss_info; + + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); +@@ -396,6 +405,7 @@ + mixer_ptr->modifycount = oss_info.modify_counter; + return 1; + } ++#endif + + return 0; + } diff --git a/audio/x11amp/files/patch-Effect::test::Makefile.in b/audio/x11amp/files/patch-Effect::test::Makefile.in deleted file mode 100644 index be0d81bebffa..000000000000 --- a/audio/x11amp/files/patch-Effect::test::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Effect/test/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Effect/test/Makefile.in 2001/11/26 17:59:32 -@@ -90,7 +90,7 @@ - libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR) - - libtest_la_LDFLAGS = -module -avoid-version --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ - LIBS = - - libtest_la_SOURCES = test.c test.h diff --git a/audio/x11amp/files/patch-Effect::voice::Makefile.in b/audio/x11amp/files/patch-Effect::voice::Makefile.in deleted file mode 100644 index 27bd7805b902..000000000000 --- a/audio/x11amp/files/patch-Effect::voice::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Effect/voice/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Effect/voice/Makefile.in 2001/11/26 17:59:37 -@@ -90,7 +90,7 @@ - libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR) - - libvoice_la_LDFLAGS = -module -avoid-version --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ - LIBS = - - libvoice_la_SOURCES = about.c voice.c voice.h diff --git a/audio/x11amp/files/patch-Effect::voice::about.c b/audio/x11amp/files/patch-Effect::voice::about.c deleted file mode 100644 index 356aa70de19d..000000000000 --- a/audio/x11amp/files/patch-Effect::voice::about.c +++ /dev/null @@ -1,14 +0,0 @@ ---- Effect/voice/about.c.orig Tue Feb 24 22:46:03 2004 -+++ Effect/voice/about.c Tue Feb 24 22:46:43 2004 -@@ -31,9 +31,8 @@ - dialog=gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(dialog),"About Voice Removal Plugin 0.9"); - gtk_container_border_width(GTK_CONTAINER(dialog),5); -- label=gtk_label_new("X11AMP Voice Removal Plugin 0.9\n --A simple voice removal plugin by --Anders Carlsson " -+ label=gtk_label_new("X11AMP Voice Removal Plugin 0.9\n" -+"A simple voice removal plugin by Anders Carlsson " - ); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),label,TRUE,TRUE,0); - gtk_widget_show(label); diff --git a/audio/x11amp/files/patch-Effect__test__Makefile.in b/audio/x11amp/files/patch-Effect__test__Makefile.in new file mode 100644 index 000000000000..be0d81bebffa --- /dev/null +++ b/audio/x11amp/files/patch-Effect__test__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Effect/test/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Effect/test/Makefile.in 2001/11/26 17:59:32 +@@ -90,7 +90,7 @@ + libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR) + + libtest_la_LDFLAGS = -module -avoid-version +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ + LIBS = + + libtest_la_SOURCES = test.c test.h diff --git a/audio/x11amp/files/patch-Effect__voice__Makefile.in b/audio/x11amp/files/patch-Effect__voice__Makefile.in new file mode 100644 index 000000000000..27bd7805b902 --- /dev/null +++ b/audio/x11amp/files/patch-Effect__voice__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Effect/voice/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Effect/voice/Makefile.in 2001/11/26 17:59:37 +@@ -90,7 +90,7 @@ + libdir = $(plugindir)/$(EFFECT_PLUGIN_DIR) + + libvoice_la_LDFLAGS = -module -avoid-version +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ + LIBS = + + libvoice_la_SOURCES = about.c voice.c voice.h diff --git a/audio/x11amp/files/patch-Effect__voice__about.c b/audio/x11amp/files/patch-Effect__voice__about.c new file mode 100644 index 000000000000..356aa70de19d --- /dev/null +++ b/audio/x11amp/files/patch-Effect__voice__about.c @@ -0,0 +1,14 @@ +--- Effect/voice/about.c.orig Tue Feb 24 22:46:03 2004 ++++ Effect/voice/about.c Tue Feb 24 22:46:43 2004 +@@ -31,9 +31,8 @@ + dialog=gtk_dialog_new(); + gtk_window_set_title(GTK_WINDOW(dialog),"About Voice Removal Plugin 0.9"); + gtk_container_border_width(GTK_CONTAINER(dialog),5); +- label=gtk_label_new("X11AMP Voice Removal Plugin 0.9\n +-A simple voice removal plugin by +-Anders Carlsson " ++ label=gtk_label_new("X11AMP Voice Removal Plugin 0.9\n" ++"A simple voice removal plugin by Anders Carlsson " + ); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),label,TRUE,TRUE,0); + gtk_widget_show(label); diff --git a/audio/x11amp/files/patch-General::ir::Makefile.in b/audio/x11amp/files/patch-General::ir::Makefile.in deleted file mode 100644 index 3dfd0c357282..000000000000 --- a/audio/x11amp/files/patch-General::ir::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- General/ir/Makefile.in 2001/11/26 17:58:25 1.1 -+++ General/ir/Makefile.in 2001/11/26 18:00:50 -@@ -90,7 +90,7 @@ - libdir = $(plugindir)/$(GENERAL_PLUGIN_DIR) - - libir_la_LDFLAGS = -module -avoid-version --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ - LIBS = - - libir_la_SOURCES = ir.c ir.h irman.h configure.c about.c irio.c irfunc.c diff --git a/audio/x11amp/files/patch-General::ir::about.c b/audio/x11amp/files/patch-General::ir::about.c deleted file mode 100644 index 11efe9decdcd..000000000000 --- a/audio/x11amp/files/patch-General::ir::about.c +++ /dev/null @@ -1,15 +0,0 @@ ---- General/ir/about.c.orig Tue Feb 24 22:47:57 2004 -+++ General/ir/about.c Tue Feb 24 22:48:46 2004 -@@ -34,9 +34,9 @@ - gtk_container_border_width(GTK_CONTAINER(frame),5); - gtk_box_pack_start(GTK_BOX(vbox),frame,FALSE,FALSE,0); - -- label=gtk_label_new("\nCreated by Charles Sielski \n -- Control X11amp with your TV/VCR/Stereo remote \n -- IRman page - http://www.evation.com/irman/\n"); -+ label=gtk_label_new("Created by Charles Sielski \n" -+ "Control X11amp with your TV/VCR/Stereo remote\n" -+ "IRman page - http://www.evation.com/irman/\n"); - - gtk_container_add(GTK_CONTAINER(frame),label); - diff --git a/audio/x11amp/files/patch-General__ir__Makefile.in b/audio/x11amp/files/patch-General__ir__Makefile.in new file mode 100644 index 000000000000..3dfd0c357282 --- /dev/null +++ b/audio/x11amp/files/patch-General__ir__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- General/ir/Makefile.in 2001/11/26 17:58:25 1.1 ++++ General/ir/Makefile.in 2001/11/26 18:00:50 +@@ -90,7 +90,7 @@ + libdir = $(plugindir)/$(GENERAL_PLUGIN_DIR) + + libir_la_LDFLAGS = -module -avoid-version +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ + LIBS = + + libir_la_SOURCES = ir.c ir.h irman.h configure.c about.c irio.c irfunc.c diff --git a/audio/x11amp/files/patch-General__ir__about.c b/audio/x11amp/files/patch-General__ir__about.c new file mode 100644 index 000000000000..11efe9decdcd --- /dev/null +++ b/audio/x11amp/files/patch-General__ir__about.c @@ -0,0 +1,15 @@ +--- General/ir/about.c.orig Tue Feb 24 22:47:57 2004 ++++ General/ir/about.c Tue Feb 24 22:48:46 2004 +@@ -34,9 +34,9 @@ + gtk_container_border_width(GTK_CONTAINER(frame),5); + gtk_box_pack_start(GTK_BOX(vbox),frame,FALSE,FALSE,0); + +- label=gtk_label_new("\nCreated by Charles Sielski \n +- Control X11amp with your TV/VCR/Stereo remote \n +- IRman page - http://www.evation.com/irman/\n"); ++ label=gtk_label_new("Created by Charles Sielski \n" ++ "Control X11amp with your TV/VCR/Stereo remote\n" ++ "IRman page - http://www.evation.com/irman/\n"); + + gtk_container_add(GTK_CONTAINER(frame),label); + diff --git a/audio/x11amp/files/patch-Input::cdaudio::Makefile.in b/audio/x11amp/files/patch-Input::cdaudio::Makefile.in deleted file mode 100644 index a6534f85f477..000000000000 --- a/audio/x11amp/files/patch-Input::cdaudio::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Input/cdaudio/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Input/cdaudio/Makefile.in 2001/11/26 17:59:28 -@@ -97,7 +97,7 @@ - libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) - - libcdaudio_la_LDFLAGS = $(cdaudioldflags) --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ - LIBS = - - libcdaudio_la_SOURCES = $(cdaudiosources) diff --git a/audio/x11amp/files/patch-Input::mikmod::Makefile.in b/audio/x11amp/files/patch-Input::mikmod::Makefile.in deleted file mode 100644 index a81defefdbca..000000000000 --- a/audio/x11amp/files/patch-Input::mikmod::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Input/mikmod/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Input/mikmod/Makefile.in 2001/11/26 17:59:23 -@@ -94,7 +94,7 @@ - - libmikmod_la_LDFLAGS = -module -avoid-version - LIBS = --CFLAGS = -I$(top_srcdir) -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_srcdir) -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -D_REENTRANT @GTK_CFLAGS@ - - - libmikmod_la_SOURCES = load_669.c load_amf.c load_dsm.c load_far.c load_it.c load_m15.c load_med.c load_mod.c load_mtm.c load_s3m.c load_stm.c load_ult.c load_xm.c mmalloc.c mmerror.c mmio.c drv_x11amp.c drv_nos.c mdreg.c mdriver.c mloader.c mlreg.c mplayer.c munitrk.c mwav.c npertab.c s3m_it.c sloader.c virtch.c marchive.c mikmod.h mikmod.xpm mikmod_internals.h mikmod-plugin.h plugin.c diff --git a/audio/x11amp/files/patch-Input::mpg123::Makefile.in b/audio/x11amp/files/patch-Input::mpg123::Makefile.in deleted file mode 100644 index 600f6c27830d..000000000000 --- a/audio/x11amp/files/patch-Input::mpg123::Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- Input/mpg123/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Input/mpg123/Makefile.in 2001/11/26 17:59:16 -@@ -89,7 +89,7 @@ - - libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) - --COMMON_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math @GTK_CFLAGS@ -D_REENTRANT -+COMMON_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math @GTK_CFLAGS@ -D_REENTRANT - - - COMMON_SRC = mpg123.c configure.c fileinfo.c common.c decode_2to1.c decode_4to1.c decode_ntom.c layer1.c layer2.c layer3.c tabinit.c equalizer.c http.c huffman.h mpg123.h tables.h dxhead.c dxhead.h -@@ -105,7 +105,7 @@ - libmpg123_la_SOURCES = $(COMMON_SRC) $(EXTRA_SRC) - libmpg123_la_LDFLAGS = -module -avoid-version - --CFLAGS = $(COMMON_CFLAGS) $(EXTRA_CFLAGS) -+CFLAGS += $(COMMON_CFLAGS) $(EXTRA_CFLAGS) - LIBS = - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h diff --git a/audio/x11amp/files/patch-Input::wav::Makefile.in b/audio/x11amp/files/patch-Input::wav::Makefile.in deleted file mode 100644 index 606165df690c..000000000000 --- a/audio/x11amp/files/patch-Input::wav::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Input/wav/Makefile.in 2001/11/26 17:58:25 1.1 -+++ Input/wav/Makefile.in 2001/11/26 17:59:00 -@@ -90,7 +90,7 @@ - libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) - - libwav_la_LDFLAGS = -module -avoid-version --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ - LIBS = - - libwav_la_SOURCES = wav.c wav.h diff --git a/audio/x11amp/files/patch-Input__cdaudio__Makefile.in b/audio/x11amp/files/patch-Input__cdaudio__Makefile.in new file mode 100644 index 000000000000..a6534f85f477 --- /dev/null +++ b/audio/x11amp/files/patch-Input__cdaudio__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Input/cdaudio/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Input/cdaudio/Makefile.in 2001/11/26 17:59:28 +@@ -97,7 +97,7 @@ + libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) + + libcdaudio_la_LDFLAGS = $(cdaudioldflags) +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ + LIBS = + + libcdaudio_la_SOURCES = $(cdaudiosources) diff --git a/audio/x11amp/files/patch-Input__mikmod__Makefile.in b/audio/x11amp/files/patch-Input__mikmod__Makefile.in new file mode 100644 index 000000000000..a81defefdbca --- /dev/null +++ b/audio/x11amp/files/patch-Input__mikmod__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Input/mikmod/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Input/mikmod/Makefile.in 2001/11/26 17:59:23 +@@ -94,7 +94,7 @@ + + libmikmod_la_LDFLAGS = -module -avoid-version + LIBS = +-CFLAGS = -I$(top_srcdir) -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_srcdir) -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -D_REENTRANT @GTK_CFLAGS@ + + + libmikmod_la_SOURCES = load_669.c load_amf.c load_dsm.c load_far.c load_it.c load_m15.c load_med.c load_mod.c load_mtm.c load_s3m.c load_stm.c load_ult.c load_xm.c mmalloc.c mmerror.c mmio.c drv_x11amp.c drv_nos.c mdreg.c mdriver.c mloader.c mlreg.c mplayer.c munitrk.c mwav.c npertab.c s3m_it.c sloader.c virtch.c marchive.c mikmod.h mikmod.xpm mikmod_internals.h mikmod-plugin.h plugin.c diff --git a/audio/x11amp/files/patch-Input__mpg123__Makefile.in b/audio/x11amp/files/patch-Input__mpg123__Makefile.in new file mode 100644 index 000000000000..600f6c27830d --- /dev/null +++ b/audio/x11amp/files/patch-Input__mpg123__Makefile.in @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- Input/mpg123/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Input/mpg123/Makefile.in 2001/11/26 17:59:16 +@@ -89,7 +89,7 @@ + + libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) + +-COMMON_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math @GTK_CFLAGS@ -D_REENTRANT ++COMMON_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math @GTK_CFLAGS@ -D_REENTRANT + + + COMMON_SRC = mpg123.c configure.c fileinfo.c common.c decode_2to1.c decode_4to1.c decode_ntom.c layer1.c layer2.c layer3.c tabinit.c equalizer.c http.c huffman.h mpg123.h tables.h dxhead.c dxhead.h +@@ -105,7 +105,7 @@ + libmpg123_la_SOURCES = $(COMMON_SRC) $(EXTRA_SRC) + libmpg123_la_LDFLAGS = -module -avoid-version + +-CFLAGS = $(COMMON_CFLAGS) $(EXTRA_CFLAGS) ++CFLAGS += $(COMMON_CFLAGS) $(EXTRA_CFLAGS) + LIBS = + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h diff --git a/audio/x11amp/files/patch-Input__wav__Makefile.in b/audio/x11amp/files/patch-Input__wav__Makefile.in new file mode 100644 index 000000000000..606165df690c --- /dev/null +++ b/audio/x11amp/files/patch-Input__wav__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Input/wav/Makefile.in 2001/11/26 17:58:25 1.1 ++++ Input/wav/Makefile.in 2001/11/26 17:59:00 +@@ -90,7 +90,7 @@ + libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) + + libwav_la_LDFLAGS = -module -avoid-version +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -D_REENTRANT @GTK_CFLAGS@ + LIBS = + + libwav_la_SOURCES = wav.c wav.h diff --git a/audio/x11amp/files/patch-Output::OSS::Makefile.in b/audio/x11amp/files/patch-Output::OSS::Makefile.in deleted file mode 100644 index ced6298795c1..000000000000 --- a/audio/x11amp/files/patch-Output::OSS::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Output/OSS/Makefile.in 2001/11/26 18:04:59 1.1 -+++ Output/OSS/Makefile.in 2001/11/26 18:05:10 -@@ -94,7 +94,7 @@ - - lib_LTLIBRARIES = $(ossltlibs) - --CFLAGS = @GTK_CFLAGS@ -D_REENTRANT -I$(top_srcdir) -+CFLAGS += @GTK_CFLAGS@ -D_REENTRANT -I$(top_srcdir) - libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR) - - libOSS_la_LDFLAGS = $(ossldflags) diff --git a/audio/x11amp/files/patch-Output::OSS::OSS.h b/audio/x11amp/files/patch-Output::OSS::OSS.h deleted file mode 100644 index f6a51284e77f..000000000000 --- a/audio/x11amp/files/patch-Output::OSS::OSS.h +++ /dev/null @@ -1,14 +0,0 @@ ---- ./Output/OSS/OSS.h.orig Sat Sep 7 18:38:05 2002 -+++ ./Output/OSS/OSS.h Sat Sep 7 18:38:13 2002 -@@ -23,11 +23,7 @@ - #include - #include - #include --#ifdef __FreeBSD__ --#include --#else - #include --#endif - - #include - #include diff --git a/audio/x11amp/files/patch-Output::esd::Makefile.in b/audio/x11amp/files/patch-Output::esd::Makefile.in deleted file mode 100644 index 6e36a2b60385..000000000000 --- a/audio/x11amp/files/patch-Output::esd::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Output/esd/Makefile.in 2001/11/26 18:04:01 1.1 -+++ Output/esd/Makefile.in 2001/11/26 18:04:15 -@@ -94,7 +94,7 @@ - - lib_LTLIBRARIES = $(esdltlibs) - --CFLAGS = @GTK_CFLAGS@ @ESD_CFLAGS@ -D_REENTRANT -I$(top_srcdir) -+CFLAGS += @GTK_CFLAGS@ @ESD_CFLAGS@ -D_REENTRANT -I$(top_srcdir) - libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR) - - libesdout_la_LDFLAGS = $(esdldflags) diff --git a/audio/x11amp/files/patch-Output__OSS__Makefile.in b/audio/x11amp/files/patch-Output__OSS__Makefile.in new file mode 100644 index 000000000000..ced6298795c1 --- /dev/null +++ b/audio/x11amp/files/patch-Output__OSS__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Output/OSS/Makefile.in 2001/11/26 18:04:59 1.1 ++++ Output/OSS/Makefile.in 2001/11/26 18:05:10 +@@ -94,7 +94,7 @@ + + lib_LTLIBRARIES = $(ossltlibs) + +-CFLAGS = @GTK_CFLAGS@ -D_REENTRANT -I$(top_srcdir) ++CFLAGS += @GTK_CFLAGS@ -D_REENTRANT -I$(top_srcdir) + libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR) + + libOSS_la_LDFLAGS = $(ossldflags) diff --git a/audio/x11amp/files/patch-Output__OSS__OSS.h b/audio/x11amp/files/patch-Output__OSS__OSS.h new file mode 100644 index 000000000000..f6a51284e77f --- /dev/null +++ b/audio/x11amp/files/patch-Output__OSS__OSS.h @@ -0,0 +1,14 @@ +--- ./Output/OSS/OSS.h.orig Sat Sep 7 18:38:05 2002 ++++ ./Output/OSS/OSS.h Sat Sep 7 18:38:13 2002 +@@ -23,11 +23,7 @@ + #include + #include + #include +-#ifdef __FreeBSD__ +-#include +-#else + #include +-#endif + + #include + #include diff --git a/audio/x11amp/files/patch-Output__esd__Makefile.in b/audio/x11amp/files/patch-Output__esd__Makefile.in new file mode 100644 index 000000000000..6e36a2b60385 --- /dev/null +++ b/audio/x11amp/files/patch-Output__esd__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Output/esd/Makefile.in 2001/11/26 18:04:01 1.1 ++++ Output/esd/Makefile.in 2001/11/26 18:04:15 +@@ -94,7 +94,7 @@ + + lib_LTLIBRARIES = $(esdltlibs) + +-CFLAGS = @GTK_CFLAGS@ @ESD_CFLAGS@ -D_REENTRANT -I$(top_srcdir) ++CFLAGS += @GTK_CFLAGS@ @ESD_CFLAGS@ -D_REENTRANT -I$(top_srcdir) + libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR) + + libesdout_la_LDFLAGS = $(esdldflags) diff --git a/audio/x11amp/files/patch-libx11amp::Makefile.in b/audio/x11amp/files/patch-libx11amp::Makefile.in deleted file mode 100644 index 0179fe77a8f5..000000000000 --- a/audio/x11amp/files/patch-libx11amp::Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- libx11amp/Makefile.in.orig Mon Apr 12 04:21:04 1999 -+++ libx11amp/Makefile.in Mon Nov 26 19:58:56 2001 -@@ -45,7 +45,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - --INSTALL = @INSTALL@ -+INSTALL = /usr/bin/install -c -o root -g wheel - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -77,7 +77,7 @@ - lib_LTLIBRARIES = libx11amp.la - - libx11amp_la_LDFLAGS = -export-dynamic -version-info 9:0:9 @GLIB_LIBS@ --CFLAGS = -O2 @GLIB_CFLAGS@ -+CFLAGS += @GLIB_CFLAGS@ - - libx11amp_la_SOURCES = configfile.c configfile.h x11ampctrl.c x11ampctrl.h - diff --git a/audio/x11amp/files/patch-libx11amp::configure b/audio/x11amp/files/patch-libx11amp::configure deleted file mode 100644 index aa00c48b4b5a..000000000000 --- a/audio/x11amp/files/patch-libx11amp::configure +++ /dev/null @@ -1,11 +0,0 @@ ---- libx11amp/configure.orig Tue May 31 17:43:26 2005 -+++ libx11amp/configure Tue May 31 17:43:36 2005 -@@ -1304,7 +1304,7 @@ - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ -+$ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - diff --git a/audio/x11amp/files/patch-libx11amp__Makefile.in b/audio/x11amp/files/patch-libx11amp__Makefile.in new file mode 100644 index 000000000000..0179fe77a8f5 --- /dev/null +++ b/audio/x11amp/files/patch-libx11amp__Makefile.in @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- libx11amp/Makefile.in.orig Mon Apr 12 04:21:04 1999 ++++ libx11amp/Makefile.in Mon Nov 26 19:58:56 2001 +@@ -45,7 +45,7 @@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + +-INSTALL = @INSTALL@ ++INSTALL = /usr/bin/install -c -o root -g wheel + INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -77,7 +77,7 @@ + lib_LTLIBRARIES = libx11amp.la + + libx11amp_la_LDFLAGS = -export-dynamic -version-info 9:0:9 @GLIB_LIBS@ +-CFLAGS = -O2 @GLIB_CFLAGS@ ++CFLAGS += @GLIB_CFLAGS@ + + libx11amp_la_SOURCES = configfile.c configfile.h x11ampctrl.c x11ampctrl.h + diff --git a/audio/x11amp/files/patch-libx11amp__configure b/audio/x11amp/files/patch-libx11amp__configure new file mode 100644 index 000000000000..aa00c48b4b5a --- /dev/null +++ b/audio/x11amp/files/patch-libx11amp__configure @@ -0,0 +1,11 @@ +--- libx11amp/configure.orig Tue May 31 17:43:26 2005 ++++ libx11amp/configure Tue May 31 17:43:36 2005 +@@ -1304,7 +1304,7 @@ + # Actually configure libtool. ac_aux_dir is where install-sh is found. + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ ++$ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + diff --git a/audio/x11amp/files/patch-wmx11amp::Makefile.in b/audio/x11amp/files/patch-wmx11amp::Makefile.in deleted file mode 100644 index d0bb63c485e4..000000000000 --- a/audio/x11amp/files/patch-wmx11amp::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- wmx11amp/Makefile.in 2001/11/26 17:58:25 1.1 -+++ wmx11amp/Makefile.in 2001/11/26 17:59:44 -@@ -88,7 +88,7 @@ - - bin_PROGRAMS = wmx11amp - --CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -DDATADIR=\"$(pkgdatadir)\" @GTK_CFLAGS@ -+CFLAGS += -I$(top_builddir) -I$(top_srcdir) -DDATADIR=\"$(pkgdatadir)\" @GTK_CFLAGS@ - LIBS = @GTK_LIBS@ $(top_builddir)/libx11amp/libx11amp.la - - wmx11amp_SOURCES = getopt.c getopt1.c getopt.h wmx11amp.c diff --git a/audio/x11amp/files/patch-wmx11amp__Makefile.in b/audio/x11amp/files/patch-wmx11amp__Makefile.in new file mode 100644 index 000000000000..d0bb63c485e4 --- /dev/null +++ b/audio/x11amp/files/patch-wmx11amp__Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- wmx11amp/Makefile.in 2001/11/26 17:58:25 1.1 ++++ wmx11amp/Makefile.in 2001/11/26 17:59:44 +@@ -88,7 +88,7 @@ + + bin_PROGRAMS = wmx11amp + +-CFLAGS = -O2 -I$(top_builddir) -I$(top_srcdir) -DDATADIR=\"$(pkgdatadir)\" @GTK_CFLAGS@ ++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -DDATADIR=\"$(pkgdatadir)\" @GTK_CFLAGS@ + LIBS = @GTK_LIBS@ $(top_builddir)/libx11amp/libx11amp.la + + wmx11amp_SOURCES = getopt.c getopt1.c getopt.h wmx11amp.c diff --git a/audio/x11amp/files/patch-x11amp::Makefile.in b/audio/x11amp/files/patch-x11amp::Makefile.in deleted file mode 100644 index 92cf7ce838de..000000000000 --- a/audio/x11amp/files/patch-x11amp::Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- x11amp/Makefile.in.orig Mon Apr 12 04:21:06 1999 -+++ x11amp/Makefile.in Mon Nov 26 19:55:52 2001 -@@ -92,8 +92,8 @@ - - bin_PROGRAMS = x11amp - --LIBS = @GTK_LIBS@ -lpthread $(top_builddir)/libx11amp/libx11amp.la --CFLAGS = -O6 @GTK_CFLAGS@ -DX11AMP_DIR=\"$(x11ampdir)\" -DPLUGIN_DIR=\"$(plugindir)\" -DPLUGINSUBS=$(pluginsubs) -D_REENTRANT -+LIBS = @GTK_LIBS@ $(PTHREAD_LIBS) $(top_builddir)/libx11amp/libx11amp.la -+CFLAGS += @GTK_CFLAGS@ -DX11AMP_DIR=\"$(x11ampdir)\" -DPLUGIN_DIR=\"$(plugindir)\" -DPLUGINSUBS=$(pluginsubs) -D_REENTRANT - - x11amp_SOURCES = bmp.c bmp.h skin.c skin.h util.c util.h output.c output.h input.c input.h effect.c effect.h general.c general.h pluginenum.c pluginenum.h playlist.c playlist.h controlsocket.c controlsocket.h widget.c widget.h sbutton.c sbutton.h pbutton.c pbutton.h tbutton.c tbutton.h textbox.c textbox.h menurow.c menurow.h hslider.c hslider.h monostereo.c monostereo.h vis.c vis.h svis.c svis.h number.c number.h playstatus.c playstatus.h playlist_list.c playlist_list.h playlist_slider.c playlist_slider.h playlist_popup.c playlist_popup.h eq_graph.c eq_graph.h eq_slider.c eq_slider.h main.c main.h skinwin.c skinwin.h prefswin.c prefswin.h playlistwin.c playlistwin.h dirbrowser.c dirbrowser.h equalizer.c equalizer.h hints.c hints.h plugin.h x11amp.h getopt.c getopt1.c getopt.h - diff --git a/audio/x11amp/files/patch-x11amp::main.c b/audio/x11amp/files/patch-x11amp::main.c deleted file mode 100644 index beaa279456fa..000000000000 --- a/audio/x11amp/files/patch-x11amp::main.c +++ /dev/null @@ -1,12 +0,0 @@ ---- x11amp/main.c.orig Wed Feb 25 19:38:20 2004 -+++ x11amp/main.c Wed Feb 25 19:38:52 2004 -@@ -812,8 +812,8 @@ - cleanup_ctrlsocket(); - cleanup_skins(); - playlist_stop_get_info_thread(); -- cleanup_plugins(); - playlist_clear(); -+ cleanup_plugins(); - gtk_main_quit(); - } - diff --git a/audio/x11amp/files/patch-x11amp__Makefile.in b/audio/x11amp/files/patch-x11amp__Makefile.in new file mode 100644 index 000000000000..92cf7ce838de --- /dev/null +++ b/audio/x11amp/files/patch-x11amp__Makefile.in @@ -0,0 +1,16 @@ + +$FreeBSD$ + +--- x11amp/Makefile.in.orig Mon Apr 12 04:21:06 1999 ++++ x11amp/Makefile.in Mon Nov 26 19:55:52 2001 +@@ -92,8 +92,8 @@ + + bin_PROGRAMS = x11amp + +-LIBS = @GTK_LIBS@ -lpthread $(top_builddir)/libx11amp/libx11amp.la +-CFLAGS = -O6 @GTK_CFLAGS@ -DX11AMP_DIR=\"$(x11ampdir)\" -DPLUGIN_DIR=\"$(plugindir)\" -DPLUGINSUBS=$(pluginsubs) -D_REENTRANT ++LIBS = @GTK_LIBS@ $(PTHREAD_LIBS) $(top_builddir)/libx11amp/libx11amp.la ++CFLAGS += @GTK_CFLAGS@ -DX11AMP_DIR=\"$(x11ampdir)\" -DPLUGIN_DIR=\"$(plugindir)\" -DPLUGINSUBS=$(pluginsubs) -D_REENTRANT + + x11amp_SOURCES = bmp.c bmp.h skin.c skin.h util.c util.h output.c output.h input.c input.h effect.c effect.h general.c general.h pluginenum.c pluginenum.h playlist.c playlist.h controlsocket.c controlsocket.h widget.c widget.h sbutton.c sbutton.h pbutton.c pbutton.h tbutton.c tbutton.h textbox.c textbox.h menurow.c menurow.h hslider.c hslider.h monostereo.c monostereo.h vis.c vis.h svis.c svis.h number.c number.h playstatus.c playstatus.h playlist_list.c playlist_list.h playlist_slider.c playlist_slider.h playlist_popup.c playlist_popup.h eq_graph.c eq_graph.h eq_slider.c eq_slider.h main.c main.h skinwin.c skinwin.h prefswin.c prefswin.h playlistwin.c playlistwin.h dirbrowser.c dirbrowser.h equalizer.c equalizer.h hints.c hints.h plugin.h x11amp.h getopt.c getopt1.c getopt.h + diff --git a/audio/x11amp/files/patch-x11amp__main.c b/audio/x11amp/files/patch-x11amp__main.c new file mode 100644 index 000000000000..beaa279456fa --- /dev/null +++ b/audio/x11amp/files/patch-x11amp__main.c @@ -0,0 +1,12 @@ +--- x11amp/main.c.orig Wed Feb 25 19:38:20 2004 ++++ x11amp/main.c Wed Feb 25 19:38:52 2004 +@@ -812,8 +812,8 @@ + cleanup_ctrlsocket(); + cleanup_skins(); + playlist_stop_get_info_thread(); +- cleanup_plugins(); + playlist_clear(); ++ cleanup_plugins(); + gtk_main_quit(); + } + diff --git a/audio/ximp3/files/patch-lib::L3.h b/audio/ximp3/files/patch-lib::L3.h deleted file mode 100644 index 3148ca42a62e..000000000000 --- a/audio/ximp3/files/patch-lib::L3.h +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/L3.h.orig Sat Oct 27 23:05:42 2001 -+++ lib/L3.h Mon Aug 18 20:18:00 2003 -@@ -39,6 +39,16 @@ - #define GLOBAL_GAIN_SCALE (4*15) - /* #define GLOBAL_GAIN_SCALE 0 */ - -+#include -+ -+#ifdef BYTE_ORDER -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define L_ENDIAN 1 -+#else -+#define L_ENDIAN 0 -+#endif -+#else -+ - #ifdef i386 - #define L_ENDIAN 1 - #endif -@@ -53,6 +63,8 @@ - - #ifdef sparc - #define L_ENDIAN 0 -+#endif -+ - #endif - - #ifndef L_ENDIAN diff --git a/audio/ximp3/files/patch-lib__L3.h b/audio/ximp3/files/patch-lib__L3.h new file mode 100644 index 000000000000..3148ca42a62e --- /dev/null +++ b/audio/ximp3/files/patch-lib__L3.h @@ -0,0 +1,28 @@ +--- lib/L3.h.orig Sat Oct 27 23:05:42 2001 ++++ lib/L3.h Mon Aug 18 20:18:00 2003 +@@ -39,6 +39,16 @@ + #define GLOBAL_GAIN_SCALE (4*15) + /* #define GLOBAL_GAIN_SCALE 0 */ + ++#include ++ ++#ifdef BYTE_ORDER ++#if BYTE_ORDER == LITTLE_ENDIAN ++#define L_ENDIAN 1 ++#else ++#define L_ENDIAN 0 ++#endif ++#else ++ + #ifdef i386 + #define L_ENDIAN 1 + #endif +@@ -53,6 +63,8 @@ + + #ifdef sparc + #define L_ENDIAN 0 ++#endif ++ + #endif + + #ifndef L_ENDIAN diff --git a/audio/xmixer/files/patch-Xw::Base.c b/audio/xmixer/files/patch-Xw::Base.c deleted file mode 100644 index 09d7560f3f31..000000000000 --- a/audio/xmixer/files/patch-Xw::Base.c +++ /dev/null @@ -1,13 +0,0 @@ ---- Xw/Base.c.orig Wed Jul 23 03:56:03 2003 -+++ Xw/Base.c Wed Jul 23 03:56:43 2003 -@@ -89,8 +89,8 @@ - * default translation table - */ - static char defaultTranslations [] = "\ --: focus(in) --: focus(out) -+: focus(in)\n\ -+: focus(out)\n\ - Tab: tab()"; - - /* diff --git a/audio/xmixer/files/patch-Xw__Base.c b/audio/xmixer/files/patch-Xw__Base.c new file mode 100644 index 000000000000..09d7560f3f31 --- /dev/null +++ b/audio/xmixer/files/patch-Xw__Base.c @@ -0,0 +1,13 @@ +--- Xw/Base.c.orig Wed Jul 23 03:56:03 2003 ++++ Xw/Base.c Wed Jul 23 03:56:43 2003 +@@ -89,8 +89,8 @@ + * default translation table + */ + static char defaultTranslations [] = "\ +-: focus(in) +-: focus(out) ++: focus(in)\n\ ++: focus(out)\n\ + Tab: tab()"; + + /* -- cgit