From 36124fe6791c3b779f768e277a538c225514f94d Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Tue, 23 Sep 2008 14:01:11 +0000 Subject: [PATCH] - Update to 3.03 --- comms/fldigi/Makefile | 2 +- comms/fldigi/distinfo | 6 +++--- .../fldigi/files/patch-src_dialogs_Viewer.cxx | 20 ------------------- .../fldigi/files/patch-src_include_threads.h | 6 +++--- 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 comms/fldigi/files/patch-src_dialogs_Viewer.cxx diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index d62f50754677..ce514bb072c1 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fldigi -PORTVERSION= 3.01 +PORTVERSION= 3.03 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/fldigi-distro/ \ ${MASTER_SITE_LOCAL} diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index 3d4afe58de51..11c4506f723d 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -MD5 (fldigi-3.01.tar.gz) = 1dec4bedb919ddafeaf114bf14609bb8 -SHA256 (fldigi-3.01.tar.gz) = f4d2b3ca8aba052440da95dd1b20a33c91dde62928a6511a1de4ad4cb3ce2500 -SIZE (fldigi-3.01.tar.gz) = 696006 +MD5 (fldigi-3.03.tar.gz) = f4e87a30ba83b6ef2ed8bc183d45574e +SHA256 (fldigi-3.03.tar.gz) = 56a6bbd6ee1736014958776f97dc673b6b13e0f8eb9b4f6201a63e056b1bd7c8 +SIZE (fldigi-3.03.tar.gz) = 711226 diff --git a/comms/fldigi/files/patch-src_dialogs_Viewer.cxx b/comms/fldigi/files/patch-src_dialogs_Viewer.cxx deleted file mode 100644 index 53ddadd1cea4..000000000000 --- a/comms/fldigi/files/patch-src_dialogs_Viewer.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dialogs/Viewer.cxx.orig 2008-08-14 13:31:08.000000000 -0400 -+++ src/dialogs/Viewer.cxx 2008-08-17 20:28:40.000000000 -0400 -@@ -91,7 +91,7 @@ - - #if HAVE_REGEX_H - regex_t* seek_re = 0; --void re_comp(const char* needle) -+void fl_re_comp(const char* needle) - { - if (seek_re) - regfree(seek_re); -@@ -306,7 +306,7 @@ - #else - static Fl_Color seek_color[2] = { FL_FOREGROUND_COLOR, - adjust_color(FL_RED, FL_BACKGROUND2_COLOR) }; // invalid RE -- re_comp(inpSeek->value()); -+ fl_re_comp(inpSeek->value()); - if (inpSeek->textcolor() != seek_color[!seek_re]) { - inpSeek->textcolor(seek_color[!seek_re]); - inpSeek->redraw(); diff --git a/comms/fldigi/files/patch-src_include_threads.h b/comms/fldigi/files/patch-src_include_threads.h index dcf7a622ee9d..155e7c0bffdf 100644 --- a/comms/fldigi/files/patch-src_include_threads.h +++ b/comms/fldigi/files/patch-src_include_threads.h @@ -1,5 +1,5 @@ ---- src/include/threads.h.orig 2008-08-23 12:34:24.000000000 -0400 -+++ src/include/threads.h 2008-08-23 12:32:50.000000000 -0400 +--- src/include/threads.h.orig 2008-09-14 09:26:15.000000000 -0400 ++++ src/include/threads.h 2008-09-23 08:50:48.000000000 -0400 @@ -46,6 +46,7 @@ #include @@ -8,7 +8,7 @@ typedef pthread_t Fl_Thread; typedef pthread_mutex_t Fl_Mutex; -@@ -87,7 +88,8 @@ +@@ -88,7 +89,8 @@ extern pthread_key_t thread_id_; # define CREATE_THREAD_ID() pthread_key_create(&thread_id_, 0); # define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (void *)(x))