- fixed Makefile to depend on gcc42 not gfortran

- regenerated configure to use gcc42 gfortran42 with py-numpy
- fixed botch with missing gmtime_r_ (already fixed upstream)
- fixed wsjt to use py-numpy instead of deprecated py-numeric
- fixed to use portaudio v19 already in ports
- fixed to run on amd due to above
- maho wants WANT_FORTRAN knob in gfortran ports

Pointy hat to: pav,maho
Approved by: ehaupt (mentor)

11 files changed, 229 insertions, 985 deletions

diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index dabba7162150..9da56d76cb17 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsjt
 PORTVERSION=	5.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	wsjt
@@ -17,30 +17,27 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Weak signal ham radio communication pakage
 
-BUILD_DEPENDS=	gfortran41:${PORTSDIR}/lang/gfortran \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy03 \
-		${PYTHON_SITELIBDIR}/f2py2e:${PORTSDIR}/lang/f2py
-#		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSIDR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS=	gfortran42:${PORTSDIR}/lang/gcc42 \
+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		${PYNUMPY}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter/ \
+		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate
 
-ONLY_FOR_ARCHS=	i386
-ONLY_FOR_ARCHS_REASON=	WIP for amd64 and perhaps others
-
+WANT_FORTRAN=	yes	#dummy
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	2.4+
-PYNUMERIC=	yes
 USE_AUTOTOOLS=	libtool:15
 
-#
-# This until Joe renames the tarball properly --db
-#
 post-extract:
 	@${MV} ${WRKDIR}/wsjt596r309 ${WRKDIR}/wsjt-5.9.6.r309
 
-pre-configure:
-	@${CP} ${FILESDIR}/portaudio-v19-Makefile ${WRKSRC}/portaudio-v19/Makefile
-	@${CP} ${FILESDIR}/portaudio-v19-config.status ${WRKSRC}/portaudio-v19/config.status
+post-patch:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	${WRKSRC}/configure
 
 do-install:
 	@${MKDIR} ${DATADIR}
diff --git a/comms/wsjt/files/patch-Makefile.in b/comms/wsjt/files/patch-Makefile.in
deleted file mode 100644
index f22d22b6ae9a..000000000000
--- a/comms/wsjt/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Thu Nov  2 10:15:28 2006
-+++ Makefile.in	Thu Nov  2 10:15:41 2006
-@@ -100,7 +100,6 @@
- 	$(FC) -o JT65code $(OBJS1)
- 
- portaudio-v19/lib/.libs/libportaudio.a:
--	(cd portaudio-v19;./configure --with-jack=no)
- 	(cd portaudio-v19;${MAKE})
- 
- wsjt6:	@NEEDPORTAUDIO@ Audio.so #wsjt.spec
diff --git a/comms/wsjt/files/patch-configure b/comms/wsjt/files/patch-configure
new file mode 100644
index 000000000000..29e04c4bb3f0
--- /dev/null
+++ b/comms/wsjt/files/patch-configure
@@ -0,0 +1,142 @@
+--- configure.orig	Sat Oct 21 14:19:10 2006
++++ configure	Tue Feb 20 08:26:44 2007
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for wsjt 5.9.2.
++# Generated by GNU Autoconf 2.59 for wsjt 5.9.5.
+ #
+-# $Id: configure.ac 259 2006-08-10 22:22:33Z va3db $
++# $Id: configure.ac 270 2006-09-04 19:18:34Z k1jt $
+ #
+ # Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+@@ -253,7 +253,7 @@
+ #
+ # Initializations.
+ #
+-ac_default_prefix=/usr/local
++ac_default_prefix=%%PREFIX%%
+ ac_config_libobj_dir=.
+ cross_compiling=no
+ subdirs=
+@@ -269,11 +269,11 @@
+ # Identity of this package.
+ PACKAGE_NAME='wsjt'
+ PACKAGE_TARNAME='wsjt'
+-PACKAGE_VERSION='5.9.2'
+-PACKAGE_STRING='wsjt 5.9.2'
++PACKAGE_VERSION='5.9.5'
++PACKAGE_STRING='wsjt 5.9.5'
+ PACKAGE_BUGREPORT=''
+ 
+-ac_default_prefix=/usr/local/
++ac_default_prefix=%%PREFIX%%/
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -788,7 +788,7 @@
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures wsjt 5.9.2 to adapt to many kinds of systems.
++\`configure' configures wsjt 5.9.5 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -845,7 +845,7 @@
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+-     short | recursive ) echo "Configuration of wsjt 5.9.2:";;
++     short | recursive ) echo "Configuration of wsjt 5.9.5:";;
+    esac
+   cat <<\_ACEOF
+ 
+@@ -969,14 +969,14 @@
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-wsjt configure 5.9.2
++wsjt configure 5.9.5
+ generated by GNU Autoconf 2.59
+ 
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ 
+-$Id: configure.ac 259 2006-08-10 22:22:33Z va3db $
++$Id: configure.ac 270 2006-09-04 19:18:34Z k1jt $
+ _ACEOF
+   exit 0
+ fi
+@@ -985,7 +985,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by wsjt $as_me 5.9.2, which was
++It was created by wsjt $as_me 5.9.5, which was
+ generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   $ $0 $@
+@@ -2500,8 +2500,8 @@
+ 
+ CFLAGS="$OLD_CFLAGS"
+ 
+-CPPFLAGS="-Iportaudio-v19/include -I/usr/local/include -I/usr/include/alsa -I/usr/local/include/alsa ${CPPFLAGS}"
+-LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
++CPPFLAGS="-I%%LOCALBASE%%/include/portaudio2 -I%%LOCALBASE%%/include -I/usr/include/alsa -I%%LOCALBASE%%/include/alsa ${CPPFLAGS}"
++LDFLAGS="-L%%LOCALBASE%%/lib/portaudio2 -L%%LOCALBASE%%/lib ${LDFLAGS}"
+ LIBS=" -lpthread ${LIBS}"
+ 
+ echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5
+@@ -3657,8 +3657,8 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-# Extract the first word of "gfortran41", so it can be a program name with args.
+-set dummy gfortran41; ac_word=$2
++# Extract the first word of "gfortran42", so it can be a program name with args.
++set dummy gfortran42; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_GFORTRAN+set}" = set; then
+@@ -4615,7 +4615,7 @@
+ fi
+ 
+ 
+-if test -e "portaudio-v19/include/portaudio.h" ; then
++if test -e "%%LOCALBASE%%/include/portaudio2/portaudio.h" ; then
+ 	echo "Checking for portaudio...yes"
+ 	HAS_PORTAUDIO_H=1
+ else
+@@ -6882,9 +6882,9 @@
+ 
+ 	AUDIO="a2d.f90 jtaudio.c resample.c start_portaudio.c"
+ 
+-	NEEDPORTAUDIO="portaudio-v19/lib/.libs/libportaudio.a"
++	NEEDPORTAUDIO=""
+ 
+-	LIBS="${LIBS} ${RTLIBS} -lsamplerate ./portaudio-v19/lib/.libs/libportaudio.a"
++	LIBS="${LIBS} ${RTLIBS} -lsamplerate -lportaudio"
+ 	LIBS="${LIBS} ${ASOUNDLIBS}"
+ else
+ 	NEEDPORTAUDIO=""
+@@ -7364,7 +7364,7 @@
+ } >&5
+ cat >&5 <<_CSEOF
+ 
+-This file was extended by wsjt $as_me 5.9.2, which was
++This file was extended by wsjt $as_me 5.9.5, which was
+ generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+@@ -7419,7 +7419,7 @@
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+-wsjt config.status 5.9.2
++wsjt config.status 5.9.5
+ configured by $0, generated by GNU Autoconf 2.59,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
diff --git a/comms/wsjt/files/patch-cutil.c b/comms/wsjt/files/patch-cutil.c
new file mode 100644
index 000000000000..6950c121290f
--- /dev/null
+++ b/comms/wsjt/files/patch-cutil.c
@@ -0,0 +1,15 @@
+--- cutil.c.orig	Mon Dec 11 10:38:11 2006
++++ cutil.c	Mon Dec 11 10:38:36 2006
+@@ -67,7 +67,11 @@
+   printf("\n\n");
+   exit(*n);
+ }
+-
++struct tm *
++gmtime_r_(const time_t *clock, struct tm *result)
++{
++  gmtime_r(clock, result);
++}
+ time_t time_(void)
+ {
+      return time(0);
diff --git a/comms/wsjt/files/patch-get_fname.F90 b/comms/wsjt/files/patch-get_fname.F90
new file mode 100644
index 000000000000..6dc915a58671
--- /dev/null
+++ b/comms/wsjt/files/patch-get_fname.F90
@@ -0,0 +1,19 @@
+--- get_fname.F90.orig	Mon Dec 11 10:38:21 2006
++++ get_fname.F90	Mon Dec 11 10:38:42 2006
+@@ -5,6 +5,7 @@
+   use dfport

+ #endif

+ 

++  external gmtime_r

+   character hiscall*12,fname*24,tag*7

+   integer ntime

+   integer trperiod

+@@ -13,7 +14,7 @@
+   n1=ntime

+   n2=(n1+2)/trperiod

+   n3=n2*trperiod

+-  call gmtime(n3,it)

++  call gmtime_r(n3,it)

+   it(5)=it(5)+1

+   it(6)=mod(it(6),100)

+   write(fname,1000) (it(j),j=6,1,-1)

diff --git a/comms/wsjt/files/patch-jtaudio.c b/comms/wsjt/files/patch-jtaudio.c
new file mode 100644
index 000000000000..647c314f649e
--- /dev/null
+++ b/comms/wsjt/files/patch-jtaudio.c
@@ -0,0 +1,9 @@
+--- jtaudio.c.orig	Mon Feb 19 23:12:22 2007
++++ jtaudio.c	Mon Feb 19 23:13:03 2007
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <portaudio.h>
++#include <portaudio2/portaudio.h>
+ #include <string.h>
+ 
+ void fivehz_();
diff --git a/comms/wsjt/files/patch-padevsub.c b/comms/wsjt/files/patch-padevsub.c
new file mode 100644
index 000000000000..6b76e97da15d
--- /dev/null
+++ b/comms/wsjt/files/patch-padevsub.c
@@ -0,0 +1,10 @@
+--- padevsub.c.orig	Mon Feb 19 23:15:39 2007
++++ padevsub.c	Mon Feb 19 23:15:50 2007
+@@ -1,6 +1,6 @@
+ // #include <stdio.h>
+ // #include <math.h>
+-#include "portaudio.h"
++#include <portaudio2/portaudio.h>
+ 
+ int __stdcall PADEVSUB(int *numdev, int *ndefin, int *ndefout,
+ 		       int nchin[], int nchout[])
diff --git a/comms/wsjt/files/patch-specjt.py b/comms/wsjt/files/patch-specjt.py
new file mode 100644
index 000000000000..b352d3b486af
--- /dev/null
+++ b/comms/wsjt/files/patch-specjt.py
@@ -0,0 +1,11 @@
+--- specjt.py.orig	Fri Feb  2 16:45:39 2007
++++ specjt.py	Fri Feb  2 17:10:25 2007
+@@ -10,7 +10,7 @@
+ import string
+ import cPickle
+ #import Numeric
+-from Numeric import zeros, multiarray
++from numpy.oldnumeric import zeros, multiarray
+ import Image, ImageTk, ImageDraw
+ from palettes import colormapblue, colormapgray0, colormapHot, \
+      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
diff --git a/comms/wsjt/files/patch-wsjt.py b/comms/wsjt/files/patch-wsjt.py
new file mode 100644
index 000000000000..453accf15655
--- /dev/null
+++ b/comms/wsjt/files/patch-wsjt.py
@@ -0,0 +1,11 @@
+--- wsjt.py.orig	Fri Feb  2 16:45:49 2007
++++ wsjt.py	Fri Feb  2 17:10:03 2007
+@@ -8,7 +8,7 @@
+ import g,os,time
+ import Audio
+ from math import log10
+-from Numeric import zeros
++from numpy.oldnumeric import zeros
+ import dircache
+ import Image,ImageTk  #, ImageDraw
+ from palettes import colormapblue, colormapgray0, colormapHot, \
diff --git a/comms/wsjt/files/portaudio-v19-Makefile b/comms/wsjt/files/portaudio-v19-Makefile
deleted file mode 100644
index 688d575477a5..000000000000
--- a/comms/wsjt/files/portaudio-v19-Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# PortAudio V19 Makefile.in
-#
-# Dominic Mazzoni
-# Modifications by Mikael Magnusson
-#
-
-top_srcdir = .
-srcdir = .
-VPATH = 
-top_builddir = .
-PREFIX = /usr/local
-prefix = $(PREFIX)
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-libdir = ${exec_prefix}/lib
-includedir = ${prefix}/include
-CC = gcc
-CFLAGS = -g -O2 -DPA_LITTLE_ENDIAN -pthread -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DHAVE_CLOCK_GETTIME=1 -DHAVE_NANOSLEEP=1 -DPA_USE_OSS=1 
-LIBS =  -lm -lpthread
-AR = /usr/bin/ar
-RANLIB = ranlib
-LIBTOOL = libtool
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-SHARED_FLAGS = -shared -fPIC
-LDFLAGS = 
-DLL_LIBS =  -lm -lpthread
-CXXFLAGS = -g -O2
-NASM = 
-NASMOPT = 
-LN_S = ln -s
-LT_RELEASE=@LT_RELEASE@
-LT_CURRENT=2
-LT_REVISION=0
-LT_AGE=0
-
-OTHER_OBJS =  src/hostapi/oss/pa_unix_oss.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o
-
-PALIB = libportaudio.la
-PAINC = include/portaudio.h
-
-PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "Pa_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-#MAKEFILE = Makefile
-
-COMMON_OBJS = \
-	src/common/pa_allocation.o \
-	src/common/pa_converters.o \
-	src/common/pa_cpuload.o \
-	src/common/pa_dither.o \
-	src/common/pa_front.o \
-	src/common/pa_process.o \
-	src/common/pa_skeleton.o \
-	src/common/pa_stream.o \
-	src/common/pa_trace.o
-
-TESTS = \
-	bin/paqa_devs \
-	bin/paqa_errs \
-	bin/patest1 \
-	bin/patest_buffer \
-	bin/patest_callbackstop \
-	bin/patest_clip \
-	bin/patest_dither \
-	bin/patest_hang \
-	bin/patest_in_overflow \
-	bin/patest_latency \
-	bin/patest_leftright \
-	bin/patest_longsine \
-	bin/patest_many \
-	bin/patest_maxsines \
-	bin/patest_multi_sine \
-	bin/patest_out_underflow \
-	bin/patest_pink \
-	bin/patest_prime \
-	bin/patest_read_record \
-	bin/patest_read_write_wire \
-	bin/patest_record \
-	bin/patest_ringmix \
-	bin/patest_saw \
-	bin/patest_sine8 \
-	bin/patest_sine \
-	bin/patest_sine_formats \
-	bin/patest_sine_time \
-	bin/patest_start_stop \
-	bin/patest_stop \
-	bin/patest_toomanysines \
-	bin/patest_underflow \
-	bin/patest_wire \
-	bin/patest_write_sine \
-	bin/pa_devs \
-	bin/pa_fuzz \
-	bin/pa_minlat
-
-# Most of these don't compile yet.  Put them in TESTS, above, if
-# you want to try to compile them...
-ALL_TESTS = \
-	$(TESTS) \
-	bin/patest_sync \
-	bin/debug_convert \
-	bin/debug_dither_calc \
-	bin/debug_dual \
-	bin/debug_multi_in \
-	bin/debug_multi_out \
-	bin/debug_record \
-	bin/debug_record_reuse \
-	bin/debug_sine_amp \
-	bin/debug_sine \
-	bin/debug_sine_formats \
-	bin/debug_srate \
-	bin/debug_test1
-
-OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
-
-LTOBJS:= $(OBJS:.o=.lo)
-
-SUBDIRS =
-#SUBDIRS += bindings/cpp
-
-all: lib/$(PALIB) all-recursive tests
-
-tests: bin-stamp $(TESTS)
-
-
-lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC)
-	$(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
-
-$(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
-
-
-install: lib/$(PALIB) portaudio-2.0.pc
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
-	$(INSTALL) -d $(DESTDIR)$(includedir)
-	$(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC) $(DESTDIR)$(includedir)/portaudio.h
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
-	@echo ""
-	@echo "------------------------------------------------------------"
-	@echo "PortAudio was successfully installed."
-	@echo ""
-	@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
-	@echo "to make the shared object available.  You may also need to"
-	@echo "modify your LD_LIBRARY_PATH environment variable to include"
-	@echo "the directory $(libdir)"
-	@echo "------------------------------------------------------------"
-	@echo ""
-	$(MAKE) install-recursive
-
-uninstall:
-	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(PALIB)
-	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(includedir)/portaudio.h
-	$(MAKE) uninstall-recursive
-
-clean:
-	rm -f $(LTOBJS) $(ALL_TESTS) lib/$(PALIB)
-	rm -f bin-stamp lib-stamp
-	-rm -rf bin lib
-
-distclean: clean
-	rm -f config.log config.status Makefile portaudio-2.0.pc
-
-%.o: %.c $(MAKEFILE) $(PAINC)
-	$(CC) -c $(CFLAGS) $< -o $@
-
-%.lo: %.c $(MAKEFILE) $(PAINC)
-	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
-
-%.o: %.cpp $(MAKEFILE) $(PAINC)
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-%.o: %.asm
-	$(NASM) $(NASMOPT) -o $@ $<
-
-bin-stamp:
-	-mkdir bin
-	touch $@
-
-lib-stamp:
-	-mkdir lib
-	-mkdir -p src/os/win src/os/unix src/os/mac_osx src/common \
-src/hostapi/oss src/hostapi/alsa src/hostapi/jack src/hostapi/asihpi \
-src/hostapi/wmme src/hostapi/wdmks src/hostapi/dsound src/hostapi/wasapi
-	touch $@
-
-Makefile: Makefile.in config.status
-	$(SHELL) config.status
-
-all-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir all; done
-
-install-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir install; done
-
-uninstall-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir uninstall; done
diff --git a/comms/wsjt/files/portaudio-v19-config.status b/comms/wsjt/files/portaudio-v19-config.status
deleted file mode 100644
index 82422a043f9a..000000000000
--- a/comms/wsjt/files/portaudio-v19-config.status
+++ /dev/null
@@ -1,763 +0,0 @@
-#! /usr/local/bin/bash
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/usr/local/bin/bash}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" Makefile portaudio-2.0.pc"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-config.status
-configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"'--with-jack=no'\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/usr/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  echo "running /usr/local/bin/bash ./configure " '--with-jack=no' $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /usr/local/bin/bash ./configure '--with-jack=no' $ac_configure_extra_args --no-create --no-recursion
-fi
-
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "portaudio-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES portaudio-2.0.pc" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/usr/local/bin/bash,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/usr/local,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DHAVE_CLOCK_GETTIME=1 -DHAVE_NANOSLEEP=1 -DPA_USE_OSS=1 ,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@, -lm -lpthread,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-g -O2 -DPA_LITTLE_ENDIAN -pthread,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@build@,i386-unknown-freebsd6.2,;t t
-s,@build_cpu@,i386,;t t
-s,@build_vendor@,unknown,;t t
-s,@build_os@,freebsd6.2,;t t
-s,@host@,i386-unknown-freebsd6.2,;t t
-s,@host_cpu@,i386,;t t
-s,@host_vendor@,unknown,;t t
-s,@host_os@,freebsd6.2,;t t
-s,@EGREP@,grep -E,;t t
-s,@LN_S@,ln -s,;t t
-s,@ECHO@,echo,;t t
-s,@AR@,/usr/bin/ar,;t t
-s,@ac_ct_AR@,ar,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,ranlib,;t t
-s,@STRIP@,strip,;t t
-s,@ac_ct_STRIP@,strip,;t t
-s,@DLLTOOL@,dlltool,;t t
-s,@ac_ct_DLLTOOL@,,;t t
-s,@AS@,as,;t t
-s,@ac_ct_AS@,,;t t
-s,@OBJDUMP@,objdump,;t t
-s,@ac_ct_OBJDUMP@,,;t t
-s,@CPP@,gcc -E,;t t
-s,@CXX@,g++,;t t
-s,@CXXFLAGS@,-g -O2,;t t
-s,@ac_ct_CXX@,g++,;t t
-s,@CXXCPP@,g++ -E,;t t
-s,@F77@,f77,;t t
-s,@FFLAGS@,-g -O2,;t t
-s,@ac_ct_F77@,f77,;t t
-s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
-s,@INSTALL_PROGRAM@,${INSTALL},;t t
-s,@INSTALL_SCRIPT@,${INSTALL},;t t
-s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@PKG_CONFIG@,/usr/local/bin/pkg-config,;t t
-s,@ac_pt_PKG_CONFIG@,/usr/local/bin/pkg-config,;t t
-s,@JACK_CFLAGS@,-I/usr/local/include  ,;t t
-s,@JACK_LIBS@,-pthread -L/usr/local/lib -ljack  ,;t t
-s,@LT_CURRENT@,2,;t t
-s,@LT_REVISION@,0,;t t
-s,@LT_AGE@,0,;t t
-s,@OTHER_OBJS@, src/hostapi/oss/pa_unix_oss.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o,;t t
-s,@PADLL@,libportaudio.so,;t t
-s,@SHARED_FLAGS@,-shared -fPIC,;t t
-s,@THREAD_CFLAGS@,-pthread,;t t
-s,@DLL_LIBS@, -lm -lpthread,;t t
-s,@NASM@,,;t t
-s,@NASMOPT@,,;t t
-s,@subdirs@,,;t t
-s,@ENABLE_CXX_TRUE@,#,;t t
-s,@ENABLE_CXX_FALSE@,,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
-CEOF
-
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-
-{ (exit 0); exit 0; }