6 files changed, 55 insertions, 25 deletions

diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 1a95f7259867..9cc6a2edd32d 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	wspr
-PORTVERSION=	2.00
-PORTREVISION=	3
+DISTVERSION=	${VERSION}.r${SVN_REV}
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.physics.princeton.edu/pulsar/K1JT/
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
-DISTNAME=	wspr-${PORTVERSION}.r1714
+DISTNAME=	wspr-r${SVN_REV}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Weak signal for HF ham radio communication package
@@ -26,10 +24,9 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		${PYNUMPY}
 
-BROKEN=		does not build
-
+USE_BZIP2=	yes
 ALL_TARGET=	build
-EXTRACT_SUFX=	.tgz
+USE_GMAKE=	yes
 USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
@@ -40,16 +37,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	2.5+
 USE_AUTOTOOLS=	libtool
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PORTVERSION=${PORTVERSION}
+		VERSION=${VERSION}
+VERSION=	3.00
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|-Wl.*||' ${WRKSRC}/Makefile
+	cp ${FILESDIR}/wspr ${WRKSRC}
 
 post-install:
 .if	!defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for d in ${WRKSRC}/LICENSE.TXT ${WRKSRC}/WSPR_Announcement.TXT \
-	${WRKSRC}/WSPR_Instructions.TXT ${WRKSRC}/WSPR_Quick_Start.TXT \
+	${WRKSRC}/WSPR0_Instructions.TXT ${WRKSRC}/WSPR_Quick_Start.TXT \
 	${WRKSRC}/supported_rigs.txt
 	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
 .endfor
@@ -59,4 +57,26 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if defined(BOOTSTRAP)
+SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/code/branches/wspr | ${GREP} Revision | cut -d' ' -f2
+.else
+.include "Makefile.svn_rev"
+.endif
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} \
+		http://svn.code.sf.net/p/wsjt/code/branches/wspr ${WRKDIR}/wspr-r${SVN_REV}
+	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/wspr/Makefile.svn_rev b/comms/wspr/Makefile.svn_rev
new file mode 100644
index 000000000000..ca63d73fe43d
--- /dev/null
+++ b/comms/wspr/Makefile.svn_rev
@@ -0,0 +1 @@
+SVN_REV=  2511
diff --git a/comms/wspr/distinfo b/comms/wspr/distinfo
index 5e0517564673..47c619f37a0d 100644
--- a/comms/wspr/distinfo
+++ b/comms/wspr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wspr-2.00.r1714.tgz) = 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423
-SIZE (wspr-2.00.r1714.tgz) = 2096056
+SHA256 (wspr-r2511.tar.bz2) = f7fa3e81431867418916e327317a05da2986def9220ad6173ff6e012fe91fb80
+SIZE (wspr-r2511.tar.bz2) = 320419
diff --git a/comms/wspr/files/patch-setup.py b/comms/wspr/files/patch-setup.py
deleted file mode 100644
index b5c26908e4f6..000000000000
--- a/comms/wspr/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2009-11-19 21:37:56.000000000 -0500
-+++ setup.py	2009-11-19 21:23:45.000000000 -0500
-@@ -1,6 +1,6 @@
- #!/usr/bin/env python
- 
--version = "WSPR Version " + "1.11" + ", by K1JT"
-+version = "WSPR Version " + "2.00" + ", by K1JT"
- 
- from distutils.core import setup
- from distutils.file_util import copy_file
diff --git a/comms/wspr/files/wspr b/comms/wspr/files/wspr
new file mode 100644
index 000000000000..9aee4a30a12a
--- /dev/null
+++ b/comms/wspr/files/wspr
@@ -0,0 +1,11 @@
+#!/bin/sh
+if [ -e /usr/local/bin/python ] ; then
+	LOCALBASE=/usr/local/
+else
+	LOCALBASE=/usr/
+fi
+if [ ! -e ~/.wspr ] ; then
+	mkdir ~/.wspr
+fi
+cd ~/.wspr
+python ${LOCALBASE}/bin/wspr.py
diff --git a/comms/wspr/pkg-plist b/comms/wspr/pkg-plist
index c7e2985a23a1..f0c30a72a1e4 100644
--- a/comms/wspr/pkg-plist
+++ b/comms/wspr/pkg-plist
@@ -2,7 +2,7 @@ bin/wspr
 bin/wspr.py
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/WSPR_Announcement.TXT
-%%PORTDOCS%%%%DOCSDIR%%/WSPR_Instructions.TXT
+%%PORTDOCS%%%%DOCSDIR%%/WSPR0_Instructions.TXT
 %%PORTDOCS%%%%DOCSDIR%%/WSPR_Quick_Start.TXT
 %%PORTDOCS%%%%DOCSDIR%%/supported_rigs.txt
 %%PYTHON_SITELIBDIR%%/WsprMod/w.so
@@ -16,12 +16,20 @@ bin/wspr.py
 %%PYTHON_SITELIBDIR%%/WsprMod/PmwColor.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/advanced.py
 %%PYTHON_SITELIBDIR%%/WsprMod/advanced.pyc
+%%PYTHON_SITELIBDIR%%/WsprMod/hopping.py
+%%PYTHON_SITELIBDIR%%/WsprMod/hopping.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/g.py
 %%PYTHON_SITELIBDIR%%/WsprMod/g.pyc
+%%PYTHON_SITELIBDIR%%/WsprMod/iq.py
+%%PYTHON_SITELIBDIR%%/WsprMod/iq.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/options.py
 %%PYTHON_SITELIBDIR%%/WsprMod/options.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/palettes.py
 %%PYTHON_SITELIBDIR%%/WsprMod/palettes.pyc
-%%PYTHON_SITELIBDIR%%/Wspr-WSPR.Version.%%PORTVERSION%%_.by.K1JT-py%%PYVER%%.egg-info
+%%PYTHON_SITELIBDIR%%/WsprMod/smeter.py
+%%PYTHON_SITELIBDIR%%/WsprMod/smeter.pyc
+%%PYTHON_SITELIBDIR%%/WsprMod/specjt.py
+%%PYTHON_SITELIBDIR%%/WsprMod/specjt.pyc
+%%PYTHON_SITELIBDIR%%/Wspr-WSPR.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info
 @dirrm %%PYTHON_SITELIBDIR%%/WsprMod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%