Index: head/comms/wsjt/Makefile =================================================================== --- head/comms/wsjt/Makefile (revision 473900) +++ head/comms/wsjt/Makefile (revision 473901) @@ -1,108 +1,108 @@ # $FreeBSD$ PORTNAME= wsjt DISTVERSION= ${VERSION}.r${SVN_REV} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms hamradio MASTER_SITES= LOCAL/db DISTNAME= wsjt-r${SVN_REV} MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal ham radio communication package LICENSE= GPLv3 DEPRECATED= replace with wsjtx upstream no longer maintained EXPIRATION_DATE=2018-10-01 RUN_DEPENDS= ${LOCALBASE}/bin/kvasd:comms/kvasd \ ${WSJT_DEPENDS} BUILD_DEPENDS= ${WSJT_DEPENDS} LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ libportaudio.so:audio/portaudio WSJT_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} USE_GCC= yes USES= autoreconf fortran gmake python:3.3+ tar:bzip2 SHEBANG_FILES= ${WRKSRC}/wsjt GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${STAGEDIR}${LOCALBASE} \ --with-portaudio-include-dir=${LOCALBASE}/include \ --with-portaudio-lib-dir=${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # Adding this breaks configure #LDFLAGS+= -shared VERSION= 10 PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ VERSION=${VERSION} OPTIONS_DEFINE= DOCS .include .if defined(BOOTSTRAP) || defined(SVN_FETCH) #portlint freaks over this but it's only for dev. so ignore. FETCH_DEPENDS+= svn:devel/subversion SVN_REV!= svn info http://svn.code.sf.net/p/wsjt/wsjt/ | ${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} \ http://svn.code.sf.net/p/wsjt/wsjt/trunk ${WRKDIR}/wsjt-r${SVN_REV} cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\ tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} ${ECHO_CMD} "SVN_REV= ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev .if ${USER} == db scp ${DISTDIR}/${DISTNAME}.tar.bz2 \ freefall.freebsd.org:public_distfiles/ .endif .endif post-patch: ${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|'\ -e 's|%%PYTHON_VER%%|${PYTHON_VER}|'\ ${WRKSRC}/configure.ac do-build: (cd ${WRKSRC};${GMAKE}) do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${CP} ${FILESDIR}/wsjt ${WRKSRC} ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%PYTHON%%|${PYTHON_CMD}|' ${WRKSRC}/wsjt ${INSTALL_SCRIPT} ${WRKSRC}/wsjt ${STAGEDIR}${LOCALBASE}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod .for d in Audio.so __init__.py astro.py g.py go.py options.py palettes.py \ smeter.py specjt.py ${INSTALL_DATA} ${WRKSRC}/WsjtMod/${d} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod .endfor .for d in CALL3.TXT dmet_10_-1_3.dat dmet_10_0_3.dat dmet_20_-2_2.dat \ dmet_20_-3_2.dat wsjtrc wsjt.py Pmw.py PmwColor.py PmwBlt.py ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DATADIR} .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/wsjt/WsjtMod/Audio.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in WSJT_Source_Code.txt UpdateHistory.txt LICENSE.TXT call_to.txt \ calledby.txt wsjt7a.txt ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/comms/wsjt/files/patch-Makefile.in =================================================================== --- head/comms/wsjt/files/patch-Makefile.in (revision 473900) +++ head/comms/wsjt/files/patch-Makefile.in (revision 473901) @@ -1,41 +1,40 @@ ---- Makefile.in.orig 2015-01-08 12:33:18.000000000 -0500 -+++ Makefile.in 2017-12-31 22:28:48.134978000 -0500 +--- Makefile.in.orig 2015-01-08 17:33:18 UTC ++++ Makefile.in @@ -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 @@ +@@ -51,7 +57,7 @@ FC = @FC@ 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,12 @@ +@@ -97,12 +103,11 @@ F2PYSRCS = ftn_init.f90 ftn_quit.f90 audio_init.f90 sp 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} \ -+ ktrace -d -f /tmp/ktrace.out ${F2PY} -c -I. --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \ ++ ${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