Index: head/comms/wsjt/files/patch-Makefile.in =================================================================== --- head/comms/wsjt/files/patch-Makefile.in (revision 473680) +++ head/comms/wsjt/files/patch-Makefile.in (revision 473681) @@ -1,40 +1,41 @@ ---- Makefile.in.orig 2015-01-08 17:33:18 UTC -+++ Makefile.in +--- Makefile.in.orig 2015-01-08 12:33:18.000000000 -0500 ++++ Makefile.in 2017-12-31 22:28:48.134978000 -0500 @@ -6,7 +6,13 @@ # Prerequisites: Python 3.x, numpy-1.8.1, PIL, Pmw-2.0.0+ MV ?= mv + +# Compiler Information CC ?= @CC@ +FC := @FC@ +FCV := @FCV@ +FC_LIB_PATH = @FC_LIB_PATH@ + MKDIR ?= mkdir RM ?= @RM@ INSTALL = install -@@ -51,7 +57,7 @@ FC = @FC@ +@@ -51,7 +57,7 @@ FCV = @FCV@ FC_LIB_PATH += @FC_LIB_PATH@ -LDFLAGS += -L${FC_LIB_PATH} +#LDFLAGS += "-L${FC_LIB_PATH}" OBJS1 = a2d.o abc441.o alignmsg.o ana932.o analytic.o astro.o \ avecho.o avemsg4.o avemsg65.o avemsg6m.o avesp2.o azdist.o \ -@@ -97,12 +103,11 @@ F2PYSRCS = ftn_init.f90 ftn_quit.f90 aud +@@ -97,12 +103,12 @@ azdist0.f90 astro0.f90 chkt0.f90 WsjtMod/Audio.so: libjt.a ${F2PYSRCS} - ${F2PY} -c -I. --fcompiler=gnu95 --f77exec=gfortran --f90exec=gfortran \ - --opt="-cpp -fbounds-check -O2" ${LDFLAGS} \ -+ ${F2PY} -c -I. --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \ ++ ktrace -d -f /tmp/ktrace.out ${F2PY} -c -I. --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \ + --opt="-cpp -fbounds-check" ${LDFLAGS} \ ${LIBS} libjt.a -m Audio ftn_init.f90 ftn_quit.f90 \ audio_init.f90 spec.f90 getfile.f90 azdist0.f90 \ astro0.f90 chkt0.f90 - ++ ktrace -C ${MV} Audio*.so WsjtMod/Audio.so .PHONY : clean Index: head/comms/wspr/Makefile =================================================================== --- head/comms/wspr/Makefile (revision 473680) +++ head/comms/wspr/Makefile (revision 473681) @@ -1,68 +1,70 @@ # $FreeBSD$ PORTNAME= wspr DISTVERSION= ${VERSION}.r${SVN_REV} PORTREVISION= 10 CATEGORIES= comms hamradio MASTER_SITES= LOCAL/db DISTNAME= wspr-r${SVN_REV} MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal for HF ham radio communication package LICENSE= GPLv3 BROKEN_aarch64= fails to compile: gfortran6: unrecognized command line option '-m64' +DEPRECATED= replace with wsjtx upstream no longer maintained +EXPIRATION_DATE= 2018-10-01 BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} LIB_DEPENDS= libhamlib.so:comms/hamlib \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ libportaudio.so:audio/portaudio MAKE_JOBS_UNSAFE= yes USES= autoreconf dos2unix fortran gmake libtool python:3.3+ tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gfortran=${FC} \ --with-f2py=f2py-${PYTHON_VER} \ --with-python3=${PYTHON_CMD} MAKE_ENV+= PYTHONUSERBASE=${STAGEDIR}${PYTHONBASE} #LDFLAGS+= -shared VERSION= 4.00 .include pre-configure: @${CP} ${FILESDIR}/wspr.sh.in ${WRKSRC} do-build: (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 .else .include "Makefile.svn_rev" .endif .if defined(BOOTSTRAP) || defined(SVN_FETCH) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} svn export -r ${SVN_REV} \ svn://svn.code.sf.net/p/wsjt/wsjt/branches/wspr ${WRKDIR}/wspr-r${SVN_REV} cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\ tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} echo "SVN_REV= ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev .if ${USER} == db scp ${DISTDIR}/${DISTNAME}.tar.bz2 \ freefall.freebsd.org:public_distfiles/ .endif .endif .include