11 files changed, 16 insertions, 233 deletions

diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 032721b39b05..d6eea372ae2f 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -6,34 +6,31 @@
 #
 
 PORTNAME=	wsjt
-PORTVERSION=	5.9.6
-PORTREVISION=	3
+PORTVERSION=	5.9.7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	wsjt
-DISTNAME=	wsjt-5.9.6.r309
+DISTNAME=	wsjt-5.9.7.r386
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Weak signal ham radio communication pakage
 
-BUILD_DEPENDS=	gfortran42:${PORTSDIR}/lang/gcc42 \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		${PYNUMPY}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter/ \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate
 
-WANT_FORTRAN=	yes	#dummy
+USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
+		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
 USE_GMAKE=	yes
 USE_PYTHON=	2.4+
 USE_AUTOTOOLS=	libtool:15
 
-post-extract:
-	@${MV} ${WRKDIR}/wsjt596r309 ${WRKDIR}/wsjt-5.9.6.r309
-
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -53,8 +50,9 @@ do-install:
 .endfor
 .if	!defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for d in ${WRKSRC}/Announce.txt ${WRKSRC}/UpdateHistory.txt\
-	${WRKSRC}/LICENSE.TXT WSJT_Source_Code.txt
+.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf  ${WRKSRC}/WSJT_Source_Code.txt \
+	${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \
+	${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT
 	@${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
 .endfor
 	@${ECHO} ""
diff --git a/comms/wsjt/distinfo b/comms/wsjt/distinfo
index 00786038ab99..8a28b5c606c2 100644
--- a/comms/wsjt/distinfo
+++ b/comms/wsjt/distinfo
@@ -1,3 +1,3 @@
-MD5 (wsjt-5.9.6.r309.tgz) = 4504b2c65915a201728bdd4f7abe1898
-SHA256 (wsjt-5.9.6.r309.tgz) = e868f3d04a1f8216af23d2a2900782e9238a21b5b1b38112365eb09520fefe53
-SIZE (wsjt-5.9.6.r309.tgz) = 7019606
+MD5 (wsjt-5.9.7.r386.tgz) = d9bed4bc7d82254e1f359cea1a16accf
+SHA256 (wsjt-5.9.7.r386.tgz) = 67ecf64d8a49f25a9fc5c3e10c145dbcdcd60dff6c9f21eeb7f584422e3f8fe1
+SIZE (wsjt-5.9.7.r386.tgz) = 6964510
diff --git a/comms/wsjt/files/patch-configure b/comms/wsjt/files/patch-configure
deleted file mode 100644
index 29e04c4bb3f0..000000000000
--- a/comms/wsjt/files/patch-configure
+++ /dev/null
@@ -1,142 +0,0 @@
---- configure.orig	Sat Oct 21 14:19:10 2006
-+++ configure	Tue Feb 20 08:26:44 2007
-@@ -1,8 +1,8 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for wsjt 5.9.2.
-+# Generated by GNU Autoconf 2.59 for wsjt 5.9.5.
- #
--# $Id: configure.ac 259 2006-08-10 22:22:33Z va3db $
-+# $Id: configure.ac 270 2006-09-04 19:18:34Z k1jt $
- #
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
-@@ -253,7 +253,7 @@
- #
- # Initializations.
- #
--ac_default_prefix=/usr/local
-+ac_default_prefix=%%PREFIX%%
- ac_config_libobj_dir=.
- cross_compiling=no
- subdirs=
-@@ -269,11 +269,11 @@
- # Identity of this package.
- PACKAGE_NAME='wsjt'
- PACKAGE_TARNAME='wsjt'
--PACKAGE_VERSION='5.9.2'
--PACKAGE_STRING='wsjt 5.9.2'
-+PACKAGE_VERSION='5.9.5'
-+PACKAGE_STRING='wsjt 5.9.5'
- PACKAGE_BUGREPORT=''
- 
--ac_default_prefix=/usr/local/
-+ac_default_prefix=%%PREFIX%%/
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-@@ -788,7 +788,7 @@
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures wsjt 5.9.2 to adapt to many kinds of systems.
-+\`configure' configures wsjt 5.9.5 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -845,7 +845,7 @@
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of wsjt 5.9.2:";;
-+     short | recursive ) echo "Configuration of wsjt 5.9.5:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -969,14 +969,14 @@
- test -n "$ac_init_help" && exit 0
- if $ac_init_version; then
-   cat <<\_ACEOF
--wsjt configure 5.9.2
-+wsjt configure 5.9.5
- generated by GNU Autoconf 2.59
- 
- Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- 
--$Id: configure.ac 259 2006-08-10 22:22:33Z va3db $
-+$Id: configure.ac 270 2006-09-04 19:18:34Z k1jt $
- _ACEOF
-   exit 0
- fi
-@@ -985,7 +985,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by wsjt $as_me 5.9.2, which was
-+It was created by wsjt $as_me 5.9.5, which was
- generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   $ $0 $@
-@@ -2500,8 +2500,8 @@
- 
- CFLAGS="$OLD_CFLAGS"
- 
--CPPFLAGS="-Iportaudio-v19/include -I/usr/local/include -I/usr/include/alsa -I/usr/local/include/alsa ${CPPFLAGS}"
--LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
-+CPPFLAGS="-I%%LOCALBASE%%/include/portaudio2 -I%%LOCALBASE%%/include -I/usr/include/alsa -I%%LOCALBASE%%/include/alsa ${CPPFLAGS}"
-+LDFLAGS="-L%%LOCALBASE%%/lib/portaudio2 -L%%LOCALBASE%%/lib ${LDFLAGS}"
- LIBS=" -lpthread ${LIBS}"
- 
- echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5
-@@ -3657,8 +3657,8 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--# Extract the first word of "gfortran41", so it can be a program name with args.
--set dummy gfortran41; ac_word=$2
-+# Extract the first word of "gfortran42", so it can be a program name with args.
-+set dummy gfortran42; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_GFORTRAN+set}" = set; then
-@@ -4615,7 +4615,7 @@
- fi
- 
- 
--if test -e "portaudio-v19/include/portaudio.h" ; then
-+if test -e "%%LOCALBASE%%/include/portaudio2/portaudio.h" ; then
- 	echo "Checking for portaudio...yes"
- 	HAS_PORTAUDIO_H=1
- else
-@@ -6882,9 +6882,9 @@
- 
- 	AUDIO="a2d.f90 jtaudio.c resample.c start_portaudio.c"
- 
--	NEEDPORTAUDIO="portaudio-v19/lib/.libs/libportaudio.a"
-+	NEEDPORTAUDIO=""
- 
--	LIBS="${LIBS} ${RTLIBS} -lsamplerate ./portaudio-v19/lib/.libs/libportaudio.a"
-+	LIBS="${LIBS} ${RTLIBS} -lsamplerate -lportaudio"
- 	LIBS="${LIBS} ${ASOUNDLIBS}"
- else
- 	NEEDPORTAUDIO=""
-@@ -7364,7 +7364,7 @@
- } >&5
- cat >&5 <<_CSEOF
- 
--This file was extended by wsjt $as_me 5.9.2, which was
-+This file was extended by wsjt $as_me 5.9.5, which was
- generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -7419,7 +7419,7 @@
- 
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
--wsjt config.status 5.9.2
-+wsjt config.status 5.9.5
- configured by $0, generated by GNU Autoconf 2.59,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
diff --git a/comms/wsjt/files/patch-cutil.c b/comms/wsjt/files/patch-cutil.c
deleted file mode 100644
index 6950c121290f..000000000000
--- a/comms/wsjt/files/patch-cutil.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- cutil.c.orig	Mon Dec 11 10:38:11 2006
-+++ cutil.c	Mon Dec 11 10:38:36 2006
-@@ -67,7 +67,11 @@
-   printf("\n\n");
-   exit(*n);
- }
--
-+struct tm *
-+gmtime_r_(const time_t *clock, struct tm *result)
-+{
-+  gmtime_r(clock, result);
-+}
- time_t time_(void)
- {
-      return time(0);
diff --git a/comms/wsjt/files/patch-get_fname.F90 b/comms/wsjt/files/patch-get_fname.F90
deleted file mode 100644
index 6dc915a58671..000000000000
--- a/comms/wsjt/files/patch-get_fname.F90
+++ /dev/null
@@ -1,19 +0,0 @@
---- get_fname.F90.orig	Mon Dec 11 10:38:21 2006
-+++ get_fname.F90	Mon Dec 11 10:38:42 2006
-@@ -5,6 +5,7 @@
-   use dfport

- #endif

- 

-+  external gmtime_r

-   character hiscall*12,fname*24,tag*7

-   integer ntime

-   integer trperiod

-@@ -13,7 +14,7 @@
-   n1=ntime

-   n2=(n1+2)/trperiod

-   n3=n2*trperiod

--  call gmtime(n3,it)

-+  call gmtime_r(n3,it)

-   it(5)=it(5)+1

-   it(6)=mod(it(6),100)

-   write(fname,1000) (it(j),j=6,1,-1)

diff --git a/comms/wsjt/files/patch-jtaudio.c b/comms/wsjt/files/patch-jtaudio.c
deleted file mode 100644
index 647c314f649e..000000000000
--- a/comms/wsjt/files/patch-jtaudio.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- jtaudio.c.orig	Mon Feb 19 23:12:22 2007
-+++ jtaudio.c	Mon Feb 19 23:13:03 2007
-@@ -1,5 +1,5 @@
- #include <stdio.h>
--#include <portaudio.h>
-+#include <portaudio2/portaudio.h>
- #include <string.h>
- 
- void fivehz_();
diff --git a/comms/wsjt/files/patch-padevsub.c b/comms/wsjt/files/patch-padevsub.c
deleted file mode 100644
index 6b76e97da15d..000000000000
--- a/comms/wsjt/files/patch-padevsub.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- padevsub.c.orig	Mon Feb 19 23:15:39 2007
-+++ padevsub.c	Mon Feb 19 23:15:50 2007
-@@ -1,6 +1,6 @@
- // #include <stdio.h>
- // #include <math.h>
--#include "portaudio.h"
-+#include <portaudio2/portaudio.h>
- 
- int __stdcall PADEVSUB(int *numdev, int *ndefin, int *ndefout,
- 		       int nchin[], int nchout[])
diff --git a/comms/wsjt/files/patch-specjt.py b/comms/wsjt/files/patch-specjt.py
deleted file mode 100644
index b352d3b486af..000000000000
--- a/comms/wsjt/files/patch-specjt.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- specjt.py.orig	Fri Feb  2 16:45:39 2007
-+++ specjt.py	Fri Feb  2 17:10:25 2007
-@@ -10,7 +10,7 @@
- import string
- import cPickle
- #import Numeric
--from Numeric import zeros, multiarray
-+from numpy.oldnumeric import zeros, multiarray
- import Image, ImageTk, ImageDraw
- from palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
diff --git a/comms/wsjt/files/patch-wsjt.py b/comms/wsjt/files/patch-wsjt.py
deleted file mode 100644
index 453accf15655..000000000000
--- a/comms/wsjt/files/patch-wsjt.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- wsjt.py.orig	Fri Feb  2 16:45:49 2007
-+++ wsjt.py	Fri Feb  2 17:10:03 2007
-@@ -8,7 +8,7 @@
- import g,os,time
- import Audio
- from math import log10
--from Numeric import zeros
-+from numpy.oldnumeric import zeros
- import dircache
- import Image,ImageTk  #, ImageDraw
- from palettes import colormapblue, colormapgray0, colormapHot, \
diff --git a/comms/wsjt/pkg-descr b/comms/wsjt/pkg-descr
index 033e244dba25..4ae2caef12c0 100644
--- a/comms/wsjt/pkg-descr
+++ b/comms/wsjt/pkg-descr
@@ -3,6 +3,6 @@ using state of the art digital techniques. Typical applications
 include communication by meteor scatter and
 EME (Earth-Moon-Earth) propagation paths.
 
-WWW: http://pulsar.princeton.edu/~joe/K1JT
+WWW: http://physics.princeton.edu/pulsar/K1JT
 
 - Diane Bruce, VA3DB
diff --git a/comms/wsjt/pkg-plist b/comms/wsjt/pkg-plist
index 1c1bc5a8b72f..7a9bf549b3cc 100644
--- a/comms/wsjt/pkg-plist
+++ b/comms/wsjt/pkg-plist
@@ -12,9 +12,11 @@ bin/wsjt.py
 %%PYTHON_SITELIBDIR%%/palettes.py
 %%PYTHON_SITELIBDIR%%/smeter.py
 %%PYTHON_SITELIBDIR%%/specjt.py
-%%PORTDOCS%%%%DOCSDIR%%/Announce.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/UpdateHistory.txt
+%%PORTDOCS%%%%DOCSDIR%%/WSJT_Quick_Reference.pdf
 %%PORTDOCS%%%%DOCSDIR%%/WSJT_Source_Code.txt
+%%PORTDOCS%%%%DOCSDIR%%/WSJT_User_600.pdf
+%%PORTDOCS%%%%DOCSDIR%%/UpdateHistory.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%