Updated linpsk to 0.8.1:

        * Improved RTTY decoder
        * Setting for slashed 0 now will be saved
        * Fixed some memory leakages
        * Removed dependancy on qwindowsstyle.h
        * Some minor bugfixes

12 files changed, 59 insertions, 143 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index dabfaa40a56..80c6bc0d0c6 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -636,3 +636,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated devel/rvm to 1.11 [xtraeme 2005-08-15]
 	Updated mail/qmail-qfilter to 2.1 [schmonz 2005-08-15]
 	Updated cross/avr-libc to 1.2.5 [wennmach 2005-08-15]
+	Updated ham/linpsk to 0.8.1 [wulf 2005-08-15]
diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index 6c62e0c0ed5..ace0e2213e9 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/15 14:03:53 wulf Exp $
 #
 
-DISTNAME=	linpsk-0.8.0.4
+DISTNAME=	linpsk-0.8.1
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linpsk/}
 
diff --git a/ham/linpsk/PLIST b/ham/linpsk/PLIST
index a95596d8c3b..77246e403a6 100644
--- a/ham/linpsk/PLIST
+++ b/ham/linpsk/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/23 20:32:41 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/15 14:03:53 wulf Exp $
 bin/linpsk
+lib/libportaudio.a
+lib/libinterfaces.a
diff --git a/ham/linpsk/distinfo b/ham/linpsk/distinfo
index e6a96e4850d..38638c57c19 100644
--- a/ham/linpsk/distinfo
+++ b/ham/linpsk/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: distinfo,v 1.4 2005/08/15 14:03:53 wulf Exp $
 
-SHA1 (linpsk-0.8.0.4.tar.gz) = cd4c76608a0c11f9990345d7a6859db58d7bba27
-RMD160 (linpsk-0.8.0.4.tar.gz) = 0113b0b7708a651193b677e96a9544b6e2ec1ba3
-Size (linpsk-0.8.0.4.tar.gz) = 426817 bytes
-SHA1 (patch-aa) = b3fda2c3242e7f88a6f43ee40f66f35ab7938f85
-SHA1 (patch-ab) = f2be2babf20024e80879d4122735314fe7ffd813
-SHA1 (patch-ac) = 521b6e002a6e15af69f3e754acd0164b9ae50467
-SHA1 (patch-ad) = 331aaf33ccc7cfd5723a84a99c4bfdac31ac7e64
-SHA1 (patch-ae) = 36fd197d1d4320d58462786a16ccb89348bbce6f
-SHA1 (patch-af) = 0a01f2131f87fd4865b00c06e3a38b3827a037b0
+SHA1 (linpsk-0.8.1.tar.gz) = d55d8c793ecd3a4395603ebdd8e795f1dc4d20f9
+RMD160 (linpsk-0.8.1.tar.gz) = 975bbdfc0b63e516f1d5fdfe6baf10fa12899219
+Size (linpsk-0.8.1.tar.gz) = 435463 bytes
+SHA1 (patch-ab) = 0cc21222e30d9122657e5c373b19af15c39eb883
+SHA1 (patch-ac) = 5be307963474f6879490185b47bed6e50dd51ffe
+SHA1 (patch-ad) = d9a62afada11b17730e4457e73fef7e21b8bee62
+SHA1 (patch-af) = b7800c5111a2d85d60ab64b69687e2da8e03ab88
 SHA1 (patch-ag) = 2577212da1fffa673d7dce9b8c939f1ae2dee12a
-SHA1 (patch-ah) = 2d626269647214f558557c47b6e806f3ebdb8804
-SHA1 (patch-ai) = 3e5ef3fa0a9cda973f5549a2f675b2edc4bbce7d
+SHA1 (patch-ai) = 192112a67a4ad8d70d4f71fbb1390a1fb26d7496
diff --git a/ham/linpsk/patches/patch-aa b/ham/linpsk/patches/patch-aa
deleted file mode 100644
index 88eab3185e4..00000000000
--- a/ham/linpsk/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/23 20:32:42 wulf Exp $
-
---- configure.orig	2004-07-27 04:51:41.000000000 +0930
-+++ configure	2004-10-01 23:57:19.000000000 +0930
-@@ -1047,7 +1047,7 @@
-                           include additional configurations [automatic]
-   --with-x                use the X Window System
-   --with-qtdir=DIR        Qt installation directory default=$QTDIR
--  --with-fftw-base=DIR    Base directory for fftw include and library
-+  --with-fftw-dir=DIR     Base directory for fftw include and library
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -19136,7 +19136,7 @@
-     { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
- echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-   fi
--  if test -z `grep -e 'shared_ext.*shrext' $ofile`; then
-+  if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then
-     # Make sure $shared_ext gets set to $shrext
-     if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then
-       mv "${ofile}T" "$ofile"
-@@ -19795,10 +19795,10 @@
- echo "$as_me:$LINENO: checking FFTW lib" >&5
- echo $ECHO_N "checking FFTW lib... $ECHO_C" >&6
- 
--# Check whether --with-FFTW_BASE_DIR or --without-FFTW_BASE_DIR was given.
--if test "${with_FFTW_BASE_DIR+set}" = set; then
--  withval="$with_FFTW_BASE_DIR"
--
-+# Check whether --with-fftw-dir or --without-fftw-base-dir was given.
-+if test "${with_fftw_dir+set}" = set; then
-+  withval="$with_fftw_dir"
-+    FFTW_BASE_DIR=$withval
- fi;
- if test x"$FFTW_BASE_DIR" = x ; then
-     FFTW_SEARCH="/usr /usr/local /usr/lib/ /sw /sw/lib qt"
diff --git a/ham/linpsk/patches/patch-ab b/ham/linpsk/patches/patch-ab
index e9e5b158a0c..6a87bf086d8 100644
--- a/ham/linpsk/patches/patch-ab
+++ b/ham/linpsk/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2005/08/15 14:03:53 wulf Exp $
 
-Needed for g++-2.95.3.
-
---- src/cpskdemodulator.cpp.orig	Sun Jul  4 17:50:45 2004
-+++ src/cpskdemodulator.cpp	Wed Mar 16 03:02:48 2005
-@@ -559,7 +559,7 @@ if ( UseAfc )
+--- src/cpskdemodulator.cpp.orig	2005-03-13 21:42:44.000000000 +1030
++++ src/cpskdemodulator.cpp	2005-08-15 05:35:35.000000000 +0930
+@@ -551,7 +551,7 @@
           {
            Phase_Vector=m_BitSignal*conj(Prev_Sample);
            Prev_Sample = m_BitSignal;
diff --git a/ham/linpsk/patches/patch-ac b/ham/linpsk/patches/patch-ac
index 3e26a4c190f..e028f57fc6f 100644
--- a/ham/linpsk/patches/patch-ac
+++ b/ham/linpsk/patches/patch-ac
@@ -1,9 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2005/08/15 14:03:53 wulf Exp $
 
-Needed for g++-2.95.3.
-
---- src/crxdisplay.cpp.orig	Sun Jul  4 17:50:45 2004
-+++ src/crxdisplay.cpp	Wed Mar 16 03:28:45 2005
+--- src/crxdisplay.cpp.orig	2005-03-12 03:49:18.000000000 +1030
++++ src/crxdisplay.cpp	2005-08-15 05:36:46.000000000 +0930
 @@ -27,7 +27,7 @@
  #include <qstyle.h>
  #include <qpalette.h>
@@ -13,7 +11,7 @@ Needed for g++-2.95.3.
  
  #include "crecording.h"
  #include "crxchannel.h"
-@@ -69,7 +69,7 @@ void MyTabBar::paintLabel ( QPainter *p,
+@@ -68,7 +68,7 @@
       {
         int position=t->identifier();
         if ( position >= 0 && position < Farbe->size() ) 
diff --git a/ham/linpsk/patches/patch-ad b/ham/linpsk/patches/patch-ad
index b8e3277a9ac..d0aeb211a72 100644
--- a/ham/linpsk/patches/patch-ad
+++ b/ham/linpsk/patches/patch-ad
@@ -1,29 +1,30 @@
-$NetBSD: patch-ad,v 1.1 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2005/08/15 14:03:53 wulf Exp $
 
-Needed for g++-2.95.3.
-
---- src/interfaces/editmacro.ui.h.orig	Sun Jul  4 17:50:45 2004
-+++ src/interfaces/editmacro.ui.h	Wed Mar 16 02:37:57 2005
-@@ -7,9 +7,10 @@
- ** place of a destructor.
- *****************************************************************************/
- 
+--- src/macros.cpp.orig	2005-08-15 06:57:24.000000000 +0930
++++ src/macros.cpp	2005-08-15 07:10:05.000000000 +0930
+@@ -13,7 +13,7 @@
+  *   the Free Software Foundation; either version 2 of the License, or     *
+  *   (at your option) any later version.                                   *
+  ***************************************************************************/
 -
++#include "pkgsrc_fixes.h"
  #include "macros.h"
- #include <vector>
-+#include <pkgsrc_fixes.h>
-+
- using namespace std;
- void EditMacro::init( Macros *k)
+ #include "parameter.h"
+ #include "ctxbuffer.h"
+@@ -220,13 +220,13 @@
+ }
+ void Macros::setDefinition(QString s,int position)
+ {
+-MacroText.at(position)=s;
++at_replacement(MacroText, position)=s;
+ }
+ void Macros::setAccelerator(QString s,int position)
  {
-@@ -44,8 +45,8 @@ void EditMacro::accept()
+-Accelerator.at(position)=s;
++at_replacement(Accelerator,position)=s;
+ }
+ void Macros::setMacroName(QString s,int MacroNumber)
  {
- int AktPosition, NewPosition;
- AktPosition=SelectMacro->currentItem()-1;
--AllMacros->MacroText.at(AktPosition)=Definition->text();
--AllMacros->Accelerator.at(AktPosition)=Accelerator->text();
-+at_replacement(AllMacros->MacroText, AktPosition)=Definition->text();
-+at_replacement(AllMacros->Accelerator, AktPosition)=Accelerator->text();
- /** Position Change to be done later
- NewPosition=Position->value();
- if (AktPosition != NewPosition )
+-MacroNames.at(MacroNumber)=s;
++at_replacement(MacroNames,MacroNumber)=s;
+ }
diff --git a/ham/linpsk/patches/patch-ae b/ham/linpsk/patches/patch-ae
deleted file mode 100644
index 9adfa9fa0b6..00000000000
--- a/ham/linpsk/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/03/16 15:32:12 rillig Exp $
-
-Needed for g++-2.95.3.
-
---- src/interfaces/renamemacro.ui.h.orig	Sun Jul  4 17:50:45 2004
-+++ src/interfaces/renamemacro.ui.h	Wed Mar 16 02:28:54 2005
-@@ -12,6 +12,7 @@
- 
- #include <qmessagebox.h>
- 
-+#include <pkgsrc_fixes.h>
- 
- //using namespace std;
- 
-@@ -41,7 +42,7 @@ if (NewName->text().length() ==0 )
-     return;
-  }
- else 
-- AllMacros->MacroNames.at(MacroNumber)=NewName->text();
-+ at_replacement(AllMacros->MacroNames, MacroNumber)=NewName->text();
- QDialog::accept();  
-     
- }
diff --git a/ham/linpsk/patches/patch-af b/ham/linpsk/patches/patch-af
index 9976f57e772..c0362c49cf3 100644
--- a/ham/linpsk/patches/patch-af
+++ b/ham/linpsk/patches/patch-af
@@ -1,9 +1,7 @@
-$NetBSD: patch-af,v 1.1 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: patch-af,v 1.2 2005/08/15 14:03:53 wulf Exp $
 
-Needed for g++-2.95.3.
-
---- src/linpsk.cpp.orig	Fri Jul 23 16:41:47 2004
-+++ src/linpsk.cpp	Wed Mar 16 03:01:04 2005
+--- src/linpsk.cpp.orig	2005-03-12 03:51:20.000000000 +1030
++++ src/linpsk.cpp	2005-08-15 07:14:45.000000000 +0930
 @@ -44,6 +44,8 @@
  
  #include <vector>
@@ -13,12 +11,12 @@ Needed for g++-2.95.3.
  #include "controlpanel.h"
  #include "crxdisplay.h"
  #include "ctxdisplay.h"
-@@ -421,7 +423,7 @@ if ( Channel->exec() != 0)
-                          (Mode) Channel->RxMode->currentItem(),
+@@ -416,7 +418,7 @@
+                          rxmode,
                           Channel->TitleText->text());
  
 -  settings.ActChannel->setWindowColor(WindowColors.at(settings.RxChannels));
 +  settings.ActChannel->setWindowColor(at_replacement(WindowColors,settings.RxChannels));
    settings.RxChannels++;
-   RxDisplay->RxFreq->setAFCWide(settings.ActChannel->getAFCWide());
-     
+   RxDisplay->RxFreq->setAfcDisplayMode(settings.ActChannel->AfcProperties());
+   }
diff --git a/ham/linpsk/patches/patch-ah b/ham/linpsk/patches/patch-ah
deleted file mode 100644
index 5a23b4cbe01..00000000000
--- a/ham/linpsk/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/16 15:32:12 rillig Exp $
-
-g++-2.95.3 does not know the min() and max() macros/functions.
-
---- src/rtty2demodulator.cpp.orig	Sun Jul  4 17:50:45 2004
-+++ src/rtty2demodulator.cpp	Wed Mar 16 03:34:16 2005
-@@ -149,8 +149,8 @@ while ( actSample < NxSamples )
-    {
-     j=(ThresholdPointer+i)%SampleBufferLength;
-     float x=ThresholdBuffer[j];
--    xmax=max(xmax,x);
--    xmin=min(xmin,x);
-+    xmax= xmax > x ? xmax : x;
-+    xmin= xmin < x ? xmin : x;
-    }
-    DiscriminatorThreshold=(xmax+xmin)/2.;
-    
diff --git a/ham/linpsk/patches/patch-ai b/ham/linpsk/patches/patch-ai
index 85815cf7a4c..4c0fc74b14b 100644
--- a/ham/linpsk/patches/patch-ai
+++ b/ham/linpsk/patches/patch-ai
@@ -1,9 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2005/03/16 15:32:12 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2005/08/15 14:03:53 wulf Exp $
 
-Needed for g++-2.95.3.
-
---- src/spectrumdisplay.cpp.orig	Sun Jul 25 18:00:51 2004
-+++ src/spectrumdisplay.cpp	Wed Mar 16 03:25:07 2005
+--- src/spectrumdisplay.cpp.orig	2005-03-13 20:32:03.000000000 +1030
++++ src/spectrumdisplay.cpp	2005-08-15 07:24:05.000000000 +0930
 @@ -21,6 +21,8 @@
  #include <qpainter.h>
  #include <qsplitter.h>
@@ -13,7 +11,7 @@ Needed for g++-2.95.3.
  #include "spectrumdisplay.h"
  #include "crxchannel.h"
  #include "parameter.h"
-@@ -181,7 +183,7 @@ paintLineal(&p,xmax,ymax);
+@@ -178,7 +180,7 @@
       {
         int ID = pRx->getID();
         if ( ID >= 0 && ID < Farbe->size() )