Index: head/comms/wspr/Makefile
===================================================================
--- head/comms/wspr/Makefile	(revision 374745)
+++ head/comms/wspr/Makefile	(revision 374746)
@@ -1,67 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
 DISTNAME=	wspr-r${SVN_REV}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal for HF ham radio communication package
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 DISABLE_MAKE_JOBS=	yes
 USE_AUTOTOOLS=	autoconf
-USES=		fortran gmake libtool tar:bzip2 python:3.3
+USES=		fortran gmake libtool tar:bzip2 python:3.3 dos2unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gfortran=${FC} \
 		--with-f2py=f2py-${PYTHON_VER} \
 		--with-python3=${PYTHON_CMD}
 MAKE_ENV+=	PYTHONUSERBASE=${STAGEDIR}${PYTHONBASE}
-LDFLAGS+=	-shared
+#LDFLAGS+=	-shared
 VERSION=	4.00
 
 .include <bsd.port.pre.mk>
 pre-configure:
 	@${CP} ${FILESDIR}/wspr.sh.in ${WRKSRC}
+
+do-build:
+	(cd ${WRKSRC};${GMAKE})
 
 post-install:
 .if defined(BOOTSTRAP)
 #portlint freaks over this but it's only for dev ignore.
 SVN_REV!=	svn info svn://svn.code.sf.net/p/wsjt/wsjt/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} \
 		svn://svn.code.sf.net/p/wsjt/wsjt/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
 
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
 IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/comms/wspr/files/patch-WsprMode_specjt.py
===================================================================
--- head/comms/wspr/files/patch-WsprMode_specjt.py	(nonexistent)
+++ head/comms/wspr/files/patch-WsprMode_specjt.py	(revision 374746)
@@ -0,0 +1,14 @@
+--- WsprMod/specjt.py.orig	2014-12-14 19:17:21.630624057 -0500
++++ WsprMod/specjt.py	2014-12-14 19:19:41.021613990 -0500
+@@ -34,10 +34,7 @@
+ import tkinter.messagebox
+ from . import w
+ 
+-try:
+-    from numpy.oldnumeric import zeros, multiarray
+-except:
+-    from Numeric import zeros, multiarray
++from numpy import zeros, multiarray
+ import Image, ImageTk, ImageDraw
+ from .palettes import colormapblue, colormapgray0, colormapHot, \
+      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette

Property changes on: head/comms/wspr/files/patch-WsprMode_specjt.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+1
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/comms/wspr/files/patch-wspr.py
===================================================================
--- head/comms/wspr/files/patch-wspr.py	(nonexistent)
+++ head/comms/wspr/files/patch-wspr.py	(revision 374746)
@@ -0,0 +1,11 @@
+--- wspr.py.orig	2014-12-14 19:16:10.079628932 -0500
++++ wspr.py	2014-12-14 19:16:18.894628427 -0500
+@@ -50,7 +50,7 @@
+ import Pmw
+ from WsprMod import palettes
+ from math import log10
+-from numpy.oldnumeric import zeros
++from numpy import zeros
+ import array
+ ##import dircache
+ from PIL import Image, ImageTk, ImageDraw

Property changes on: head/comms/wspr/files/patch-wspr.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+1
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property