FreeBSD Bugzilla – Attachment 155586 Details for
Bug 199412
[PATCH] comms/wsjt: fetch libfftw3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
wsjt.patch2
wsjt.patch (text/plain), 4.84 KB, created by
takefu
on 2015-04-14 08:09:15 UTC
(
hide
)
Description:
wsjt.patch2
Filename:
MIME Type:
Creator:
takefu
Created:
2015-04-14 08:09:15 UTC
Size:
4.84 KB
patch
obsolete
>diff -ruN /usr/ports/comms/wsjt/Makefile ./Makefile >--- /usr/ports/comms/wsjt/Makefile 2015-04-12 19:22:18.000000000 +0900 >+++ ./Makefile 2015-04-14 16:53:05.000000000 +0900 >@@ -1,9 +1,8 @@ > # $FreeBSD: head/comms/wsjt/Makefile 383853 2015-04-12 10:22:18Z antoine $ > > PORTNAME= wsjt >-VERSION= 9.1 >-PORTREVISION= 9 >-DISTVERSION= ${VERSION}.r${SVN_REV} >+PORTVERSION= 9.1 >+PORTREVISION= 10 > CATEGORIES= comms hamradio > MASTER_SITES= ${MASTER_SITE_LOCAL} > MASTER_SITE_SUBDIR= db >@@ -12,11 +11,12 @@ > MAINTAINER= hamradio@FreeBSD.org > COMMENT= Weak signal ham radio communication package > >-BROKEN= Fails to configure, missing fftw3.h header >+LICENSE= GPLv2 > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \ > ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow >-LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ >+LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ >+ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ > libsamplerate.so:${PORTSDIR}/audio/libsamplerate > BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \ > ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \ >@@ -33,7 +33,7 @@ > # Adding this breaks configure > #LDFLAGS+= -shared > PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ >- VERSION=${VERSION} >+ VERSION=${PORTVERSION} > > .include <bsd.port.pre.mk> > >diff -ruN /usr/ports/comms/wsjt/files/patch-Makefile.in ./files/patch-Makefile.in >--- /usr/ports/comms/wsjt/files/patch-Makefile.in 2014-07-30 06:22:05.000000000 +0900 >+++ ./files/patch-Makefile.in 2015-04-14 16:26:55.000000000 +0900 >@@ -1,6 +1,6 @@ >---- Makefile.in.orig 2011-04-22 13:00:35.000000000 -0400 >-+++ Makefile.in 2014-07-29 11:40:12.000000000 -0400 >-@@ -6,7 +6,7 @@ >+--- Makefile.in.orig 2011-04-22 17:00:35 UTC >++++ Makefile.in >+@@ -6,7 +6,7 @@ FFLAGS = @FFLAGS@ > LDFLAGS = @LDFLAGS@ > LIBS += @LIBS@ > CPPFLAGS = @CPPFLAGS@ >@@ -9,7 +9,7 @@ > PREFIX = @PREFIX@ > # WSJT specific C flags > CFLAGS += -DBIGSYM=1 -fPIC >-@@ -148,12 +148,12 @@ >+@@ -148,12 +148,12 @@ cutil.o: cutil.c > > install: WsjtMod/Audio.so > ${RM} -rf build/ >diff -ruN /usr/ports/comms/wsjt/files/patch-WsjtMod_specjt.py ./files/patch-WsjtMod_specjt.py >--- /usr/ports/comms/wsjt/files/patch-WsjtMod_specjt.py 2015-01-12 10:16:52.000000000 +0900 >+++ ./files/patch-WsjtMod_specjt.py 2015-04-14 16:26:55.000000000 +0900 >@@ -1,6 +1,6 @@ >---- WsjtMod/specjt.py.orig 2011-09-13 12:56:59.000000000 -0700 >-+++ WsjtMod/specjt.py 2015-01-09 04:04:37.000000000 -0800 >-@@ -11,13 +11,9 @@ >+--- WsjtMod/specjt.py.orig 2011-09-13 19:56:59 UTC >++++ WsjtMod/specjt.py >+@@ -11,13 +11,9 @@ import string > import cPickle > import tkMessageBox > >@@ -17,7 +17,7 @@ > from palettes import colormapblue, colormapgray0, colormapHot, \ > colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette > #import wsjt #Is this OK to do? >-@@ -76,7 +72,7 @@ >+@@ -76,7 +72,7 @@ tol0=400 > ttot=0.0 > > c=Canvas() >@@ -26,7 +26,7 @@ > im=Image.new('P',(750,300)) > line0=Image.new('P',(750,1)) #Image fragment for top line of waterfall > draw=ImageDraw.Draw(im) >-@@ -330,11 +326,14 @@ >+@@ -330,11 +326,14 @@ def update(): > except: > print "Images did not match, continuing anyway." > for i in range(n): >diff -ruN /usr/ports/comms/wsjt/files/patch-aclocal.m4 ./files/patch-aclocal.m4 >--- /usr/ports/comms/wsjt/files/patch-aclocal.m4 2014-07-30 06:22:05.000000000 +0900 >+++ ./files/patch-aclocal.m4 2015-04-14 16:26:55.000000000 +0900 >@@ -1,6 +1,6 @@ >---- aclocal.m4.orig 2014-07-28 21:23:20.000000000 -0400 >-+++ aclocal.m4 2014-07-28 21:26:51.000000000 -0400 >-@@ -212,4 +212,7 @@ >+--- aclocal.m4.orig 2009-05-17 12:27:34 UTC >++++ aclocal.m4 >+@@ -212,4 +212,7 @@ dnl > fi > fi > >diff -ruN /usr/ports/comms/wsjt/files/patch-wsjt ./files/patch-wsjt >--- /usr/ports/comms/wsjt/files/patch-wsjt 2014-07-30 06:22:05.000000000 +0900 >+++ ./files/patch-wsjt 2015-04-14 16:26:55.000000000 +0900 >@@ -1,5 +1,5 @@ >---- wsjt.orig 2014-07-29 12:03:47.000000000 -0400 >-+++ wsjt 2014-07-29 12:03:40.000000000 -0400 >+--- wsjt.orig 2009-04-24 20:39:31 UTC >++++ wsjt > @@ -1,5 +1,5 @@ > #!/bin/sh > -if [ -e /usr/local/bin/python ] ; then >@@ -7,7 +7,7 @@ > LOCALBASE=/usr/local/ > else > LOCALBASE=/usr/ >-@@ -16,4 +16,4 @@ >+@@ -16,4 +16,4 @@ if [ ! -e ~/.wsjt/CALL3.TXT ] ; then > cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt > fi > cd ~/.wsjt >diff -ruN /usr/ports/comms/wsjt/files/patch-wsjt.py ./files/patch-wsjt.py >--- /usr/ports/comms/wsjt/files/patch-wsjt.py 2014-12-16 11:32:21.000000000 +0900 >+++ ./files/patch-wsjt.py 2015-04-14 16:26:55.000000000 +0900 >@@ -1,6 +1,6 @@ >---- wsjt.py.orig 2012-01-26 12:01:08.000000000 -0500 >-+++ wsjt.py 2014-12-15 21:21:29.000000000 -0500 >-@@ -10,14 +10,9 @@ >+--- wsjt.py.orig 2012-01-26 17:01:08 UTC >++++ wsjt.py >+@@ -10,14 +10,9 @@ from WsjtMod import g > import os,time > from WsjtMod import Audio > from math import log10
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199412
:
155536
| 155586