11 files changed, 146 insertions, 0 deletions

diff --git a/comms/Makefile b/comms/Makefile
index 2a3520becffe..e861ea302fbd 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -92,6 +92,7 @@
     SUBDIR += tkscanfax
     SUBDIR += tlf
     SUBDIR += trustedqsl
+    SUBDIR += twpsk
     SUBDIR += viewfax
     SUBDIR += vpb2
     SUBDIR += vrflash
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
new file mode 100644
index 000000000000..8379cd3e6505
--- /dev/null
+++ b/comms/twpsk/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:    twpsk
+# Date created:         2005-05-27
+# Whom:                 Søren Straarup <xride@x12.dk>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	twpsk
+PORTVERSION=	2.1
+CATEGORIES=	comms
+MASTER_SITES=	http://www.ibiblio.org/pub/linux/apps/ham/
+
+MAINTAINER=	xride@x12.dk
+COMMENT=	A openmotif X psk31 client
+
+USE_XPM=	yes
+USE_MOTIF=	yes
+
+MAN1=		psk31.1
+
+.include <bsd.port.mk>
diff --git a/comms/twpsk/distinfo b/comms/twpsk/distinfo
new file mode 100644
index 000000000000..15c5b8538efc
--- /dev/null
+++ b/comms/twpsk/distinfo
@@ -0,0 +1,2 @@
+MD5 (twpsk-2.1.tar.gz) = 791dd96779aa263b307eaed29a8a8b65
+SIZE (twpsk-2.1.tar.gz) = 172566
diff --git a/comms/twpsk/files/patch-GUI.h b/comms/twpsk/files/patch-GUI.h
new file mode 100644
index 000000000000..56c69edadf6b
--- /dev/null
+++ b/comms/twpsk/files/patch-GUI.h
@@ -0,0 +1,11 @@
+--- user-twpsk/GUI.h.orig	Mon May  2 17:47:53 2005
++++ user-twpsk/GUI.h	Mon May  2 17:48:11 2005
+@@ -36,7 +36,7 @@
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+ #include <X11/cursorfont.h>
+ #include <Xm/Form.h>
+ #include <Xm/CascadeB.h>
diff --git a/comms/twpsk/files/patch-Makefile b/comms/twpsk/files/patch-Makefile
new file mode 100644
index 000000000000..b540ece1ac3a
--- /dev/null
+++ b/comms/twpsk/files/patch-Makefile
@@ -0,0 +1,49 @@
+--- Makefile.orig	Thu Aug 15 23:19:20 2002
++++ Makefile	Mon May 30 23:31:25 2005
+@@ -1,9 +1,10 @@
+ # Path settings for 'make install'
+ # cod-file will be searched in DATADIR  /* $(HOME) and current directory */
+ # ini-file will be searched in DATADIR  /* $(HOME), current directory    */
+-BINDIR = /usr/local/bin
+-DATADIR = /usr/local/share/psk31
+-MANDIR = /usr/local/man/man1
++PREFIX?=/usr/local
++BINDIR = ${PREFIX}/bin
++DATADIR = ${PREFIX}/share/psk31
++MANDIR = ${PREFIX}/man/man1
+ CC = g++ 
+ LD = g++
+ ###CXXFLAGS = -O2 -g
+@@ -14,7 +15,7 @@
+ ## If you change these lines, you have to do a "make clean"!!!
+ ##
+ ## Uncomment these two lines for recommended mode with pthread library
+-LIBS = -lncurses -lm -lpthread
++LIBS = -lncurses -lm ${PTHREAD_LIBS}
+ CXXFLAGS += -DUSE_PTHREAD
+ ##
+ ## Uncomment this line for operation without phreads
+@@ -23,7 +24,7 @@
+ ## (Well, it compiles, but the executable does not work...)
+ ##LIBS = -lncurses -lm
+ #############################################################################
+-export CXXFLAGS
++#export CXXFLAGS
+ 
+ OBJS = psk31-coder.o psk31-receiver.o psk31-transmitter.o psk31-main.o window.o
+ # OBJS += hansis-fft.o
+@@ -78,13 +79,9 @@
+ 	install psk31lx $(BINDIR)
+ 	install psk31.ini psk31.cod $(DATADIR)
+ 	install psk31.1 $(MANDIR)
+-
+-install_twpsk:
+-	install -d $(BINDIR)
+-	install -d $(DATADIR)
+ 	install  psk31.ini psk31.cod user-twpsk/twpskHelp $(DATADIR)
+ 	install  twpsk $(BINDIR)
+-	install  user-twpsk/Twpsk /usr/X11R6/lib/X11/app-defaults
++	install  user-twpsk/Twpsk $(DATADIR)
+ 
+ clean:
+ 	/bin/rm -f */*.o psk31lx twpsk core
diff --git a/comms/twpsk/files/patch-psk31-transmitter.C b/comms/twpsk/files/patch-psk31-transmitter.C
new file mode 100644
index 000000000000..cfc39fde5c3e
--- /dev/null
+++ b/comms/twpsk/files/patch-psk31-transmitter.C
@@ -0,0 +1,11 @@
+--- modes/psk31-transmitter.C.orig	Fri Sep  1 21:01:34 2000
++++ modes/psk31-transmitter.C	Mon May 30 23:27:40 2005
+@@ -11,7 +11,7 @@
+ #include <errno.h>

+ #include <stdio.h>

+ #include <stdlib.h>

+-#include <linux/soundcard.h>

++#include <sys/soundcard.h>

+ #include <sys/ioctl.h>

+ #include "psk31-coder.h"

+ #include "psk31-transmitter.h"

diff --git a/comms/twpsk/files/patch-server-main.C b/comms/twpsk/files/patch-server-main.C
new file mode 100644
index 000000000000..d3eff442ae83
--- /dev/null
+++ b/comms/twpsk/files/patch-server-main.C
@@ -0,0 +1,11 @@
+--- server/server-main.C.orig	Mon May  2 23:53:42 2005
++++ server/server-main.C	Mon May  2 23:53:56 2005
+@@ -19,8 +19,6 @@
+  *   thread and from user interface thread (==interface functions)
+  */
+ 
+-#include <sys/mman.h>
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/comms/twpsk/files/patch-twpsk.C b/comms/twpsk/files/patch-twpsk.C
new file mode 100644
index 000000000000..c055d24f98bc
--- /dev/null
+++ b/comms/twpsk/files/patch-twpsk.C
@@ -0,0 +1,15 @@
+--- user-twpsk/twpsk.C.orig	Mon May  2 20:19:50 2005
++++ user-twpsk/twpsk.C	Mon May  2 20:20:17 2005
+@@ -368,10 +368,12 @@
+       }  
+ 
+       val = 0;  // no input sigs get to output
++/*
+       if (ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_OUTSRC), &val) < 0)
+       {
+          fprintf (stderr, "mixer outsrc failed\n");
+       }
++*/
+       close (mixer_fd);
+    }
+    else
diff --git a/comms/twpsk/files/patch-twpskDiags.C b/comms/twpsk/files/patch-twpskDiags.C
new file mode 100644
index 000000000000..349e9497b6b1
--- /dev/null
+++ b/comms/twpsk/files/patch-twpskDiags.C
@@ -0,0 +1,11 @@
+--- user-twpsk/twpskDiags.C.orig	Mon May  2 20:23:25 2005
++++ user-twpsk/twpskDiags.C	Mon May  2 20:23:41 2005
+@@ -39,7 +39,7 @@
+    Widget shell = (Widget) widget;
+    XmString  msg_xs;
+    char msg_str[] =
+- "TWPSK \251 2000\n\nInterfaces by Ted Williams     - WA\330EIR
++ "TWPSK \251 2000\n\nInterfaces by Ted Williams     - WA\330EIR \
+ PSK classes by Hansi Reiser - DL9RDZ";
+ 
+    if (diag == NULL)
diff --git a/comms/twpsk/pkg-descr b/comms/twpsk/pkg-descr
new file mode 100644
index 000000000000..b31a2044ca90
--- /dev/null
+++ b/comms/twpsk/pkg-descr
@@ -0,0 +1,7 @@
+PSK31 for Soundblaster/Linux,                             twpsk V 1.1
+(C) 1998-2000
+
+Hansi Reiser - DL9RDZ: base PSK classes and text mode interface
+Ted Williams - WA0EIR: graphical X11 interface
+
+based on PSK31-Software by Peter Martinez G3PLX and Andrew Senior G0TJZ
diff --git a/comms/twpsk/pkg-plist b/comms/twpsk/pkg-plist
new file mode 100644
index 000000000000..37482894ae28
--- /dev/null
+++ b/comms/twpsk/pkg-plist
@@ -0,0 +1,7 @@
+bin/psk31lx
+bin/twpsk
+share/psk31/psk31.ini
+share/psk31/psk31.cod
+share/psk31/Twpsk
+share/psk31/twpskHelp
+@dirrm share/psk31