Attachment 156486 Details for Bug 200042 – wspr.patch

wspr.patch

wspr.patch (text/x-c), 8.86 KB, created by takefu on 2015-05-08 01:21:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2015-05-08 01:21:43 UTC

Size: 8.86 KB

patch

obsolete

>diff -ruN /usr/ports/comms/wspr/Makefile ./Makefile
>--- /usr/ports/comms/wspr/Makefile	2014-12-16 02:58:47.000000000 +0000
>+++ ./Makefile	2015-05-07 06:48:38.000000000 +0000
>@@ -16,15 +16,14 @@
> BUILD_DEPENDS=	${PYNUMPY}
> RUN_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
> 		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
>-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
>-		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
>+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy
> LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
> 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
>-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
>+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate\
>+		libportaudio.so:${PORTSDIR}/audio/portaudio2
> 
> DISABLE_MAKE_JOBS=	yes
>-USE_AUTOTOOLS=	autoconf
>-USES=		fortran gmake libtool tar:bzip2 python:3.3 dos2unix
>+USES=		fortran gmake libtool tar:bzip2 python:3.3 dos2unix autoreconf
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-gfortran=${FC} \
> 		--with-f2py=f2py-${PYTHON_VER} \
>@@ -41,6 +40,8 @@
> 	(cd ${WRKSRC};${GMAKE})
> 
> post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/wspr/WsprMod/w.so
>+
> .if defined(BOOTSTRAP)
> #portlint freaks over this but it's only for dev ignore.
> SVN_REV!=	svn info svn://svn.code.sf.net/p/wsjt/wsjt/branches/wspr | ${GREP} Revision | cut -d' ' -f2
>diff -ruN /usr/ports/comms/wspr/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports/comms/wspr/files/patch-Makefile.in	2014-10-07 22:30:36.000000000 +0000
>+++ ./files/patch-Makefile.in	2015-05-06 08:55:18.000000000 +0000
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2014-06-20 18:58:03.000000000 -0400
>-+++ Makefile.in	2014-07-24 16:14:06.000000000 -0400
>-@@ -25,7 +25,7 @@
>+--- Makefile.in.orig	2014-06-21 07:58:03 UTC
>++++ Makefile.in
>+@@ -25,7 +25,7 @@ SHELL		:=	@SHELL@
>  MKDIR		:=	@MKDIR@
>  
>  # Install locations
>@@ -9,7 +9,7 @@
>  BINDIR		:=	@BINDIR@
>  DOCDIR		:=	@DOCDIR@
>  HOMEDIR		:=	@HOMEDIR@
>-@@ -50,6 +50,8 @@
>+@@ -50,6 +50,8 @@ LDFLAGS		+=	@LDFLAGS@
>  CFLAGS		+=	@CFLAGS@
>  FFLAGS		+=	@FFLAGS@
>  FCOPT		+=	@FCOPT@
>@@ -18,7 +18,7 @@
>  
>  # Config Definitions
>  DEFS		:=	@DEFS@
>-@@ -71,24 +73,24 @@
>+@@ -71,24 +73,24 @@ all:	libwspr.a thnix.o WsprMod/w.so fmte
>  
>  # Default Rules
>  %.o: %.c
>@@ -50,7 +50,7 @@
>  
>  OBJS3 = azdist.o ccf2.o chklevel.o db.o decode.o decode162.o deg2grid.o \
>  	encode232.o fano232.o fchisq.o fil1.o flat3.o four2a.o\
>-@@ -105,21 +107,22 @@
>+@@ -105,21 +107,22 @@ OBJS3 = azdist.o ccf2.o chklevel.o db.o 
>  
>  # Build Library: libwspr.a
>  libwspr.a: ${OBJS3} acom1.f90 acom2.f90
>@@ -78,7 +78,7 @@
>  
>  # SRC for w.so
>  F2PYSRCS = wspr1.f90 getfile.f90 paterminate.f90 audiodev.f90
>-@@ -127,7 +130,7 @@
>+@@ -127,7 +130,7 @@ F2PYSRCS = wspr1.f90 getfile.f90 patermi
>  # Build W.SO & MV to WsprMod/
>  WsprMod/w.so:	libwspr.a ${F2PYSRCS} acom1.f90 
>  	${F2PY} -c --quiet --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
>@@ -87,7 +87,7 @@
>  	${MV} w*.so WsprMod/w.so
>  
>  # Install target wspr
>-@@ -137,20 +140,23 @@
>+@@ -137,20 +140,23 @@ install:
>  	@echo "      Installing ${PROGRAM}"
>  	@echo '-----------------------------------'
>  	@echo ''
>diff -ruN /usr/ports/comms/wspr/files/patch-WsprMode_specjt.py ./files/patch-WsprMode_specjt.py
>--- /usr/ports/comms/wspr/files/patch-WsprMode_specjt.py	2014-12-16 02:58:47.000000000 +0000
>+++ ./files/patch-WsprMode_specjt.py	2015-05-06 08:55:25.000000000 +0000
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- WsprMod/specjt.py.orig	2014-06-06 11:25:42 UTC
>++++ WsprMod/specjt.py
>+@@ -34,10 +34,8 @@ import pickle
>  import tkinter.messagebox
>  from . import w
>  
>@@ -13,7 +13,7 @@
>  import Image, ImageTk, ImageDraw
>  from .palettes import colormapblue, colormapgray0, colormapHot, \
>       colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
>-@@ -94,7 +92,7 @@
>+@@ -94,7 +92,7 @@ tol0=400
>  ttot=0.0
>  
>  c=Canvas()
>diff -ruN /usr/ports/comms/wspr/files/patch-configure.ac ./files/patch-configure.ac
>--- /usr/ports/comms/wspr/files/patch-configure.ac	2014-10-07 22:30:36.000000000 +0000
>+++ ./files/patch-configure.ac	2015-05-06 22:48:57.000000000 +0000
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2014-06-04 15:38:13.000000000 -0400
>-+++ configure.ac	2014-09-26 15:03:51.000000000 -0400
>-@@ -10,18 +10,33 @@
>+--- configure.ac.orig	2014-06-04 19:38:13 UTC
>++++ configure.ac
>+@@ -10,18 +10,33 @@ dnl ------------------------------------
>  dnl path vars
>  dnl ----------------------------------------------------------------------------
>  
>@@ -40,7 +40,7 @@
>  
>  dnl ----------------------------------------------------------------------------
>  dnl check compilers
>-@@ -59,9 +74,17 @@
>+@@ -59,9 +74,17 @@ AC_PATH_PROG([TR], [tr])
>  AC_SUBST([OS], ["$host_os"])
>  AC_SUBST([CPU], ["$host_cpu"])
>  
>@@ -60,7 +60,7 @@
>  AC_HEADER_STDC
>  AC_HEADER_DIRENT
>  AC_HEADER_TIME
>-@@ -88,36 +111,36 @@
>+@@ -88,36 +111,36 @@ dnl ------------------------------------
>  dnl add additional lib paths
>  dnl ----------------------------------------------------------------------------
>  if test -d "/usr/lib64"; then LDFLAGS="-L/usr/lib64 ${LDFLAGS}"; fi
>@@ -108,7 +108,7 @@
>  		AC_DEFINE([HAVE_PY3], [1])
>  		AC_DEFINE_UNQUOTED([PY3_PATH], ["${PY3}"], [Path to Python3])
>  		AC_SUBST([PYTHON], ["${PY3}"])
>-@@ -128,6 +151,7 @@
>+@@ -128,6 +151,7 @@ else
>  fi
>  
>  # if not user supplied, check by calling python
>@@ -116,7 +116,7 @@
>  if test "$HAVE_PY3" = "no"; then
>  
>  	AC_MSG_CHECKING([Python3 using: python])
>-@@ -172,7 +196,7 @@
>+@@ -172,7 +196,7 @@ dnl ------------------------------------
>  
>  HAVE_F2PY=no
>  
>@@ -125,7 +125,7 @@
>  AC_MSG_CHECKING([F2PY --with-f2py])
>  AC_ARG_WITH([f2py], [  --with-f2py=PATH        path to: ../f2py ../f2py3],
>  F2PY="$withval")
>-@@ -244,13 +268,23 @@
>+@@ -244,13 +268,23 @@ dnl ------------------------------------
>  dnl check gfortran
>  dnl ----------------------------------------------------------------------------
>  
>@@ -150,7 +150,7 @@
>  	FCV=gnu95
>  	FC_LIB_PATH=`${FC} -print-file-name=`
>  	AC_DEFINE_UNQUOTED([FC_LIB_PATH], ["${FC_LIB_PATH}"], [Path to Gfortran libs.])
>-@@ -266,12 +300,27 @@
>+@@ -266,12 +300,27 @@ fi
>  dnl ----------------------------------------------------------------------------
>  dnl check portaudio
>  dnl ----------------------------------------------------------------------------
>@@ -179,7 +179,7 @@
>  # if headers and libs found, set define
>  if test "$ac_cv_header_portaudio_h" = "yes" -a "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then
>  	HAVE_PORTAUDIO=1
>-@@ -279,7 +328,6 @@
>+@@ -279,7 +328,6 @@ if test "$ac_cv_header_portaudio_h" = "y
>  	AC_DEFINE([HAVE_PORTAUDIO_LIB], [1], [Portaudio Lib])
>  fi
>  
>@@ -187,7 +187,7 @@
>  dnl ----------------------------------------------------------------------------
>  dnl check fftw3
>  dnl ----------------------------------------------------------------------------
>-@@ -322,8 +370,10 @@
>+@@ -322,8 +370,10 @@ dnl ------------------------------------
>  _LBU=$(echo "-lpthread $LIBS" |tr ' ' '\n'|sort -su |tr '\n' ' ')
>  LIBS="$_LBU"
>  
>@@ -200,18 +200,18 @@
>  
>  _CPPU=$(echo "-I/usr/include -I/usr/local/include $CPPFLAGS" |tr ' ' '\n'|sort -su |tr '\n' ' ')
>  CPPFLAGS="$_CPPU"
>-@@ -355,6 +405,10 @@
>+@@ -355,6 +405,10 @@ case "${host_os}" in
>  		FFLAGS="-O2 -m64 -Wall -fbounds-check -fno-second-underscore \
>  -Wno-conversion -Wno-character-truncation -fPIC"
>  	;;
> +	*freebsd* )
> +		CFLAGS="${CFLAGS} -fpic"
>-+		FFLAGS="-O2 -m64 -Wall -fbounds-check -fno-second-underscore \
>++		FFLAGS="-O2 -Wall -fbounds-check -fno-second-underscore \
> +-Wno-conversion -Wno-character-truncation -fPIC"	;;
>  	*)
>  		AC_MSG_ERROR([Unsupported System: ${host_os}.])
>  	;;
>-@@ -377,10 +431,6 @@
>+@@ -377,10 +431,6 @@ if test "$HAVE_PY3" = "no"; then
>  	echo
>  	echo 'Example:'
>  	echo './configure --with-python3="/home/$USER/test/python3"'
>@@ -222,7 +222,7 @@
>  fi
>  
>  
>-@@ -502,7 +552,7 @@
>+@@ -502,7 +552,7 @@ AC_SUBST([PREFIX], ["$prefix"])
>  AC_SUBST([PROGRAM], ["$PACKAGE_NAME"])
>  AC_SUBST([VERSION], ["$PACKAGE_VERSION"])
>  AC_SUBST([WEB], ["$PACKAGE_URL"])
>@@ -231,7 +231,7 @@
>  AC_OUTPUT
>  
>  
>-@@ -523,7 +573,7 @@
>+@@ -523,7 +573,7 @@ fi
>  echo " Package: .........: ${PROGRAM} ${VERSION}"
>  echo " Python3: .........: ${PYTHON}"
>  echo " F2py: ............: ${F2PY}"
>diff -ruN /usr/ports/comms/wspr/files/patch-wspr.py ./files/patch-wspr.py
>--- /usr/ports/comms/wspr/files/patch-wspr.py	2014-12-15 14:07:51.000000000 +0000
>+++ ./files/patch-wspr.py	2015-05-06 08:57:21.000000000 +0000
>@@ -1,11 +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 @@
>+--- wspr.py.orig	2014-06-20 04:08:58 UTC
>++++ wspr.py
>+@@ -50,7 +50,7 @@ from WsprMod import g
>  import Pmw
>  from WsprMod import palettes
>  from math import log10
> -from numpy.oldnumeric import zeros
>-+from numpy import zeros
>++from import zeros
>  import array
>  ##import dircache
>  from PIL import Image, ImageTk, ImageDraw

Actions: View

Attachments on bug 200042: 156486 | 161101