svn commit: r374783 - in head/comms/wspr: . files

[Diane Bruce]

Author: db
Date: Tue Dec 16 02:58:47 2014
New Revision: 374783
URL: https://svnweb.freebsd.org/changeset/ports/374783
QAT: https://qat.redports.org/buildarchive/r374783/

Log:
  Update py-numpy use in WsprMode/spectjt.py as well

Modified:
  head/comms/wspr/Makefile
  head/comms/wspr/files/patch-WsprMode_specjt.py

Modified: head/comms/wspr/Makefile
==============================================================================
--- head/comms/wspr/Makefile	Tue Dec 16 02:32:21 2014	(r374782)
+++ head/comms/wspr/Makefile	Tue Dec 16 02:58:47 2014	(r374783)
@@ -2,7 +2,7 @@
 
 PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db

Modified: head/comms/wspr/files/patch-WsprMode_specjt.py
==============================================================================
--- head/comms/wspr/files/patch-WsprMode_specjt.py	Tue Dec 16 02:32:21 2014	(r374782)
+++ head/comms/wspr/files/patch-WsprMode_specjt.py	Tue Dec 16 02:58:47 2014	(r374783)
@@ -1,6 +1,6 @@
---- 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 @@
+--- WsprMod/specjt.py.orig	2014-12-15 21:51:30.000000000 -0500
++++ WsprMod/specjt.py	2014-12-15 21:54:38.000000000 -0500
+@@ -34,10 +34,8 @@
  import tkinter.messagebox
  from . import w
  
@@ -8,7 +8,17 @@
 -    from numpy.oldnumeric import zeros, multiarray
 -except:
 -    from Numeric import zeros, multiarray
-+from numpy import zeros, multiarray
++from numpy import zeros
++from numpy.core import multiarray
  import Image, ImageTk, ImageDraw
  from .palettes import colormapblue, colormapgray0, colormapHot, \
       colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
+@@ -94,7 +92,7 @@
+ ttot=0.0
+ 
+ c=Canvas()
+-a=zeros(225000,'s')
++##a=zeros(225000,'s')
+ im=Image.new('P',(750,300))
+ line0=Image.new('P',(750,1))      #Image fragment for top line of waterfall
+ draw=ImageDraw.Draw(im)