SpeakFreely is officially "abandonware" since January 14, 2004. Since

this package hasn't built in quite a while, remove it from pkgsrc.

13 files changed, 0 insertions, 755 deletions

diff --git a/net/speakfreely/DESCR b/net/speakfreely/DESCR
deleted file mode 100644
index d32fa0b46c2..00000000000
--- a/net/speakfreely/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Speak Freely allows users of a variety of Unix and Unix-like machines
-equipped with audio hardware connected by a network to converse, using
-the audio input and output facilities of the system to digitise and
-later reconstruct the sound and the network to relay sound packets.
-Optional compression is provided, allowing conversations over relatively
-low-bandwidth Internet links as well as local area networks.  The
-technology is based on the digital celular phone compression technology.
diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
deleted file mode 100644
index 239646820d8..00000000000
--- a/net/speakfreely/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2004/12/15 22:37:39 jlam Exp $
-#
-
-DISTNAME=		speak_freely-7.2
-PKGNAME=		speakfreely-7.2
-PKGREVISION=		3
-CATEGORIES=		net audio
-MASTER_SITES=		http://www.fourmilab.ch/speakfree/unix/
-
-MAINTAINER=		johnam@mail.kemper.org
-HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
-COMMENT=		Internet "phone" for UNIX
-
-USE_BUILDLINK3=		YES
-NO_CONFIGURE=		YES
-USE_PERL5=		YES
-
-BUILD_DEFS+=		SPEAKFREELY_OPTIONS USE_CRYPTO USE_IDEA
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_CRYPTO?=		YES
-USE_IDEA?=		NO
-
-# SPEAKFREELY_OPTIONS is a space-separated list of compile-time options
-# to support.  Currently supported options:
-#
-#	halfduplex	for if sound card doesn't support full-duplex sound
-#
-SPEAKFREELY_OPTIONS?=   halfduplex
-
-.if ${SPEAKFREELY_OPTIONS:Mhalfduplex} == "halfduplex"
-CCFLAGS+=		-DHALF_DUPLEX
-.endif
-
-.if defined(USE_CRYPTO) && ${USE_CRYPTO} == "YES"
-HAVE_LIBCRYPTO=		YES
-USE_OLD_DES_API=	YES
-.include "../../security/openssl/buildlink3.mk"
-
-.if defined(USE_IDEA) && ${USE_IDEA} == "YES"
-LICENSE=		no-commercial-use
-.endif
-.endif
-
-SOUNDDIR=	${PREFIX}/share/speakfreely
-MAKE_ENV+=	PERL="${PERL5}" CCFLAGS="${CCFLAGS}" \
-		SOUNDDIR="${SOUNDDIR}"
-MAKE_ENV+=	USE_CRYPTO="${USE_CRYPTO}" HAVE_LIBCRYPTO="${HAVE_LIBCRYPTO}" \
-		SSLBASE="${SSLBASE}" USE_IDEA="${USE_IDEA}"
-MAKE_ENV+=	HAVE_GSM=YES HAVE_MD5=YES
-MAKE_ENV+=	DOMAIN=
-
-post-extract:
-	${MV} ${WRKSRC}/sfspeaker.1 ${WRKSRC}/sfspeaker.1.in
-
-pre-build:
-	${SED} -e "s,@SOUNDDIR@,${SOUNDDIR},g" \
-		< ${WRKSRC}/sfspeaker.1.in > ${WRKSRC}/sfspeaker.1
-
-post-install:
-	${INSTALL_DATA_DIR} ${SOUNDDIR}
-	${INSTALL_DATA} ${WRKSRC}/busy.au ${SOUNDDIR}
-	${INSTALL_DATA} ${WRKSRC}/ring.au ${SOUNDDIR}
-
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/speakfreely/PLIST b/net/speakfreely/PLIST
deleted file mode 100644
index 932eb0bfede..00000000000
--- a/net/speakfreely/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:06 zuntum Exp $
-bin/sfecho
-bin/sflaunch
-bin/sflwl
-bin/sflwld
-bin/sfmike
-bin/sfreflect
-bin/sfspeaker
-bin/sfvod
-man/man1/sfecho.1
-man/man1/sflaunch.1
-man/man1/sflwl.1
-man/man1/sflwld.1
-man/man1/sfmike.1
-man/man1/sfreflect.1
-man/man1/sfspeaker.1
-man/man1/sfvod.1
-share/speakfreely/busy.au
-share/speakfreely/ring.au
-@dirrm share/speakfreely
diff --git a/net/speakfreely/distinfo b/net/speakfreely/distinfo
deleted file mode 100644
index d3b88a52441..00000000000
--- a/net/speakfreely/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/10/25 10:30:36 wiz Exp $
-
-SHA1 (speak_freely-7.2.tar.gz) = d35106947b35966b02b59517bf608f37703bef2b
-Size (speak_freely-7.2.tar.gz) = 591240 bytes
-SHA1 (patch-aa) = 24d6ca54603f069fdafda1155db1cdf3e4b6d339
-SHA1 (patch-ab) = cb641f0fb6be0959e8528bee3514421f97de30ef
-SHA1 (patch-ac) = c4f98cc9633ae9ee433d29c603640f7912a85ec9
-SHA1 (patch-ad) = 51a728f06a947280aba1a97da22b12ad522ffc51
-SHA1 (patch-ae) = df8e7fc1378f101bb71c5d14aff0eefa4c90c641
-SHA1 (patch-af) = 46797c537b007b0997dc4149242d06bcc6fbde24
-SHA1 (patch-ag) = 8c52784f474739cd55e1490b734625283e3367f7
-SHA1 (patch-ah) = ea18245b2311906cf100f45e2588af40afc90efd
-SHA1 (patch-ai) = 961576afb09f30d9bf0f772c42fb7f2e2fe9febd
diff --git a/net/speakfreely/patches/patch-aa b/net/speakfreely/patches/patch-aa
deleted file mode 100644
index 139124b52c8..00000000000
--- a/net/speakfreely/patches/patch-aa
+++ /dev/null
@@ -1,198 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/10/25 10:30:37 wiz Exp $
-
---- Makefile.orig	Sat Sep 18 11:29:44 1999
-+++ Makefile	Sat Jan 15 12:34:29 2000
-@@ -3,16 +3,19 @@
- 
- # Debugging options
- 
--DEBUG = -g -DHEXDUMP
-+#DEBUG = -g -DHEXDUMP
- #DEBUG = -g -DHEXDUMP -DNOCRYPTO
--#DEBUG = -O
-+DEBUG = -O
-   
- # Installation 
- 
- # Install program
--INSTALL = /usr/bin/install
-+#INSTALL = /usr/bin/install
-+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
-+INSTALL_MAN = ${BSD_INSTALL_MAN}
- # Installation root directory
--INSTDIR = /usr/local
-+INSTDIR = ${PREFIX}
- # Binaries
- INSTDIR_BIN = $(INSTDIR)/bin
- # Manual pages
-@@ -38,9 +41,9 @@
- #    functionality is working.	Please see the detailed description
- #    of the available flags which follows these declarations.
- #
--CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
--CC = gcc -O3 # for GNU's gcc compiler
--LFLAGS = -lncurses -lm
-+#CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
-+#CC = gcc -O3 # for GNU's gcc compiler
-+#LFLAGS = -lncurses -lm
- #
- # If the above LFLAGS doesn't work, try the one below.
- #LFLAGS = -lcurses -lm
-@@ -223,6 +226,18 @@
- #CCFLAGS = -DM_LITTLE_ENDIAN
- #LFLAGS = -lcurses -ltermcap -lcompat -lm
- 
-+#			      NetBSD 1.4
-+#		      (courtesy of John A. Maier)
-+
-+# -lossaudio is needed to provide OSS audio emulation.  -DHALF_DUPLEX may
-+# also be needed in CCFLAGS depending on the driver for the sound card
-+# (see below).  -lcompat is needed to link correctly since the source uses
-+# the obsoleted function cuserid().
-+
-+CCFLAGS +=	-DUSE_CURSES
-+CCFLAGS +=	-DSOUNDDIR=\"${SOUNDDIR}\"
-+LFLAGS +=	-lcurses -ltermcap -lm -lcompat -lossaudio
-+
- #			   Hewlett-Packard
- #		      (courtesy of Marc Kilian)
- #
-@@ -233,7 +248,7 @@
- 
- # Where Perl is located on your system.  This is used to make
- # a directly-executable version of sfvod.
--PERL = /usr/bin/perl
-+#PERL = /usr/bin/perl
- 
- # If your audio hardware is half duplex, uncomment the next line.
- # You can also, if you wish, define this on the CCFLAGS definition
-@@ -267,23 +282,67 @@
- 
- CARGS = -DInternet_Port=$(INTERNET_PORT)
- 
-+# Crypto
-+.if defined(USE_CRYPTO) && $(USE_CRYPTO) == "YES"
-+.if defined(HAVE_LIBCRYPTO) && $(HAVE_LIBCRYPTO) == "YES"
-+CRYPTOFLAGS =	-I$(SSLBASE)/include
-+CRYPTOLIBS =	des/des.a -Wl,-R$(SSLBASE)/lib -L$(SSLBASE)/lib -lcrypto
-+CRYPTOOBJS =	deslib.o
-+.else
-+CRYPTOFLAGS =	-Ilibdes -Iblowfish
-+CRYPTOLIBS =	blowfish/libblowfish.a des/des.a libdes/libdes.a
-+CRYPTOOBJS =	libblowfish.o deslib.o libdes.o
-+.if defined(USE_IDEA) && $(USE_IDEA) == "YES"
-+CRYPTOFLAGS +=	-DUSE_IDEA -Iidea
-+CRYPTOLIBS +=	idea/idea.a
-+CRYPTOOBJS +=	idealib.o
-+.endif
-+.endif
-+.else
-+CCFLAGS +=	-DNOCRYPTO
-+CRYPTOFLAGS =
-+CRYPTOLIBS =
-+CRYPTOOBJS =
-+.endif
-+
-+.if defined(HAVE_GSM) && ${HAVE_GSM} == "YES"
-+GSMFLAGS =	-I${BUILDLINK_PREFIX.gsm}/include
-+GSMLIBS =	-Wl,-R${BUILDLINK_PREFIX.gsm}/lib -L${BUILDLINK_PREFIX.gsm}/lib -lgsm
-+GSMOBJS =
-+.else
-+GSMFLAGS =	-Igsm/inc
-+GSMLIBS =	gsm/lib/libgsm.a
-+GSMOBJS =	gsmlib.o
-+.endif
-+
-+.if defined(HAVE_MD5) && $(HAVE_MD5) == "YES"
-+MD5FLAGS =	-I/usr/include
-+MD5LIBS =
-+MD5OBJS =
-+.else
-+MD5FLAGS =	-Imd5
-+MD5LIBS =	md5/md5.o
-+MD5OBJS =	md5lib.o
-+.endif
-+
- #   Compiler flags
- 
--CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
-+CFLAGS = $(DEBUG) -Iadpcm -Ilpc $(GSMFLAGS) $(MD5FLAGS) $(CRYPTOFLAGS) $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
- 
--PROGRAMS = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect sfvod
-+PROGRAMS = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
-+SCRIPTS =  sfvod
- 
--all:	$(PROGRAMS)
-+all:	$(PROGRAMS) $(SCRIPTS)
- 
- SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o common.o
- 
--sfspeaker: $(SPKROBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o 
--	$(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) -o sfspeaker
-+sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o $(GSMOBJS) $(MD5OBJS) xdsub.o $(CRYPTOOBJS)
-+	$(CC) $(SPKROBJS) adpcm/adpcm-u.o $(MD5LIBS) lpc10/liblpc10.a $(GSMLIBS) lpc/lpc.o xdsub.o $(CRYPTOLIBS) $(LFLAGS) -o sfspeaker
- 
- MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o xdsub.o audio_hp.o audio_sgi.o
- 
--sfmike: $(MIKEOBJS) adpcmlib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
--	$(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
-+sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o $(GSMOBJS) $(MD5OBJS) $(CRYPTOOBJS)
-+	$(CC) $(MIKEOBJS) adpcm/adpcm-u.o $(MD5LIBS) -lm lpc10/liblpc10.a $(GSMLIBS) lpc/lpc.o $(CRYPTOLIBS) $(LFLAGS) -o sfmike
- 
- LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
- 
-@@ -302,13 +361,13 @@
- 
- ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
- 
--sfecho: $(ECHOOBJS) md5lib.o
--	$(CC) $(ECHOOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho
-+sfecho: $(ECHOOBJS) $(MD5OBJS)
-+	$(CC) $(ECHOOBJS) $(MD5LIBS) adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho
- 
- REFLECTOBJS = reflect.o codecs.o html.o g711.o rtpacket.o ulaw.o xdsub.o
- 
--sfreflect: $(REFLECTOBJS) md5lib.o
--	$(CC) $(REFLECTOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect
-+sfreflect: $(REFLECTOBJS) $(MD5OBJS)
-+	$(CC) $(REFLECTOBJS) $(MD5LIBS) adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect
- 
- #	Configure the voice on demand server for the platform's
- #	location of Perl and network constant definitions.
-@@ -402,8 +461,8 @@
- 
- speakfree.h:	audio_descr.h rtp.h rtpacket.h ulaw2linear.h types.h
- 
--testgsm:    testgsm.o gsmlib.o
--	$(CC) testgsm.o -lm gsm/lib/libgsm.a $(LFLAGS) -o testgsm
-+testgsm:    testgsm.o $(GSMOBJS)
-+	$(CC) testgsm.o -lm $(GSMLIBS) $(LFLAGS) -o testgsm
- 
- manpage:
- 	nroff -man sfmike.1 | $(PAGER)
-@@ -442,7 +501,7 @@
- #	Clean everything
- 
- clean:
--	rm -f core *.out *.o *.bak $(PROGRAMS) *.shar sfvod-t*
-+	rm -f core *.out *.o *.bak $(PROGRAMS) $(SCRIPTS) *.shar sfvod-t*
- 	( cd adpcm; make clean )
- 	( cd blowfish; make clean )
- 	( cd libdes; make clean )
-@@ -456,11 +515,12 @@
- #	Clean only the main directory, not the libraries
- 
- dusty:
--	rm -f core *.out *.o *.bak $(PROGRAMS) *.shar sfvod-t*
-+	rm -f core *.out *.o *.bak $(PROGRAMS) $(SCRIPTS) *.shar sfvod-t*
- 
- #	Install binaries and manual pages.  You'll need to
- #	be root to install in system directories.
- 
- install: $(PROGRAMS)
--	$(INSTALL) -o root -g root -m 755 -s $(PROGRAMS) $(INSTDIR_BIN)
--	$(INSTALL) -o root -g root -m 644 *.1 $(INSTDIR_MAN)/man1
-+	$(INSTALL_PROGRAM) $(PROGRAMS) $(INSTDIR_BIN)
-+	$(INSTALL_SCRIPT) $(SCRIPTS) $(INSTDIR_BIN)
-+	$(INSTALL_MAN) *.1 $(INSTDIR_MAN)/man1
diff --git a/net/speakfreely/patches/patch-ab b/net/speakfreely/patches/patch-ab
deleted file mode 100644
index 9f88f0eefb3..00000000000
--- a/net/speakfreely/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/01/17 16:02:34 jlam Exp $
-
---- des/des.c.orig	Fri Feb 23 06:10:37 1996
-+++ des/des.c	Sat Jan 15 11:59:59 2000
-@@ -4,6 +4,18 @@
-  */
- #define NULL	0
- 
-+/*
-+ * NetBSD is cross-platform, so determine endianness from machine-specific
-+ * header files.
-+ */
-+#if defined(__NetBSD__)
-+#include <sys/types.h>		/* needed for NetBSD <= 1.4.x */
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define M_LITTLE_ENDIAN
-+#endif
-+#endif /* __NetBSD__ */
-+
- #ifdef	M_LITTLE_ENDIAN
- static unsigned long byteswap();
- #endif
diff --git a/net/speakfreely/patches/patch-ac b/net/speakfreely/patches/patch-ac
deleted file mode 100644
index 57673f7c5f0..00000000000
--- a/net/speakfreely/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/01/17 16:02:34 jlam Exp $
-
---- echo.c.orig	Wed Sep  1 14:27:43 1999
-+++ echo.c	Sat Jan 15 12:46:42 2000
-@@ -47,7 +47,9 @@
- struct connection {
-     struct connection *con_next;      /* Next connection */
-     struct in_addr con_addr;	      /* Host Internet address */
-+#ifdef USE_IDEA
-     char pgpkey[17];		      /* PGP key for connection */
-+#endif
-     char keymd5[16];		      /* Digest of key file */
-     double con_timeout; 	      /* Connection timeout time */
-     char con_hostname[264];	      /* Host name */
-@@ -705,7 +707,9 @@
- 
- 		newconn = TRUE;
- 		c->con_next = conn;
-+#ifdef USE_IDEA
- 		c->pgpkey[0] = FALSE;
-+#endif
- 		bzero(c->keymd5, 16);
- 		conn = c;
- 		bcopy(&from.sin_addr, &(c->con_addr),
diff --git a/net/speakfreely/patches/patch-ad b/net/speakfreely/patches/patch-ad
deleted file mode 100644
index 97287b7cf5e..00000000000
--- a/net/speakfreely/patches/patch-ad
+++ /dev/null
@@ -1,168 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/07/29 03:12:20 jlam Exp $
-
---- mike.c.orig	Tue Jun 13 14:13:04 2000
-+++ mike.c	Fri Jul 28 22:57:32 2000
-@@ -23,8 +23,10 @@
-     char deskey[9];		      /* Destination DES key, if any */
-     char rtpdeskey[9];		      /* Destination RTP DES key, if any */
-     char vatdeskey[9];		      /* Destination VAT DES key, if any */
-+#ifdef USE_IDEA
-     char ideakey[17];		      /* Destination IDEA key, if any */
-     char pgpkey[17];		      /* Destination PGP key, if any */
-+#endif
-     char blowfish_spec; 	      /* Nonzero if Blowfish key specified */
- #ifdef CRYPTO
-     BF_KEY blowfishkey; 	      /* Destination Blowfish key, if any */
-@@ -84,8 +86,10 @@
- static char curkey[9] = "";           /* Current DES key if curkey[0] != 0 */
- static char currtpkey[9] = "";        /* Current RTP DES key if currtpkey[0] != 0 */
- static char curvatkey[9] = "";        /* Current VAT DES key if currtpkey[0] != 0 */
-+#ifdef USE_IDEA
- static char curideakey[17] = "";      /* Current IDEA key if curideakey[0] != 0 */
- static char curpgpkey[17] = "";       /* Current PGP key if curpgpkey[0] != 0 */
-+#endif
- static char curblowfish_spec = FALSE; /* Nonzero if Blowfish key specified */
- #ifdef CRYPTO
- static BF_KEY curblowfishkey;	      /* Blowfish key */
-@@ -429,8 +433,10 @@
-     bcopy(curkey, d->deskey, 9);
-     bcopy(currtpkey, d->rtpdeskey, 9);
-     bcopy(curvatkey, d->vatdeskey, 9);
-+#ifdef USE_IDEA
-     bcopy(curideakey, d->ideakey, 17);
-     bcopy(curpgpkey, d->pgpkey, 17);
-+#endif
-     d->blowfish_spec = curblowfish_spec;
- #ifdef CRYPTO
-     bcopy(&curblowfishkey, &(d->blowfishkey), sizeof(BF_KEY));
-@@ -599,8 +605,12 @@
- #endif
- 
- #ifdef CRYPTO
-+#ifdef USE_IDEA
- 	if (d->deskey[0] || d->ideakey[0] || d->blowfish_spec ||
- 	    d->pgpkey[0] || d->otp != NULL) {
-+#else
-+	if (d->deskey[0] || d->blowfish_spec || d->otp != NULL) {
-+#endif
- 	    soundbuf ebuf;
- 	    int i;
- 	    LONG slen, plen = 0;
-@@ -677,6 +687,7 @@
- 		}
- 	    }
- 
-+#ifdef USE_IDEA
- 	    /* IDEA encryption. */
- 
- 	    if (d->ideakey[0]) {
-@@ -699,6 +710,7 @@
- 		close_idea();
- 		ebuf.compression |= fEncIDEA;
- 	    }
-+#endif
- 
- 	    /* Blowfish encryption. */
- 
-@@ -723,6 +735,7 @@
- 		ebuf.compression |= fEncBF;
- 	    }
- 
-+#ifdef USE_IDEA
- 	    /* PGP encryption. */
- 
- 	    if (d->pgpkey[0]) {
-@@ -745,6 +758,7 @@
- 		close_idea();
- 		ebuf.compression |= fEncPGP;
- 	    }
-+#endif
- 
- 	    /* Key file encryption. */
- 
-@@ -1593,7 +1607,7 @@
-     MD5Init(&md5c);
-     MD5Update(&md5c, s, strlen(s));
-     MD5Final(md5key1, &md5c);
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-     init_idearand(md5key, md5key1, time(NULL));
- #define nextrand    idearand()
- #else
-@@ -1617,7 +1631,7 @@
- 	    key[j] = nextrand;
- 	}
-     }
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-     close_idearand();
- #endif
- #undef nextrand
-@@ -1657,7 +1671,9 @@
-     V fprintf(stderr, "           -F         ADPCM compression\n");
-     V fprintf(stderr, "           -G         Automatic gain control\n");
- #ifdef CRYPTO
-+#ifdef USE_IDEA
-     V fprintf(stderr, "           -Ikey      IDEA encrypt with key\n");
-+#endif
-     V fprintf(stderr, "           -Kkey      DES encrypt with key\n");
- #endif
-     V fprintf(stderr, "           -L         Remote loopback\n");
-@@ -1684,7 +1700,7 @@
- #ifdef AUDIO_DEVICE_FILE
-     V fprintf(stderr, "           -Yindev[:ctldev] Override default audio device file name or specify open #fd\n");
- #endif
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-     V fprintf(stderr, "           -Z\"user..\" Send PGP session key for user(s)\n");
- #endif
-     V fprintf(stderr, "\n");
-@@ -1877,6 +1893,7 @@
- 		    break;
- 
- #ifdef CRYPTO
-+#ifdef USE_IDEA
-                 case 'I':             /* -Ikey  --  Set IDEA key */
- 		    if (strlen(op + 1) == 0) {
- 			curideakey[0] = FALSE;
-@@ -1894,6 +1911,7 @@
- 			}
- 		    }
- 		    break;
-+#endif
- 
-                 case 'K':             /* -Kkey  --  Set DES key */
- 		    desinit(1);       /* Initialise the DES library */
-@@ -2107,6 +2125,7 @@
- #endif
- 
- #ifdef CRYPTO
-+#ifdef USE_IDEA
-                 case 'Z':             /* -Z"user1 user2..."  --  Send PGP
- 						 encrypted session key to
- 						 named users */
-@@ -2196,6 +2215,7 @@
- 		    }
- 		    break;
- #endif
-+#endif
- 	    }
- 	} else {
- 
-@@ -2207,10 +2227,15 @@
- 	    }
- 
- 	    if (rtp || vat) {
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
- 		if (curideakey[0] || curpgpkey[0] ||
- 		    curblowfish_spec || curotp != NULL) {
-                     fprintf(stderr, "Blowfish, IDEA, PGP, and Key File encryption cannot be used\n    with -RTP or -VAT protocols.\n");
-+		    return 2;
-+		}
-+#else
-+		if (curblowfish_spec || curotp != NULL) {
-+                    fprintf(stderr, "Blowfish and Key File encryption cannot be used\n    with -RTP or -VAT protocols.\n");
- 		    return 2;
- 		}
- #endif
diff --git a/net/speakfreely/patches/patch-ae b/net/speakfreely/patches/patch-ae
deleted file mode 100644
index c8317e19f42..00000000000
--- a/net/speakfreely/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/01/17 16:02:34 jlam Exp $
-
---- sfspeaker.1.in.orig	Sat Sep 18 15:23:01 1999
-+++ sfspeaker.1.in	Mon Jan 17 01:26:08 2000
-@@ -140,7 +140,7 @@
- .I busy_command
- is supplied, a default of:
- .ce 1
---b"sleep 10; sfmike %s busy.au"
-+-b"sleep 10; sfmike %s @SOUNDDIR@/busy.au"
- is used.  The ten second delay is intended to allow users
- with half duplex audio hardware to receive the busy signal
- transmission after sending an initial greeting and switching
-@@ -177,6 +177,8 @@
- is used to decrypt sound received
- using the International Data Encryption
- Algorithm (IDEA).
-+This option is not available unless speakfreely was compiled
-+to support IDEA.
- .TP
- .BI \-j delay , idle
- Jitter compensation is enabled.  This delays playing sound
-@@ -354,6 +356,8 @@
- .B pgp
- via a command line argument when it is invoked to decode the session
- key.
-+This option is not available unless speakfreely was compiled
-+to support IDEA.
- .SH "LOOK WHO'S LISTENING"
- Speak Freely's Look Who's Listening mechanism allows you to publish
- information in an electronic telephone directory at a cooperating
diff --git a/net/speakfreely/patches/patch-af b/net/speakfreely/patches/patch-af
deleted file mode 100644
index b7d7e38bdd6..00000000000
--- a/net/speakfreely/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/01/17 16:02:34 jlam Exp $
-
---- soundbyte.c.orig	Tue Sep 14 08:55:17 1999
-+++ soundbyte.c	Sat Jan 15 11:59:59 2000
-@@ -27,9 +27,11 @@
- #else
- #include <sun/audioio.h>
- #endif
--#else /* FreeBSD / Linux */
-+#else /* NetBSD / FreeBSD / Linux */
- #ifdef LINUX
- #include <linux/soundcard.h>
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
- #else
- #include <machine/soundcard.h>
- #endif
diff --git a/net/speakfreely/patches/patch-ag b/net/speakfreely/patches/patch-ag
deleted file mode 100644
index c5a07d8879d..00000000000
--- a/net/speakfreely/patches/patch-ag
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/01/17 16:02:34 jlam Exp $
-
---- speaker.c.orig	Tue Sep 14 05:53:42 1999
-+++ speaker.c	Sat Jan 15 12:46:06 2000
-@@ -10,6 +10,10 @@
- #include "speakfree.h"
- #include "version.h"
- 
-+#ifndef SOUNDDIR
-+#define SOUNDDIR
-+#endif
-+
- static int audiok = FALSE;	      /* Audio initialised flag */
- static int audiotime = 0;	      /* Audio timeout counter */
- static int debugging = FALSE;	      /* Debugging enabled */
-@@ -22,7 +26,9 @@
- static char deskey[9] = "";           /* DES key, if any */
- static char rtpdeskey[9] = "";        /* RTP DES key, if any */
- static char vatdeskey[9] = "";        /* VAT DES key, if any */
-+#ifdef USE_IDEA
- static char ideakey[17] = "";         /* IDEA key, if any */
-+#endif
- static char blowfish_spec = FALSE;    /* Nonzero if Blowfish key specified */
- #ifdef CRYPTO
- static BF_KEY blowfishkey;	      /* Blowfish key */
-@@ -53,7 +59,7 @@
- static char *replyfile = NULL;	      /* Reply file pathname */
- static char *replycmdexe = NULL;
- static char *replycmd = "sfmike -t";  /* Default reply command */
--static char *busysignal = "sleep 10; sfmike %s busy.au"; /* Default busy signal command */
-+static char *busysignal = "sleep 10; sfmike %s " SOUNDDIR "busy.au"; /* Default busy signal command */
- static int busytimeout = 60 * 1000000L; /* Busy signal timeout interval */
- static int dobusy = FALSE;	      /* Reject calls when busy ? */
- #ifdef HALF_DUPLEX
-@@ -261,17 +267,17 @@
-     MD5Init(&md5c);
-     MD5Update(&md5c, s, strlen(s));
-     MD5Final(md5key1, &md5c);
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-     init_idearand(md5key, md5key1, time(NULL));
- #endif
-     for (j = 0; j < 16; j++) {
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
- 	key[j] = idearand();
- #else
- 	key[j] = md5key[j] ^ md5key1[j];
- #endif
-     }
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-     close_idearand();
- #endif
- }
-@@ -533,6 +539,7 @@
- 	       an idle message, though, and tweak the timeout so we do this
- 	       only once. */
- 
-+#ifdef USE_IDEA
- 	    if (c->pgpkey[0] == 0) {
- 		if (l == NULL) {
- 		    conn = n;
-@@ -541,6 +548,7 @@
- 		}
- 		free(c);
- 	    }
-+#endif
- 	} else {
- 	    int makereq = FALSE;
- 
-@@ -796,6 +804,7 @@
- 	}
-     }
- 
-+#ifdef USE_IDEA
-     if ((msg->compression & fEncPGP) && c->pgpkey[0]) {
- 	unsigned short iv[4];
- 	LONG slen = (len + 7) & (~7);
-@@ -809,6 +818,7 @@
- 	ideacfb(val, slen);
- 	close_idea();
-     }
-+#endif
- 
-     if ((msg->compression & fEncBF) && blowfish_spec) {
- 	unsigned char iv[8];
-@@ -822,6 +832,7 @@
- 		       slen, &blowfishkey, iv, BF_DECRYPT);
-     }
- 
-+#ifdef USE_IDEA
-     if ((msg->compression & fEncIDEA) && ideakey[0]) {
- 	unsigned short iv[4];
- 	LONG slen = (len + 7) & (~7);
-@@ -835,6 +846,7 @@
- 	ideacfb(val, slen);
- 	close_idea();
-     }
-+#endif
- 
-     if ((msg->compression & fEncDES) && deskey[0]) {
- 	int i;
-@@ -1211,7 +1223,7 @@
- 			}
- 			break;
- 
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
-                     case 'I':             /* -Ikey  --  Set IDEA key */
- 			if (strlen(op + 1) == 0) {
- 			    ideakey[0] = FALSE;
-@@ -1660,7 +1672,9 @@
- 
- 		newconn = TRUE;
- 		c->con_next = conn;
-+#ifdef USE_IDEA
- 		c->pgpkey[0] = FALSE;
-+#endif
- 		bzero(c->keymd5, 16);
- 		c->con_uname[0] = c->con_email[0] = 0;
- #ifndef CRYPTO
-@@ -2496,7 +2510,7 @@
- 	}
- 
- 
--#ifdef CRYPTO
-+#if defined(CRYPTO) && defined(USE_IDEA)
- 	if ((sb.compression & fKeyPGP)) {
- 	    char cmd[256], f[40], kmd[16];
- 	    FILE *kfile;
diff --git a/net/speakfreely/patches/patch-ah b/net/speakfreely/patches/patch-ah
deleted file mode 100644
index 1bb1a5a2ca4..00000000000
--- a/net/speakfreely/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/10/25 10:30:37 wiz Exp $
-
---- speakfree.h.orig	Tue Sep 14 14:17:32 1999
-+++ speakfree.h
-@@ -20,6 +20,18 @@
- #define _BSD_SIGNALS
- #endif
- 
-+/*
-+ * NetBSD is cross-platform, so determine endianness from machine-specific
-+ * header files.
-+ */
-+#if defined(__NetBSD__)
-+#include <sys/types.h>		/* needed for NetBSD <= 1.4.x */
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define M_LITTLE_ENDIAN
-+#endif
-+#endif /* __NetBSD__ */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -61,8 +73,8 @@
- #endif
- 
- #ifdef CRYPTO
--#include "blowfish.h"
--#include "des.h"
-+#include "openssl/blowfish.h"
-+#include "openssl/des.h"
- #endif
- 
- #include "ulaw2linear.h"
diff --git a/net/speakfreely/patches/patch-ai b/net/speakfreely/patches/patch-ai
deleted file mode 100644
index d45d3cb81d9..00000000000
--- a/net/speakfreely/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/01/17 16:02:34 jlam Exp $
-
---- sfmike.1.orig	Mon Sep 13 10:12:50 1999
-+++ sfmike.1	Mon Jan 17 01:28:20 2000
-@@ -391,6 +391,8 @@
- to exchange keys with other parties, the
- fundamental security of your voice link rests upon the IDEA
- algorithm.
-+This options is not available unless speakfreely was compiled
-+to support IDEA.
- .TP
- .BI \-k key
- The specified
-@@ -820,6 +822,8 @@
- .BR pgp ,
- as long as you're entitled to use that program, you can enjoy the
- convenience of public key exchange of session keys for audio as well.
-+This options is not available unless speakfreely was compiled
-+to support IDEA.
- .SH FILES
- On most Unix machines audio is read from the
- .B /dev/audio