Attachment #155586 for bug #199412

View | Details | Raw Unified | Return to bug 199412
Collapse All | Expand All




# $FreeBSD: head/comms/wsjt/Makefile 383853 2015-04-12 10:22:18Z antoine $

PORTNAME=	wsjt
PORTVERSION=	9.1
PORTREVISION=	10
DISTVERSION=	${VERSION}.r${SVN_REV}
CATEGORIES=	comms hamradio
MASTER_SITES=	${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	db

MAINTAINER=	hamradio@FreeBSD.org
COMMENT=	Weak signal ham radio communication package

LICENSE=	GPLv2

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
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 \

# Adding this breaks configure
#LDFLAGS+=	-shared
PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
		VERSION=${PORTVERSION}

.include <bsd.port.pre.mk>


Lines 1-6 Link Here

(-)./files/patch-Makefile.in (-4 / +4 lines)
1	--- Makefile.in.orig 2011-04-22 13:00:35.000000000 -0400	1	--- Makefile.in.orig 2011-04-22 17:00:35 UTC
2	+++ Makefile.in 2014-07-29 11:40:12.000000000 -0400	2	+++ Makefile.in
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@ FFLAGS = @FFLAGS@
4	LDFLAGS = @LDFLAGS@	4	LDFLAGS = @LDFLAGS@
5	LIBS += @LIBS@	5	LIBS += @LIBS@
6	CPPFLAGS = @CPPFLAGS@	6	CPPFLAGS = @CPPFLAGS@
Lines 9-15 Link Here
9	PREFIX = @PREFIX@	9	PREFIX = @PREFIX@
10	# WSJT specific C flags	10	# WSJT specific C flags
11	CFLAGS += -DBIGSYM=1 -fPIC	11	CFLAGS += -DBIGSYM=1 -fPIC
12	@@ -148,12 +148,12 @@	12	@@ -148,12 +148,12 @@ cutil.o: cutil.c
13		13
14	install: WsjtMod/Audio.so	14	install: WsjtMod/Audio.so
15	${RM} -rf build/	15	${RM} -rf build/




--- WsjtMod/specjt.py.orig	2011-09-13 19:56:59 UTC
+++ WsjtMod/specjt.py
@@ -11,13 +11,9 @@ import string
 import cPickle
 import tkMessageBox
 

 from palettes import colormapblue, colormapgray0, colormapHot, \
      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
 #import wsjt                         #Is this OK to do?
@@ -76,7 +72,7 @@ tol0=400
 ttot=0.0
 
 c=Canvas()

 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 @@ def update():
             except:
                 print "Images did not match, continuing anyway."
             for i in range(n):

Lines 1-6 Link Here

(-)./files/patch-aclocal.m4 (-3 / +3 lines)
1	--- aclocal.m4.orig 2014-07-28 21:23:20.000000000 -0400	1	--- aclocal.m4.orig 2009-05-17 12:27:34 UTC
2	+++ aclocal.m4 2014-07-28 21:26:51.000000000 -0400	2	+++ aclocal.m4
3	@@ -212,4 +212,7 @@	3	@@ -212,4 +212,7 @@ dnl
4	fi	4	fi
5	fi	5	fi
6		6

Lines 1-5 Link Here

(-)./files/patch-wsjt (-3 / +3 lines)
1	--- wsjt.orig 2014-07-29 12:03:47.000000000 -0400	1	--- wsjt.orig 2009-04-24 20:39:31 UTC
2	+++ wsjt 2014-07-29 12:03:40.000000000 -0400	2	+++ wsjt
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	#!/bin/sh	4	#!/bin/sh
5	-if [ -e /usr/local/bin/python ] ; then	5	-if [ -e /usr/local/bin/python ] ; then
Lines 7-13 Link Here
7	LOCALBASE=/usr/local/	7	LOCALBASE=/usr/local/
8	else	8	else
9	LOCALBASE=/usr/	9	LOCALBASE=/usr/
10	@@ -16,4 +16,4 @@	10	@@ -16,4 +16,4 @@ if [ ! -e ~/.wsjt/CALL3.TXT ] ; then
11	cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt	11	cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt
12	fi	12	fi
13	cd ~/.wsjt	13	cd ~/.wsjt

Lines 1-6 Link Here

(-)./files/patch-wsjt.py (-3 / +3 lines)
1	--- wsjt.py.orig 2012-01-26 12:01:08.000000000 -0500	1	--- wsjt.py.orig 2012-01-26 17:01:08 UTC
2	+++ wsjt.py 2014-12-15 21:21:29.000000000 -0500	2	+++ wsjt.py
3	@@ -10,14 +10,9 @@	3	@@ -10,14 +10,9 @@ from WsjtMod import g
4	import os,time	4	import os,time
5	from WsjtMod import Audio	5	from WsjtMod import Audio
6	from math import log10	6	from math import log10

Return to bug 199412

Lines 1-9 Link Here

(-)./Makefile (-6 / +6 lines)
1	# $FreeBSD: head/comms/wsjt/Makefile 383853 2015-04-12 10:22:18Z antoine $	1	# $FreeBSD: head/comms/wsjt/Makefile 383853 2015-04-12 10:22:18Z antoine $
2		2
3	PORTNAME= wsjt	3	PORTNAME= wsjt
4	VERSION= 9.1	4	PORTVERSION= 9.1
5	PORTREVISION= 9	5	PORTREVISION= 10
6	DISTVERSION= ${VERSION}.r${SVN_REV}
7	CATEGORIES= comms hamradio	6	CATEGORIES= comms hamradio
8	MASTER_SITES= ${MASTER_SITE_LOCAL}	7	MASTER_SITES= ${MASTER_SITE_LOCAL}
9	MASTER_SITE_SUBDIR= db	8	MASTER_SITE_SUBDIR= db
Lines 12-22 Link Here
12	MAINTAINER= hamradio@FreeBSD.org	11	MAINTAINER= hamradio@FreeBSD.org
13	COMMENT= Weak signal ham radio communication package	12	COMMENT= Weak signal ham radio communication package
14		13
15	BROKEN= Fails to configure, missing fftw3.h header	14	LICENSE= GPLv2
16		15
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
18	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow	17	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
19	LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \	18	LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \
		19	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
20	libsamplerate.so:${PORTSDIR}/audio/libsamplerate	20	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
21	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \	21	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
22	${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \	22	${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
Lines 33-39 Link Here
33	# Adding this breaks configure	33	# Adding this breaks configure
34	#LDFLAGS+= -shared	34	#LDFLAGS+= -shared
35	PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \	35	PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
36	VERSION=${VERSION}	36	VERSION=${PORTVERSION}
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39

Lines 1-6 Link Here

(-)./files/patch-WsjtMod_specjt.py (-5 / +5 lines)
1	--- WsjtMod/specjt.py.orig 2011-09-13 12:56:59.000000000 -0700	1	--- WsjtMod/specjt.py.orig 2011-09-13 19:56:59 UTC
2	+++ WsjtMod/specjt.py 2015-01-09 04:04:37.000000000 -0800	2	+++ WsjtMod/specjt.py
3	@@ -11,13 +11,9 @@	3	@@ -11,13 +11,9 @@ import string
4	import cPickle	4	import cPickle
5	import tkMessageBox	5	import tkMessageBox
6		6
Lines 17-23 Link Here
17	from palettes import colormapblue, colormapgray0, colormapHot, \	17	from palettes import colormapblue, colormapgray0, colormapHot, \
18	colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette	18	colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
19	#import wsjt #Is this OK to do?	19	#import wsjt #Is this OK to do?
20	@@ -76,7 +72,7 @@	20	@@ -76,7 +72,7 @@ tol0=400
21	ttot=0.0	21	ttot=0.0
22		22
23	c=Canvas()	23	c=Canvas()
Lines 26-32 Link Here
26	im=Image.new('P',(750,300))	26	im=Image.new('P',(750,300))
27	line0=Image.new('P',(750,1)) #Image fragment for top line of waterfall	27	line0=Image.new('P',(750,1)) #Image fragment for top line of waterfall
28	draw=ImageDraw.Draw(im)	28	draw=ImageDraw.Draw(im)
29	@@ -330,11 +326,14 @@	29	@@ -330,11 +326,14 @@ def update():
30	except:	30	except:
31	print "Images did not match, continuing anyway."	31	print "Images did not match, continuing anyway."
32	for i in range(n):	32	for i in range(n):