From owner-svn-ports-head@FreeBSD.ORG Mon Dec 15 14:07:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F25B4FE; Mon, 15 Dec 2014 14:07:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D37AD127; Mon, 15 Dec 2014 14:07:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFE7qnZ099583; Mon, 15 Dec 2014 14:07:52 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFE7qkj099578; Mon, 15 Dec 2014 14:07:52 GMT (envelope-from db@FreeBSD.org) Message-Id: <201412151407.sBFE7qkj099578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Mon, 15 Dec 2014 14:07:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374746 - in head/comms/wspr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:07:53 -0000 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 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