6 files changed, 41 insertions, 34 deletions

diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index e034acf38959..6a5617b9d52d 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	wspr
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	2.00
 CATEGORIES=	comms hamradio
+MASTER_SITES=	http://www.physics.princeton.edu/pulsar/K1JT/
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
-DISTNAME=	wspr-r${SVN_REV}
+DISTNAME=	wspr-${PORTVERSION}.r1714
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Weak signal for HF 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 \
+LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
+		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}
 
 ALL_TARGET=	build
-USE_BZIP2=	yes
+EXTRACT_SUFX=	.tgz
 USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
@@ -38,33 +39,21 @@ USE_AUTOTOOLS=	libtool:22
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
 post-configure:
 	@${REINPLACE_CMD} -e 's|-Wl.*||' ${WRKSRC}/Makefile
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.if defined(BOOTSTRAP)
-SVN_REV!=	svn info http://svn.berlios.de/svnroot/repos/wsjt/branches/wspr/ | ${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/branches/wspr ${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
+.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}/supported_rigs.txt
+	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+.endfor
+	@${ECHO}
+	@${ECHO} "docs installed in ${DOCSDIR}"
+	@${ECHO}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/wspr/Makefile.svn_rev b/comms/wspr/Makefile.svn_rev
deleted file mode 100644
index c7ef6dae8557..000000000000
--- a/comms/wspr/Makefile.svn_rev
+++ /dev/null
@@ -1 +0,0 @@
-SVN_REV=	1194
diff --git a/comms/wspr/distinfo b/comms/wspr/distinfo
index 313cfdcb52d1..f755298aabb5 100644
--- a/comms/wspr/distinfo
+++ b/comms/wspr/distinfo
@@ -1,3 +1,3 @@
-MD5 (wspr-r1194.tar.bz2) = 3faa7f1e9a43fe12ccb480916db3e1c7
-SHA256 (wspr-r1194.tar.bz2) = bf1d1431a54acf281d7b6b183e455a1fee4c51ec53e19ce122dba4c53ae43408
-SIZE (wspr-r1194.tar.bz2) = 192042
+MD5 (wspr-2.00.r1714.tgz) = 89bb985d99e777de054a9c1642a941c5
+SHA256 (wspr-2.00.r1714.tgz) = 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423
+SIZE (wspr-2.00.r1714.tgz) = 2096056
diff --git a/comms/wspr/files/patch-setup.py b/comms/wspr/files/patch-setup.py
new file mode 100644
index 000000000000..b5c26908e4f6
--- /dev/null
+++ b/comms/wspr/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- 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/pkg-message b/comms/wspr/pkg-message
index 31d180e9a070..aefeb5993486 100644
--- a/comms/wspr/pkg-message
+++ b/comms/wspr/pkg-message
@@ -1,5 +1,6 @@
 wspr is now installed.
-
+wspr now has some experimental code for controlling
+rigs using rigctl from hamlib. Check supported_rigs.txt in docs.
 Now, go chase some HF dx.
 
 - 73 Diane VA3DB
diff --git a/comms/wspr/pkg-plist b/comms/wspr/pkg-plist
index 7a281a0abe6e..c7e2985a23a1 100644
--- a/comms/wspr/pkg-plist
+++ b/comms/wspr/pkg-plist
@@ -1,5 +1,10 @@
 bin/wspr
 bin/wspr.py
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
+%%PORTDOCS%%%%DOCSDIR%%/WSPR_Announcement.TXT
+%%PORTDOCS%%%%DOCSDIR%%/WSPR_Instructions.TXT
+%%PORTDOCS%%%%DOCSDIR%%/WSPR_Quick_Start.TXT
+%%PORTDOCS%%%%DOCSDIR%%/supported_rigs.txt
 %%PYTHON_SITELIBDIR%%/WsprMod/w.so
 %%PYTHON_SITELIBDIR%%/WsprMod/__init__.py
 %%PYTHON_SITELIBDIR%%/WsprMod/__init__.pyc
@@ -9,6 +14,8 @@ bin/wspr.py
 %%PYTHON_SITELIBDIR%%/WsprMod/PmwBlt.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/PmwColor.py
 %%PYTHON_SITELIBDIR%%/WsprMod/PmwColor.pyc
+%%PYTHON_SITELIBDIR%%/WsprMod/advanced.py
+%%PYTHON_SITELIBDIR%%/WsprMod/advanced.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/g.py
 %%PYTHON_SITELIBDIR%%/WsprMod/g.pyc
 %%PYTHON_SITELIBDIR%%/WsprMod/options.py
@@ -17,3 +24,4 @@ bin/wspr.py
 %%PYTHON_SITELIBDIR%%/WsprMod/palettes.pyc
 %%PYTHON_SITELIBDIR%%/Wspr-WSPR.Version.%%PORTVERSION%%_.by.K1JT-py%%PYVER%%.egg-info
 @dirrm %%PYTHON_SITELIBDIR%%/WsprMod
+%%PORTDOCS%%@dirrm %%DOCSDIR%%