Unbreak wsjt

Current head python code uses python3 so update to reflect that
both wsjt and the upcoming wsjtx port rely upon Linux binary kvasd

comms/wsjt/Makefile

@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	wsjt
-VERSION=	9.1
-PORTREVISION=	11
 DISTVERSION=	${VERSION}.r${SVN_REV}
+PORTREVISION=	12
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
@@ -11,32 +10,43 @@ DISTNAME=	wsjt-r${SVN_REV}
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
+LICENSE=	GPLv3
-		${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 \
 		libportaudio.so:${PORTSDIR}/audio/portaudio
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+WSJT_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
 		${PYNUMPY}
+BUILD_DEPENDS=	${WSJT_DEPENDS}
+RUN_DEPENDS=	${LINUXBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \
+		${WSJT_DEPENDS}
 
 USE_GCC=	yes
-USES=		fortran gmake python tar:bzip2
+USES=		autoreconf fortran gmake python:3.3+ tar:bzip2
+SHEBANG_FILES=	${WRKSRC}/wsjt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \
+CONFIGURE_ARGS=	--prefix=${STAGEDIR}${LOCALBASE} \
-		--with-portaudio-include-dir=${LOCALBASE}/include/ \
+		--with-python=${PYTHON_CMD} \
-		--with-portaudio-lib-dir=${LOCALBASE}/lib/
+		--with-gfortran=${FC} \
+		--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=	9.1
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		VERSION=${VERSION}
 
 .include <bsd.port.pre.mk>
 
-.if defined(BOOTSTRAP)
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
-SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/code/trunk/ | ${GREP} Revision | cut -d' ' -f2
+#portlint freaks over this but it's only for dev. so ignore.
+FETCH_DEPENDS+=	svn:${PORTSDIR}/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
@@ -47,32 +57,46 @@ FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r ${SVN_REV} \
-		http://svn.code.sf.net/p/wsjt/code/trunk ${WRKDIR}/wsjt-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 "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+	${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
 
-pre-patch:
+do-install:
-	@${CP}	${FILESDIR}/configure ${WRKSRC}
+	${MKDIR} ${STAGEDIR}${DATADIR}
-post-install:
+	${CP} ${FILESDIR}/wsjt ${WRKSRC}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf  ${WRKSRC}/WSJT_Source_Code.txt \
+	    ${WRKSRC}/wsjt
-	${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \
+	${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|' \
-	${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT
+	    ${WRKSRC}/wsjt
-	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
+	${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 ${WRKSRC}/WsjtMod/Audio.so ${WRKSRC}/WsjtMod/__init__.py \
+	${WRKSRC}/WsjtMod/astro.py ${WRKSRC}/WsjtMod/g.py \
+	${WRKSRC}/WsjtMod/go.py ${WRKSRC}/WsjtMod/options.py \
+	${WRKSRC}/WsjtMod/palettes.py ${WRKSRC}/WsjtMod/smeter.py \
+	${WRKSRC}/WsjtMod/specjt.py
+	${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod
+.endfor
+.for d in ${WRKSRC}/CALL3.TXT  ${WRKSRC}/dmet_10_-1_3.dat \
+	${WRKSRC}/dmet_10_0_3.dat ${WRKSRC}/dmet_20_-2_2.dat \
+	${WRKSRC}/dmet_20_-3_2.dat ${WRCSRC}/wsjtrc ${WRCSRC}/wsjt.py \
+	${WRKSRC}/Pmw.py ${WRKSRC}/PmwColor.py ${WRKSRC}/PmwBlt.py
+	${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${DATADIR}
 .endfor
-
 do-build:
 	(cd ${WRKSRC};${GMAKE})
 
-post-stage:
+post-configure:
-	(cd ${STAGEDIR}${PREFIX} \
+	echo ZZZ post-configure
-	  && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+	${REINPLACE_CMD} -e 's|f2py|f2py-${PYTHON_VER}|' \
-	   -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+	    ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>

comms/wsjt/Makefile.svn_rev

@@ -1 +1 @@
-SVN_REV=  2511
+SVN_REV=  5745

comms/wsjt/distinfo

@@ -1,2 +1,2 @@
-SHA256 (wsjt-r2511.tar.bz2) = 3724fd976c1c7449a486b821018c4014d5a6b316c657118ac30dc120706e9b9b
+SHA256 (wsjt-r5745.tar.bz2) = 96aeff70903d7ace9e094f739fd25c5453b6211663d75f10d5fb38c8728e72d3
-SIZE (wsjt-r2511.tar.bz2) = 2208647
+SIZE (wsjt-r5745.tar.bz2) = 3262114

comms/wsjt/files/patch-Makefile.in

@@ -1,30 +1,40 @@
---- Makefile.in.orig	2011-04-22 13:00:35.000000000 -0400
+--- Makefile.in.orig	2015-01-08 17:33:18 UTC
-+++ Makefile.in	2014-07-29 11:40:12.000000000 -0400
++++ Makefile.in
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,13 @@
- LDFLAGS	= @LDFLAGS@
+ # Prerequisites: Python 3.x, numpy-1.8.1, PIL, Pmw-2.0.0+
- LIBS	+= @LIBS@
- CPPFLAGS = @CPPFLAGS@
--CFLAGS	= @CFLAGS@
-+CFLAGS	= "@PORTAUDIO_INCLUDE@ @CFLAGS@"
- PREFIX	= @PREFIX@
- # WSJT specific C flags
- CFLAGS	+= -DBIGSYM=1 -fPIC
-@@ -148,12 +148,12 @@
  
- install:	WsjtMod/Audio.so
+ MV			?= 	mv
- 	${RM} -rf build/
++
--	${PYTHON} setup.py install
++# Compiler Information
--	${MKDIR} -p ${PREFIX}/share/wsjt
+ CC			?= 	@CC@
--	${INSTALL} -m 0644 CALL3.TXT ${PREFIX}/share/wsjt/
++FC			:=	@FC@
--	${INSTALL} -m 0644 wsjtrc ${PREFIX}/share/wsjt/
++FCV			:=	@FCV@
--	${INSTALL} -m 0644 dmet_*.dat ${PREFIX}/share/wsjt/
++FC_LIB_PATH	=	@FC_LIB_PATH@
--	${INSTALL} wsjt ${PREFIX}/bin
++
-+	${PYTHON} setup.py install --prefix=${DESTDIR}${PREFIX}
+ MKDIR		?= 	mkdir
-+	${MKDIR} -p ${DESTDIR}${PREFIX}/share/wsjt
+ RM			?=	@RM@
-+	${INSTALL} -m 0644 CALL3.TXT ${DESTDIR}${PREFIX}/share/wsjt/
+ INSTALL		=	install
-+	${INSTALL} -m 0644 wsjtrc ${DESTDIR}${PREFIX}/share/wsjt/
+@@ -51,7 +57,7 @@ FC			=	@FC@
-+	${INSTALL} -m 0644 dmet_*.dat ${DESTDIR}${PREFIX}/share/wsjt/
+ FCV			=	@FCV@
-+	${INSTALL} wsjt ${DESTDIR}${PREFIX}/bin
+ FC_LIB_PATH	+=	@FC_LIB_PATH@
  
- deb: wsjt.py WsjtMod/Audio.so WsjtMod/g.py WsjtMod/__init__.py \
+-LDFLAGS		+=	-L${FC_LIB_PATH}
- 	WsjtMod/options.py WsjtMod/palettes.py WsjtMod/PmwBlt.py \
++#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
+ 	 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} \
++	--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
+-	
+ 	${MV} Audio*.so WsjtMod/Audio.so
+ 
+ .PHONY : clean

comms/wsjt/files/patch-WsjtMod_specjt.py

@@ -1,45 +0,0 @@
---- WsjtMod/specjt.py.orig	2011-09-13 12:56:59.000000000 -0700
-+++ WsjtMod/specjt.py	2015-01-09 04:04:37.000000000 -0800
-@@ -11,13 +11,9 @@
- import cPickle
- import tkMessageBox
- 
--try:
--    from numpy.oldnumeric import zeros, multiarray
--#    print "specjt importing from numpy"
--except:
--    from Numeric import zeros, multiarray
--#    print "specjt importing from Numeric"
--import Image, ImageTk, ImageDraw
-+from numpy import zeros
-+from numpy.core import multiarray
-+from PIL import Image, ImageTk, ImageDraw
- from palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- #import wsjt                         #Is this OK to do?
-@@ -76,7 +72,7 @@
- ttot=0.0
- 
- c=Canvas()
--a=zeros(225000,'s')
-+a=zeros(225000,'uint16')
- 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 @@
-             except:
-                 print "Images did not match, continuing anyway."
-             for i in range(n):
--                line0.putdata(a[750*i:750*(i+1)])   #One row of pixels to line0
-+                for j in range(0, 749):
-+                    line0.putpixel((j,0), a[750*i+j])
-                 im.paste(line0,(0,i))               #Paste in new top line
-             nscroll=nscroll+n
-         else:                                   #A scale factor has changed
--            im.putdata(a)                       #Compute whole new image
-+            for i in range(0, 300):
-+                for j in range(0, 749):
-+                    im.putpixel((j,i), a[750*i+j])
-             b0=brightness                       #Save scale values
-             c0=contrast
-             logm0=logm

comms/wsjt/files/patch-aclocal.m4

@@ -1,10 +1,44 @@
---- aclocal.m4.orig	2014-07-28 21:23:20.000000000 -0400
+--- aclocal.m4.orig	2009-05-17 12:27:34 UTC
-+++ aclocal.m4	2014-07-28 21:26:51.000000000 -0400
++++ aclocal.m4
-@@ -212,4 +212,7 @@
+@@ -175,41 +175,6 @@ if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[
+ 	else
+ 		HAS_PORTAUDIO=1
  	fi
+-else
+-	AC_MSG_RESULT([portaudio not found trying FreeBSD paths ])
+-	portaudio_lib_dir="/usr/local/lib/portaudio2"
+-	portaudio_include_dir="/usr/local/include/portaudio2"
+-dnl
+-dnl Try again to make sure portaudio dirs are valid
+-dnl
+-	AC_MSG_CHECKING([for a v19 portaudio in FreeBSD paths.])
+-	HAS_PORTAUDIO_H=0
+-	HAS_PORTAUDIO_LIB=0
+-
+-	if test -e $[{portaudio_include_dir}]/portaudio.h; then
+-		HAS_PORTAUDIO_H=1
+-	fi
+-
+-	if test -e $[{portaudio_lib_dir}]/libportaudio.so \
+-	    -o -e $[{portaudio_lib_dir}]/libportaudio.a;then
+-		HAS_PORTAUDIO_LIB=1
+-	fi
+-
+-	if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[{HAS_PORTAUDIO_LIB}] -eq 1; then
+-		AC_MSG_RESULT([found portaudio in FreeBSD paths, double checking it is v19 ])
+-		LDFLAGS="-L$[{portaudio_lib_dir}] $[{LDFLAGS}]"
+-		LIBS="$[{LIBS}] -lportaudio"
+-		CPPFLAGS="-I$[{portaudio_include_dir}] $[{CPPFLAGS}]"
+-		AC_CHECK_LIB(portaudio, Pa_GetVersion, \
+-			[HAS_PORTAUDIO_VERSION=1], [HAS_PORTAUDIO_VERSION=0])
+-		if test $[{HAS_PORTAUDIO_VERSION}] -eq 0; then
+-			AC_MSG_RESULT([How did you end up with a portaudio v18 here?])
+-		else
+-			AC_MSG_RESULT([found v19])
+-			HAS_PORTAUDIO=1
+-			HAS_PORTAUDIO_H=1
+-		fi
+-	fi
  fi
  
-+AC_SUBST([PORTAUDIO_INCLUDE], ["-I${portaudio_include_dir}"])
-+AC_SUBST([PORTAUDIO_LIBDIR], ["-L${portaudio_lib_dir}"])
-+
  ])dnl }}}

comms/wsjt/files/patch-wsjt

@@ -1,15 +0,0 @@
---- wsjt.orig	2014-07-29 12:03:47.000000000 -0400
-+++ wsjt	2014-07-29 12:03:40.000000000 -0400
-@@ -1,5 +1,5 @@
- #!/bin/sh
--if [ -e /usr/local/bin/python ] ; then
-+if [ -e /usr/local/bin/python2 ] ; then
- 	LOCALBASE=/usr/local/
- else
- 	LOCALBASE=/usr/
-@@ -16,4 +16,4 @@
- 	cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt
- fi
- cd ~/.wsjt
--python ${LOCALBASE}/bin/wsjt.py
-+python2 ${LOCALBASE}/bin/wsjt.py

comms/wsjt/files/patch-wsjt.py

@@ -1,19 +0,0 @@
---- wsjt.py.orig	2012-01-26 12:01:08.000000000 -0500
-+++ wsjt.py	2014-12-15 21:21:29.000000000 -0500
-@@ -10,14 +10,9 @@
- import os,time
- from WsjtMod import Audio
- from math import log10
--try:
--    from numpy.oldnumeric import zeros
--#    print "importing from numpy"
--except: 
--    from Numeric import zeros
--#    print "importing from Numeric"
-+from numpy import zeros
- import dircache
--import Image,ImageTk  #, ImageDraw
-+from PIL import Image, ImageTk #, ImageDraw
- from WsjtMod.palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- from types import *

comms/wsjt/files/wsjt

@@ -0,0 +1,61 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+# This file is part of the WSJT application, Weak Signal Propogation Reporter
+#
+# File Name:    wsjt.sh
+# Description:  Shell script wrapper to update or copy files from system install
+# 
+# Copyright (C) 2001-2014 Joseph Taylor, K1JT
+# License: GNU GPL v3
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+# Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+#-------------------------------------------------------------------------------
+
+set -e
+
+copyur() {
+        for f in $1/*;do
+        	if [ ! -e `basename $f` ]; then
+			if [ ! -d $f ]; then
+				cp $f .
+			fi
+		elif [ $f -nt `basename $f` ]; then
+			if [ ! -d `basename $f` ]; then
+	                        cp $f .
+			fi
+                fi
+        done
+}
+
+# set dir's
+_HOMEDIR="/home/$USER/.wsjt"
+export PATH=$PATH:/compat/linux/bin
+
+# update out of date files
+if [  -e $_HOMEDIR ] ; then 
+	cd $_HOMEDIR
+	copyur %%LOCALBASE%%/share/wsjt
+	cd $_HOMEDIR/WsjtMod
+        copyur %%LOCALBASE%%/lib/wsjt/WsjtMod
+	cd $_HOMEDIR
+else
+# if _HOMEDIR does not exist make it
+  mkdir  $_HOMEDIR
+  cp -R %%LOCALBASE%%/share/wsjt/* $_HOMEDIR cp -R %%LOCALBASE%%/lib/wsjt/* $_HOMEDIR
+fi
+
+cd $_HOMEDIR
+%%PYTHON%% -O wsjt.py

comms/wsjt/pkg-plist

@@ -1,37 +1,75 @@
 bin/wsjt
-bin/wsjt.py
 %%DATADIR%%/CALL3.TXT
 %%DATADIR%%/dmet_10_-1_3.dat
 %%DATADIR%%/dmet_10_0_3.dat
 %%DATADIR%%/dmet_20_-2_2.dat
 %%DATADIR%%/dmet_20_-3_2.dat
+%%DATADIR%%/Pmw.py
+%%DATADIR%%/PmwBlt.py
+%%DATADIR%%/PmwColor.py
+%%DATADIR%%/wsjt.py
 %%DATADIR%%/wsjtrc
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
+%%PORTDOCS%%%%DOCSDIR%%/common/communication.adoc
-%%PORTDOCS%%%%DOCSDIR%%/UpdateHistory.txt
+%%PORTDOCS%%%%DOCSDIR%%/common/license.adoc
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_Quick_Reference.pdf
+%%PORTDOCS%%%%DOCSDIR%%/common/links.adoc
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_Source_Code.txt
+%%PORTDOCS%%%%DOCSDIR%%/theme/wsjt/wsjt.css
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_User_600.pdf
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/acknowledgments.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/Audio.so
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/astrodata.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/compiling.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/controls.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/coop_programs.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/echo.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/faq.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/files.adoc
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/AstroData.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/BandMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/astro.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/DecodeMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/astro.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/FileMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/g.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/HelpMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/g.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/KeyboardShortcuts.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/go.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MainButtons.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/go.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Center.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/options.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Left.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/options.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Right.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ModeMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MouseCommands.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SaveMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SetupMenu.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_Controls.png
-%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_DL7UAE.png
-%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/StatusBar.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz_2.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ViewMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/WhatMessage.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/console.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/echo.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt4_Templates.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt65.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt6m.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/options.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/prefixes.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/wsjt9.7_main.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/implementation.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/installation.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/installed-files.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/introduction.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/make-qso.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/measure.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/protocols.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/setup.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/system-requirements.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/tutorial.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/utilities.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/wsjt-main.adoc
+%%PORTDOCS%%%%DOCSDIR%%/wsjt-jtsdk2.conf
+%%PORTDOCS%%%%DOCSDIR%%/wsjt.conf.in
+lib/wsjt/WsjtMod/Audio.so
+lib/wsjt/WsjtMod/__init__.py
+lib/wsjt/WsjtMod/astro.py
+lib/wsjt/WsjtMod/g.py
+lib/wsjt/WsjtMod/go.py
+lib/wsjt/WsjtMod/options.py
+lib/wsjt/WsjtMod/palettes.py
+lib/wsjt/WsjtMod/smeter.py
+lib/wsjt/WsjtMod/specjt.py