Date: Mon, 15 Dec 2014 14:07:52 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374746 - in head/comms/wspr: . files Message-ID: <201412151407.sBFE7qkj099578@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Mon Dec 15 14:07:51 2014 New Revision: 374746 URL: https://svnweb.freebsd.org/changeset/ports/374746 QAT: https://qat.redports.org/buildarchive/r374746/ Log: - Unbreak wspr - While here fix import of zeroes removing obsolete import added DOS2UNIX to faciltate this change - Do not re-add #LDFLAGS+= -shared it breaks configure Added: head/comms/wspr/files/patch-WsprMode_specjt.py (contents, props changed) head/comms/wspr/files/patch-wspr.py (contents, props changed) Modified: head/comms/wspr/Makefile Modified: head/comms/wspr/Makefile ============================================================================== --- head/comms/wspr/Makefile Mon Dec 15 13:58:20 2014 (r374745) +++ head/comms/wspr/Makefile Mon Dec 15 14:07:51 2014 (r374746) @@ -2,7 +2,7 @@ PORTNAME= wspr DISTVERSION= ${VERSION}.r${SVN_REV} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= db @@ -24,19 +24,22 @@ LIB_DEPENDS= libhamlib.so:${PORTSDIR}/co 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. Added: head/comms/wspr/files/patch-WsprMode_specjt.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/wspr/files/patch-WsprMode_specjt.py Mon Dec 15 14:07:51 2014 (r374746) @@ -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 Added: head/comms/wspr/files/patch-wspr.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/wspr/files/patch-wspr.py Mon Dec 15 14:07:51 2014 (r374746) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412151407.sBFE7qkj099578>