Stage comms/twpsk and assign maintainship to submitter

PR:		192496
Submitted by:	takefu (airport.fm)

10 files changed, 30 insertions, 158 deletions

diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index 9cfaf6df5793..358a6b32569c 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -1,44 +1,23 @@
-# Created by: Søren Straarup <xride@x12.dk>
 # $FreeBSD$
 
 PORTNAME=	twpsk
-PORTVERSION=	2.1
-PORTREVISION=	4
+PORTVERSION=	4.1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.ibiblio.org/pub/linux/apps/ham/
+MASTER_SITES=	http://wa0eir.bcts.info/src/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Openmotif X psk31 client
+MAINTAINER=	takefu@airport.fm
+COMMENT=	X psk31 client
 
-USE_XORG=	xpm
-USES=		motif
+LICENSE=	GPLv3
 
-MAN1=		psk31.1
+USES=		motif pkgconfig
 
-FILES_TO_PATCH=	Makefile psk31.1 twpskHelp user-twpsk/makefile \
-				user-twpsk/savedir/makefile \
-				user-twpsk/savedir/INSTALL \
-				user-twpsk/twpskHelp \
-				user/term-psk31.C \
-				user-twpsk/twpsk.C \
-				user-twpsk/twpskDiags.C \
-				user-twpsk/savedir/twpsk.C \
-				user-twpsk/savedir/twpskDiags.C \
-				user-twpsk/savedir/twpskHelp
-NO_STAGE=	yes
-post-patch:
-.for file in ${FILES_TO_PATCH}
-	@${REINPLACE_CMD} -e \
-		's|/usr/local|${LOCALBASE}|g;s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/${file}
-.endfor
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
-.include <bsd.port.pre.mk>
+GNU_CONFIGURE=	yes
+CFLAGS+=	-L${LOCALBASE}/lib -I${PREFIX}/include
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	*
 
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/twpsk/distinfo b/comms/twpsk/distinfo
index a2069d96919e..5302302ef761 100644
--- a/comms/twpsk/distinfo
+++ b/comms/twpsk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (twpsk-2.1.tar.gz) = 8f5e84bd9c9fe5aa3d2a77465bfa27cead2963b02307b4a0d9546c7cf6d56871
-SIZE (twpsk-2.1.tar.gz) = 172566
+SHA256 (twpsk-4.1.src.tar.gz) = f1b29fccfc086239e11d032cf67113b5275863e8e5708161b31bd7372fe6e5ac
+SIZE (twpsk-4.1.src.tar.gz) = 336032
diff --git a/comms/twpsk/files/patch-GUI.h b/comms/twpsk/files/patch-GUI.h
deleted file mode 100644
index 56c69edadf6b..000000000000
--- a/comms/twpsk/files/patch-GUI.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b540ece1ac3a..000000000000
--- a/comms/twpsk/files/patch-Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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
deleted file mode 100644
index cfc39fde5c3e..000000000000
--- a/comms/twpsk/files/patch-psk31-transmitter.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index d3eff442ae83..000000000000
--- a/comms/twpsk/files/patch-server-main.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index c055d24f98bc..000000000000
--- a/comms/twpsk/files/patch-twpsk.C
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 349e9497b6b1..000000000000
--- a/comms/twpsk/files/patch-twpskDiags.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 81dda17c1cd9..42090febe26f 100644
--- a/comms/twpsk/pkg-descr
+++ b/comms/twpsk/pkg-descr
@@ -1,9 +1,4 @@
-PSK31 for Soundblaster/Linux,                             twpsk V 1.1
-(C) 1998-2000
+It is a soundcard based program that lets you run PSK31,
+the digital mode designed by Peter, G3PLX.
 
-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
-
-WWW: http://wa0eir.home.mchsi.com/twpsk.html
+WWW: http://wa0eir.bcts.info/twpsk.html
diff --git a/comms/twpsk/pkg-plist b/comms/twpsk/pkg-plist
index 37482894ae28..e97e4f6a034d 100644
--- a/comms/twpsk/pkg-plist
+++ b/comms/twpsk/pkg-plist
@@ -1,7 +1,13 @@
-bin/psk31lx
 bin/twpsk
-share/psk31/psk31.ini
-share/psk31/psk31.cod
-share/psk31/Twpsk
-share/psk31/twpskHelp
-@dirrm share/psk31
+man/man1/twpsk.1.gz
+share/X11/app-defaults/Twpsk
+share/applications/twpsk.desktop
+share/pixmaps/twpsk.png
+%%DATADIR%%/psk31.cod
+%%DATADIR%%/twpskDir/Brag
+%%DATADIR%%/twpskDir/LongCQ
+%%DATADIR%%/twpskDir/ShortCQ
+@dirrmtry share/X11/app-defaults
+@dirrmtry share/X11
+@dirrmtry %%DATADIR%%/twpskDir
+@dirrmtry %%DATADIR%%