Index: head/comms/wspr/distinfo =================================================================== --- head/comms/wspr/distinfo (revision 450793) +++ head/comms/wspr/distinfo (revision 450794) @@ -1,2 +1,3 @@ +TIMESTAMP = 1506554893 SHA256 (wspr-r4198.tar.bz2) = 8ca522b52da16bd18568977d58aad85dcb771d3994136e374e4fd5ffe9fb350a SIZE (wspr-r4198.tar.bz2) = 4617738 Index: head/comms/wspr/files/patch-Makefile.in =================================================================== --- head/comms/wspr/files/patch-Makefile.in (revision 450793) +++ head/comms/wspr/files/patch-Makefile.in (revision 450794) @@ -1,132 +1,132 @@ ---- Makefile.in.orig 2015-07-27 16:22:02 UTC +--- Makefile.in.orig 2017-09-27 19:55:15 UTC +++ Makefile.in @@ -25,7 +25,8 @@ SHELL := @SHELL@ MKDIR := @MKDIR@ # Install locations -INATALL := install +INSTALL := install +PREFIX := @PREFIX@ BINDIR := @BINDIR@ DOCDIR := @DOCDIR@ HOMEDIR := @HOMEDIR@ @@ -45,7 +46,7 @@ F2PY := @F2PY@ # Libs and Flags LIBS := @LIBS@ -CPPFLAGS += ${DEFS} +CPPFLAGS := @CPPFLAGS@ LDFLAGS += @LDFLAGS@ CFLAGS += @CFLAGS@ FFLAGS += @FFLAGS@ @@ -71,24 +72,24 @@ all: libwspr.a thnix.o WsprMod/w.so fmte # Default Rules %.o: %.c - ${CC} ${CPPFLAGS} ${CFLAGS} -c $< + ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $< %.o: %.f - ${FC} ${FFLAGS} -c $< + ${FC} ${DEFS} ${CFLAGS} ${FFLAGS} -c $< %.o: %.F - ${FC} ${FFLAGS} -c $< + ${FC} ${DEFS} ${CFLAGS} ${FFLAGS} -c $< %.o: %.f90 - ${FC} ${FFLAGS} -c $< + ${FC} ${DEFS} ${CFLAGS} ${FFLAGS} -c $< %.o: %.F90 - ${FC} ${FFLAGS} -c $< + ${FC} ${DEFS} ${CFLAGS} ${FFLAGS} -c $< # Objects OBJS1 = wspr0.o wspr0init.o wspr0_rx.o wspr0_tx.o thnix_stub.o wspr0: ${OBJS1} - ${FC} ${FFLAGS} -o wspr0 ${FFLAGS} ${OBJS1} libwspr.a -lfftw3f -lportaudio + ${FC} ${PORTAUDIO_LIBDIR} ${FFLAGS} ${LDFLAGS} -o wspr0 ${FFLAGS} ${OBJS1} libwspr.a -lfftw3f -lportaudio wsprcode: wsprcode.o thnix_stub.o - ${FC} ${FFLAGS} -o wsprcode wsprcode.o thnix_stub.o libwspr.a -pthread + ${FC} ${PORTAUDIO_INCLUDE} ${FFLAGS} -o wsprcode wsprcode.o thnix_stub.o libwspr.a -pthread 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 +106,22 @@ OBJS3 = azdist.o ccf2.o chklevel.o db.o # Build Library: libwspr.a libwspr.a: ${OBJS3} acom1.f90 acom2.f90 - ${AR} cr libwspr.a ${OBJS3} ranlib libwspr.a + ar cr libwspr.a ${OBJS3} +# ${AR} cr libwspr.a ${OBJS3} # Build FMT Applications fmtest: fmtest.f90 libwspr.a - ${FC} ${FFLAGS} -o fmtest fmtest.f90 libwspr.a -lfftw3f -lportaudio + ${FC} ${CFLAGS} ${FFLAGS} ${PORTAUDIO_LIBDIR} ${LDFLAGS} -o fmtest fmtest.f90 libwspr.a -lfftw3f -lportaudio fmtave: fmtave.f90 - ${FC} ${FFLAGS} -o fmtave fmtave.f90 + ${FC} ${PORTAUDIO_INCLUDE} ${CFLAGS} ${FFLAGS} ${PORTAUDIO_LIBDIR} ${LDFLAGS} -o fmtave fmtave.f90 fcal: fcal.f90 - ${FC} ${FFLAGS} -o fcal fcal.f90 + ${FC} ${PORTAUDIO_INCLUDE} ${CFLAGS} ${FFLAGS} ${PORTAUDIO_LIBDIR} ${LDFLAGS} -o fcal fcal.f90 fmeasure: fmeasure.f90 - ${FC} ${FFLAGS} -o fmeasure fmeasure.f90 + ${FC} ${PORTAUIO_INCLUDE} ${CFLAGS} ${FFLAGS} ${PORTAUDIO_LIBDIR} ${LDFLAGS} -o fmeasure fmeasure.f90 # SRC for w.so F2PYSRCS = wspr1.f90 getfile.f90 paterminate.f90 audiodev.f90 @@ -127,30 +129,34 @@ 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} \ - --opt="${FCOPT}" thnix.o ${LDFLAGS} ${LIBS} libwspr.a -m w ${F2PYSRCS} + --opt="${FCOPT}" thnix.o ${PORTAUDIO_LIBDIR} ${LDFLAGS} ${LIBS} libwspr.a -m w ${F2PYSRCS} ${MV} w*.so WsprMod/w.so # Install target wspr install: - @clear +# tput has no TERM under automated install +# @clear @echo '-----------------------------------' @echo " Installing ${PROGRAM}" @echo '-----------------------------------' @echo '' - @${MKDIR} -p ${DOCDIR}/examples - @${MKDIR} -p ${SHARED}/save/Samples - @${MKDIR} -p ${WSPRLIB}/WsprMod - @install -m 755 --strip fmtest fcal fmeasure fmtave wspr0 wsprcode ${BINDIR} - @install -m 644 manpages/man1/*.1 ${MANDIR} - @install -m 644 save/Samples/* ${SHARED}/save/Samples/ - @install -m 755 ./{gocal,Pmw*.py,wspr.py,wspr.sh,wsprrc} ${SHARED} - @install -m 644 ./{AUTHORS,README,NEWS,COPYING,COPYRIGHT} ${DOCDIR} - @install -m 644 ./hamlib_rig* ${SHARED} - @install -m 755 WsprMod/* ${WSPRLIB}/WsprMod - @${MV} -T ${SHARED}/wspr.sh ${BINDIR}/wspr - @${CHMOD} 755 ${BINDIR}/wspr - @${CP} -r doc/examples/* ${DOCDIR}/examples/ - @${CHMOD} -R 644 ${DOCDIR}/examples/* + @${MKDIR} -p ${DESTDIR}${DOCDIR}/examples + @${MKDIR} -p ${DESTDIR}${SHARED}/save/Samples + @${MKDIR} -p ${DESTDIR}${WSPRLIB}/WsprMod + @install -m 655 fmtest fcal fmeasure fmtave wspr0 wsprcode ${DESTDIR}${BINDIR} + @strip ${DESTDIR}${BINDIR}/fmtest ${DESTDIR}${BINDIR}/fcal \ + ${DESTDIR}${BINDIR}/fmeasure ${DESTDIR}${BINDIR}/fmtave \ + ${DESTDIR}${BINDIR}/wspr0 ${DESTDIR}${BINDIR}/wsprcode + @install -m 644 manpages/man1/*.1 ${DESTDIR}${MANDIR} + @install -m 644 save/Samples/* ${DESTDIR}${SHARED}/save/Samples/ + @install -m 755 gocal Pmw*.py wspr.py wspr.sh wsprrc ${DESTDIR}${SHARED} + @install -m 644 AUTHORS README NEWS COPYING COPYRIGHT ${DESTDIR}${DOCDIR} + @install -m 644 hamlib_rig* ${DESTDIR}${SHARED} + @install -m 755 WsprMod/* ${DESTDIR}${WSPRLIB}/WsprMod + @install -m 755 wspr.sh ${DESTDIR}${BINDIR}/wspr + @${CHMOD} 755 ${DESTDIR}${BINDIR}/wspr + @${CP} -r doc/examples/* ${DESTDIR}${DOCDIR}/examples/ + @${CHMOD} -R 644 ${DESTDIR}${DOCDIR}/examples/* @echo "Finished Installing ${PROGRAM}" @echo '' @echo '..To run, type..: wspr' Index: head/comms/wspr/files/patch-configure.ac =================================================================== --- head/comms/wspr/files/patch-configure.ac (revision 450793) +++ head/comms/wspr/files/patch-configure.ac (revision 450794) @@ -1,229 +1,229 @@ ---- configure.ac.orig 2016-04-08 05:56:23 UTC +--- configure.ac.orig 2017-09-27 19:55:15 UTC +++ configure.ac @@ -10,18 +10,33 @@ dnl ------------------------------------ dnl path vars dnl ---------------------------------------------------------------------------- +AC_PREFIX_DEFAULT("/usr") + AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CANONICAL_BUILD AC_SUBST([USER], ["$USER"]) + +gfortran="gfortran" + +AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", [Prefix where wspr is installed.]) + + AC_SUBST([HOMEDIR], [/home/"$USER"/.wspr]) -AC_SUBST([PREFIX], [/usr]) -AC_SUBST([BINDIR], [/usr/bin]) -AC_SUBST([WSPRLIB], [/usr/lib/wspr]) -AC_SUBST([SHARED], [/usr/share/wspr]) -AC_SUBST([MANDIR], [/usr/share/man/man1]) -AC_SUBST([DOCDIR], [/usr/share/doc/wspr]) +AC_SUBST([PREFIX], [${prefix}]) +AC_SUBST([BINDIR], [${prefix}/bin]) +AC_SUBST([WSPRLIB], [${prefix}/lib/wspr]) +AC_SUBST([SHARED], [${prefix}/share/wspr]) +AC_SUBST([DOCDIR], [${prefix}/share/doc/wspr]) +case "${host_os}" in + *bsd* ) + AC_SUBST([MANDIR], [${prefix}/man/man1]) + ;; + * ) + AC_SUBST([MANDIR], [${prefix}/share/man/man1]) + ;; +esac dnl ---------------------------------------------------------------------------- dnl check compilers @@ -59,9 +74,17 @@ AC_PATH_PROG([TR], [tr]) AC_SUBST([OS], ["$host_os"]) AC_SUBST([CPU], ["$host_cpu"]) -dnl ---------------------------------------------------------------------------- +dnl --------------------------------------------------------------------------- dnl check headers -dnl ---------------------------------------------------------------------------- +dnl --------------------------------------------------------------------------- + +dnl --------------------------------------------------------------------------- +dnl Lots of BSD/Solaris/ other systems look in /usr/local +dnl --------------------------------------------------------------------------- + +CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" +LDFLAGS="-L/usr/local/lib ${LDFLAGS}" + AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME @@ -88,36 +111,36 @@ dnl ------------------------------------ dnl add additional lib paths dnl ---------------------------------------------------------------------------- if test -d "/usr/lib64"; then LDFLAGS="-L/usr/lib64 ${LDFLAGS}"; fi -if test -d "/usr/local/lib"; then LDFLAGS="-L/usr/local/lib ${LDFLAGS}"; fi +#if test -d "/usr/local/lib"; then LDFLAGS="${LDFLAGS} -L/usr/local/lib"; fi if test -d "/usr/lib/x86_64-linux-gnu"; then LDFLAGS="-L/usr/lib/x86_64-linux-gnu ${LDFLAGS}"; fi if test -d "/usr/lib/i386-linux-gnu"; then LDFLAGS="-L/usr/lib/i386-linux-gnu ${LDFLAGS}"; fi -if test -d "/usr/lib"; then LDFLAGS="-L/usr/lib ${LDFLAGS}"; fi +if test -d "/usr/lib"; then LDFLAGS="${LDFLAGS} -L/usr/lib"; fi if test -d "/usr/lib/arm-linux-gnueabihf"; then LDFLAGS="-L/usr/lib/arm-linux-gnueabihf ${LDFLAGS}"; fi + dnl ---------------------------------------------------------------------------- dnl find Python3 dnl ---------------------------------------------------------------------------- HAVE_PY3=no -# check with-enable first +# check with-python3 first AC_MSG_CHECKING([Python3 --with-python3]) -AC_ARG_WITH([f2py], [ --with-python3=PATH path to: ../python3], +AC_ARG_WITH([python3], [ --with-python3=PATH path to: ../python3], PY3="$withval") # if --with-python3 is not empty -if test -n "$PY3"; then +if test -n ${PY3}; then # check if user provided python3 is >= 3.2 -python3 -c "import sys; sys.exit(sys.version < '3.2')" >/dev/null 2>&1 - +${PY3} -c "import sys; sys.exit(sys.version < '3.2')" >/dev/null 2>&1 if test "$?" != "0"; then - HAVE_PY3=no + HAVE_PY3="no" AC_MSG_RESULT([no]) else - HAVE_PY3=yes - PY3_PATH="$PY3" - PY3V=`$PY3 -V` + HAVE_PY3="yes" + PY3_PATH=${PY3} + PY3V=`${PY3} -V` AC_DEFINE([HAVE_PY3], [1]) AC_DEFINE_UNQUOTED([PY3_PATH], ["${PY3}"], [Path to Python3]) AC_SUBST([PYTHON], ["${PY3}"]) @@ -128,6 +151,7 @@ else fi # if not user supplied, check by calling python + if test "$HAVE_PY3" = "no"; then AC_MSG_CHECKING([Python3 using: python]) @@ -172,7 +196,7 @@ dnl ------------------------------------ HAVE_F2PY=no -# check with-enable first +# check with-f2py first AC_MSG_CHECKING([F2PY --with-f2py]) AC_ARG_WITH([f2py], [ --with-f2py=PATH path to: ../f2py ../f2py3], F2PY="$withval") @@ -244,13 +268,23 @@ dnl ------------------------------------ dnl check gfortran dnl ---------------------------------------------------------------------------- +AC_MSG_CHECKING([gfortran --with-gfortran]) +AC_ARG_WITH([gfortran], [ --with-gfortran=PATH path to: ../gfortran],]) + +# if --with-gfortran is not empty +if test -n ${withval}; then + gfortran="${withval}" + gfpath=`${gfortran} --print-file-name=|awk -F/ '{print $1 "/" $2 "/" $3 "/" $4 "/" $5}'` + LDFLAGS="-L${gfpath} ${LDFLAGS}" +fi + AC_CHECK_LIB([gfortran], [_gfortran_st_write], [], []) if test "$ac_cv_lib_gfortran__gfortran_st_write" != "yes"; then HAVE_GFORTRAN=0 else HAVE_GFORTRAN=1 - FC=gfortran + FC=${gfortran} 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,14 @@ fi dnl ---------------------------------------------------------------------------- dnl check portaudio dnl ---------------------------------------------------------------------------- +# AC_CHECK_LIB([portaudio], [Pa_Initialize], [], []) if test "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then - LIBS="-lportaudio ${LIBS}" + LIBS="-lportaudio ${LIBS}" fi + # 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 +315,6 @@ if test "$ac_cv_header_portaudio_h" = "y AC_DEFINE([HAVE_PORTAUDIO_LIB], [1], [Portaudio Lib]) fi - dnl ---------------------------------------------------------------------------- dnl check fftw3 dnl ---------------------------------------------------------------------------- @@ -322,8 +357,10 @@ dnl ------------------------------------ _LBU=$(echo "-lpthread $LIBS" |tr ' ' '\n'|sort -su |tr '\n' ' ') LIBS="$_LBU" -_LDU=$(echo "$LDFLAGS" |tr ' ' '\n'|sort -su |tr '\n' ' ') -LDFLAGS="$_LDU" +# This of course destroys FreeBSD builds +#_LDU=$(echo "$LDFLAGS" |tr ' ' '\n'|sort -su |tr '\n' ' ') +#LDFLAGS="$_LDU" + _CPPU=$(echo "-I/usr/include -I/usr/local/include $CPPFLAGS" |tr ' ' '\n'|sort -su |tr '\n' ' ') CPPFLAGS="$_CPPU" @@ -355,6 +392,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 -m"$(/usr/bin/getconf LONG_BIT)" -Wall -fbounds-check -fno-second-underscore \ +-Wno-conversion -Wno-character-truncation -fPIC" ;; *) AC_MSG_ERROR([Unsupported System: ${host_os}.]) ;; @@ -377,10 +418,6 @@ if test "$HAVE_PY3" = "no"; then echo echo 'Example:' echo './configure --with-python3="/home/$USER/test/python3"' -else - # add python3 path to wspr.sh script - sed -i '/wspr.py/d' wspr.sh - echo "$PY3_PATH -O wspr.py" >> wspr.sh fi @@ -502,7 +539,7 @@ AC_SUBST([PREFIX], ["$prefix"]) AC_SUBST([PROGRAM], ["$PACKAGE_NAME"]) AC_SUBST([VERSION], ["$PACKAGE_VERSION"]) AC_SUBST([WEB], ["$PACKAGE_URL"]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile wspr.sh]) AC_OUTPUT @@ -523,7 +560,7 @@ fi echo " Package: .........: ${PROGRAM} ${VERSION}" echo " Python3: .........: ${PYTHON}" echo " F2py: ............: ${F2PY}" -echo " Fcomplier: .......: ${FC}" +echo " Fcompiler: .......: ${FC}" echo " Samplerate: ......: ${srstatus}" echo " FFTW3: ...........: ${ffstatus}" echo " Portaudio: .......: ${pastatus}" Property changes on: head/comms/wspr/files/patch-configure.ac ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/wspr/files/patch-wspr.py =================================================================== --- head/comms/wspr/files/patch-wspr.py (revision 450793) +++ head/comms/wspr/files/patch-wspr.py (revision 450794) @@ -1,11 +1,11 @@ ---- wspr.py.orig 2015-07-27 16:22:02 UTC +--- wspr.py.orig 2017-09-27 19:55:15 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 import array ##import dircache from PIL import Image, ImageTk, ImageDraw Index: head/comms/wspr/files/patch-wspr2.f90 =================================================================== --- head/comms/wspr/files/patch-wspr2.f90 (nonexistent) +++ head/comms/wspr/files/patch-wspr2.f90 (revision 450794) @@ -0,0 +1,11 @@ +--- wspr2.f90.orig 2017-09-27 23:05:56 UTC ++++ wspr2.f90 +@@ -40,7 +40,7 @@ subroutine wspr2 + include 'acom2.f90' + character dectxt*80,logfile*80 + integer nt(9) +- integer iclock(12) ++ integer iclock(36) + integer ib(15) + common/patience/npatience + data nrxnormal/0/,ireset/1/ Property changes on: head/comms/wspr/files/patch-wspr2.f90 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property