- Upgrade to wsjt 7.04

4 files changed, 82 insertions, 52 deletions

diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index c0fdbd969990..0299284ee538 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -6,60 +6,73 @@
 #
 
 PORTNAME=	wsjt
-PORTVERSION=	5.9.7
-PORTREVISION=	2
+PORTVERSION=	7.04
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_BERLIOS:S/%SUBDIR%/wsjt/} \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/db/}
-DISTNAME=	wsjt-5.9.7.r386
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	db
+DISTNAME=	wsjt-r${SVN_REV}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter/ \
+		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
+LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
+		samplerate:${PORTSDIR}/audio/libsamplerate
 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
 
+ALL_TARGET=	build
+USE_BZIP2=	yes
 USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
+CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
+		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
 		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
-USE_GMAKE=	yes
+CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 USE_PYTHON=	2.4+
 USE_AUTOTOOLS=	libtool:22
+PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
+		PORTVERSION=${PORTVERSION}
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	${WRKSRC}/configure
+.include <bsd.port.pre.mk>
 
-do-install:
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/CALL3.TXT ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/wsjt.py ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/wsjt ${PREFIX}/bin
-.for d in ${WRKSRC}/Audio.so ${WRKSRC}/Pmw.py \
-	${WRKSRC}/PmwBlt.py ${WRKSRC}/palettes.py \
-	${WRKSRC}/PmwColor.py ${WRKSRC}/go.py \
-	${WRKSRC}/specjt.py ${WRKSRC}/astro.py \
-	${WRKSRC}/options.py ${WRKSRC}/smeter.py ${WRKSRC}/g.py
-	@${INSTALL_DATA} ${WRKSRC}/${d} ${PYTHON_SITELIBDIR}
-.endfor
+post-install:
 .if	!defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .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}
+	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
 .endfor
-	@${ECHO} ""
+	@${ECHO}
 	@${ECHO} "docs installed in ${DOCSDIR}"
-	@${ECHO} ""
+	@${ECHO}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.if defined(BOOTSTRAP)
+SVN_REV!=	svn info http://svn.berlios.de/svnroot/repos/wsjt/trunk/ | ${GREP} Revision | cut -d' ' -f2
+.else
+.include "Makefile.svn_rev"
+.endif
+
+.if defined(BOOTSTRAP)
+FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} \
+	    http://svn.berlios.de/svnroot/repos/wsjt/trunk ${WRKSRC}
+	cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\
+		tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
+	echo "SVN_REV=	${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+.if ${USER} == db
+	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
+	    freefall.freebsd.org:public_distfiles/
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/comms/wsjt/distinfo b/comms/wsjt/distinfo
index 8a28b5c606c2..a9b51b96224b 100644
--- a/comms/wsjt/distinfo
+++ b/comms/wsjt/distinfo
@@ -1,3 +1,3 @@
-MD5 (wsjt-5.9.7.r386.tgz) = d9bed4bc7d82254e1f359cea1a16accf
-SHA256 (wsjt-5.9.7.r386.tgz) = 67ecf64d8a49f25a9fc5c3e10c145dbcdcd60dff6c9f21eeb7f584422e3f8fe1
-SIZE (wsjt-5.9.7.r386.tgz) = 6964510
+MD5 (wsjt-r1228.tar.bz2) = 843c234bf784d6dfcffa44e7f0fd78a2
+SHA256 (wsjt-r1228.tar.bz2) = b3203679c1e3d8ff7dfa972730bbb536c1edda1d3d99b68ad6012bd341ee102d
+SIZE (wsjt-r1228.tar.bz2) = 2083342
diff --git a/comms/wsjt/pkg-descr b/comms/wsjt/pkg-descr
index 4ae2caef12c0..9ab059ba54dd 100644
--- a/comms/wsjt/pkg-descr
+++ b/comms/wsjt/pkg-descr
@@ -1,8 +1,7 @@
-WSJT is a computer program for amateur radio VHF/UHF communication
-using state of the art digital techniques. Typical applications
-include communication by meteor scatter and
-EME (Earth-Moon-Earth) propagation paths.
+WSJT ("Weak Signal Communication, by K1JT") offers specific digital protocols
+optimized for meteor scatter, ionospheric scatter, and EME (moonbounce)
+at VHF/UHF, as well as HF skywave propagation.  The program can decode
+fraction-of-a-second signals reflected from ionized meteor trails and
+steady signals 10 dB below the audible threshold.  
 
 WWW: http://physics.princeton.edu/pulsar/K1JT
-
-- Diane Bruce, VA3DB
diff --git a/comms/wsjt/pkg-plist b/comms/wsjt/pkg-plist
index 7a9bf549b3cc..8e02f5f052c3 100644
--- a/comms/wsjt/pkg-plist
+++ b/comms/wsjt/pkg-plist
@@ -1,22 +1,40 @@
 bin/wsjt
 bin/wsjt.py
 %%DATADIR%%/CALL3.TXT
-%%PYTHON_SITELIBDIR%%/Audio.so
-%%PYTHON_SITELIBDIR%%/Pmw.py
-%%PYTHON_SITELIBDIR%%/PmwBlt.py
-%%PYTHON_SITELIBDIR%%/PmwColor.py
-%%PYTHON_SITELIBDIR%%/astro.py
-%%PYTHON_SITELIBDIR%%/g.py
-%%PYTHON_SITELIBDIR%%/go.py
-%%PYTHON_SITELIBDIR%%/options.py
-%%PYTHON_SITELIBDIR%%/palettes.py
-%%PYTHON_SITELIBDIR%%/smeter.py
-%%PYTHON_SITELIBDIR%%/specjt.py
+%%DATADIR%%/dmet_10_-1_3.dat
+%%DATADIR%%/dmet_10_0_3.dat
+%%DATADIR%%/dmet_20_-2_2.dat
+%%DATADIR%%/dmet_20_-3_2.dat
+%%DATADIR%%/wsjtrc
 %%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
+%%PYTHON_SITELIBDIR%%/WsjtMod/Audio.so
+%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/astro.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/astro.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/g.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/g.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/go.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/go.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/options.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/options.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.pyc
+%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py
+%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc
+%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%PORTVERSION%%_.by.K1JT-py%%PYVER%%.egg-info
+@dirrm %%PYTHON_SITELIBDIR%%/WsjtMod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%