Share common pieces with net/speakfreely.

12 files changed, 5 insertions, 378 deletions

diff --git a/net/speakfreely-crypto/Makefile b/net/speakfreely-crypto/Makefile
index 05c3fff35bf..f9d9b8654a5 100644
--- a/net/speakfreely-crypto/Makefile
+++ b/net/speakfreely-crypto/Makefile
@@ -1,18 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
+# $NetBSD: Makefile,v 1.2 1999/10/26 16:48:48 jlam Exp $
 #
 
-DISTNAME=		speak_freely-7.1
 PKGNAME=		speakfreely-crypto-7.1
-CATEGORIES=		net audio
-MASTER_SITES=		http://www.fourmilab.ch/speakfree/unix/
-
-MAINTAINER=		johnam@mail.kemper.org
-HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
-
 CONFLICTS=		speakfreely-*
 
-DEPENDS+=		gsm-1.0.10:../../audio/gsm
-
 .if exists (/usr/include/openssl/blowfish.h)
 HAVE_LIBCRYPTO=		yes
 OPENSSLDIR=		/usr
@@ -23,48 +14,15 @@ HAVE_LIBCRYPTO=		no
 #DEPENDS+=		openssl-*:../../security/openssl
 .endif
 
-USE_PERL=		yes
-PERL_PATH=		${LOCALBASE}/bin/perl
-
 LICENSE=                no-commercial-use	# uses IDEA algorithm
-MIRROR_DISTFILE=	no			# source includes crypto code
 RESTRICTED=             "Crypto; export-controlled"
 
-NO_CONFIGURE=		yes
-
-BUILD_DEFS+=		SPEAKFREELY_OPTIONS
-
-.include "../../mk/bsd.prefs.mk"
-
-# 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
-
-SOUNDDIR=		${PREFIX}/share/speakfreely
-MAKE_ENV+=		PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \
-			SOUNDDIR="${SOUNDDIR}" HAVE_GSM=yes
 MAKE_ENV+=		CRYPTO=yes \
 			HAVE_LIBCRYPTO="${HAVE_LIBCRYPTO}" \
 			OPENSSLDIR="${OPENSSLDIR}" \
-MAKE_ENV+=		HAVE_MD5=yes
-
-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}
+FILESDIR=		${.CURDIR}/../../net/speakfreely/files
+PATCHDIR=		${.CURDIR}/../../net/speakfreely/patches
+PKGDIR=			${.CURDIR}/../../net/speakfreely/pkg
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../net/speakfreely/Makefile.common"
diff --git a/net/speakfreely-crypto/files/md5 b/net/speakfreely-crypto/files/md5
deleted file mode 100644
index 82483aecc21..00000000000
--- a/net/speakfreely-crypto/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
-MD5 (speak_freely-7.1.tar.gz) = f06e4115c7139f7e30ea57064b324558
diff --git a/net/speakfreely-crypto/files/patch-sum b/net/speakfreely-crypto/files/patch-sum
deleted file mode 100644
index 3bad1881a0e..00000000000
--- a/net/speakfreely-crypto/files/patch-sum
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
-MD5 (patch-aa) = fc4777d135292d7b09e155cbfa98cc92
-MD5 (patch-ab) = 6b8fc09e65ac6d44bc991b94947ab1d3
-MD5 (patch-ac) = bb790c00b8bf36eea73b541fb6a93720
-MD5 (patch-ad) = d6d9767e619a549494eebef394298197
-MD5 (patch-ae) = cdc1d3142b7f57ff2b5498f46f6aa51c
-MD5 (patch-af) = 876923f7c6027ddd23f65dac873fb2c5
diff --git a/net/speakfreely-crypto/patches/patch-aa b/net/speakfreely-crypto/patches/patch-aa
deleted file mode 100644
index 3776ba187e1..00000000000
--- a/net/speakfreely-crypto/patches/patch-aa
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- Makefile.orig	Sat Sep 18 11:29:44 1999
-+++ Makefile	Mon Oct 11 01:40:13 1999
-@@ -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,63 @@
- 
- CARGS = -DInternet_Port=$(INTERNET_PORT)
- 
-+# Crypto
-+.if defined(CRYPTO) && $(CRYPTO) == "yes"
-+.if defined(HAVE_LIBCRYPTO) && $(HAVE_LIBCRYPTO) == "yes"
-+CRYPTOFLAGS =	-Iidea -I$(OPENSSLDIR)/include/openssl
-+CRYPTOLIBS =	idea/idea.a des/des.a \
-+		-Wl,-R$(OPENSSLDIR)/lib -L$(OPENSSLDIR)/lib -lcrypto
-+CRYPTOOBJS =	idealib.o deslib.o
-+.else
-+CRYPTOFLAGS =	-Iidea -Ilibdes -Iblowfish
-+CRYPTOLIBS =	blowfish/libblowfish.a des/des.a idea/idea.a libdes/libdes.a
-+CRYPTOOBJS =	libblowfish.o deslib.o idealib.o libdes.o
-+.endif
-+.else
-+CCFLAGS +=	-DNOCRYPTO
-+CRYPTOFLAGS =
-+CRYPTOLIBS =
-+CRYPTOOBJS =
-+.endif
-+
-+.if defined(HAVE_GSM) && ${HAVE_GSM} == "yes"
-+GSMFLAGS =	-I${LOCALBASE}/include
-+GSMLIBS =	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/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 +357,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 +457,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 +497,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 +511,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-crypto/patches/patch-ab b/net/speakfreely-crypto/patches/patch-ab
deleted file mode 100644
index 9f429405122..00000000000
--- a/net/speakfreely-crypto/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- des/des.c.orig	Fri Feb 23 06:10:37 1996
-+++ des/des.c	Mon Oct 11 00:15:12 1999
-@@ -4,6 +4,17 @@
-  */
- #define NULL	0
- 
-+/*
-+ * NetBSD is cross-platform, so determine endianness from machine-specific
-+ * header files.
-+ */
-+#if defined(__NetBSD__)
-+#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-crypto/patches/patch-ac b/net/speakfreely-crypto/patches/patch-ac
deleted file mode 100644
index c2cc7dd86c1..00000000000
--- a/net/speakfreely-crypto/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- sfspeaker.1.in.orig	Sat Sep 18 15:23:01 1999
-+++ sfspeaker.1.in	Mon Oct 11 00:15:12 1999
-@@ -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
diff --git a/net/speakfreely-crypto/patches/patch-ad b/net/speakfreely-crypto/patches/patch-ad
deleted file mode 100644
index 7536945c155..00000000000
--- a/net/speakfreely-crypto/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- soundbyte.c.orig	Tue Sep 14 08:55:17 1999
-+++ soundbyte.c	Mon Oct 11 00:15:12 1999
-@@ -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-crypto/patches/patch-ae b/net/speakfreely-crypto/patches/patch-ae
deleted file mode 100644
index 72b260cb295..00000000000
--- a/net/speakfreely-crypto/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- speaker.c.orig	Tue Sep 14 05:53:42 1999
-+++ speaker.c	Mon Oct 11 00:15:13 1999
-@@ -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 */
-@@ -53,7 +57,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
diff --git a/net/speakfreely-crypto/patches/patch-af b/net/speakfreely-crypto/patches/patch-af
deleted file mode 100644
index 3e3da79b018..00000000000
--- a/net/speakfreely-crypto/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/10/11 05:49:03 jlam Exp $
-
---- speakfree.h.orig	Tue Sep 14 08:17:32 1999
-+++ speakfree.h	Mon Oct 11 00:15:13 1999
-@@ -20,6 +20,17 @@
- #define _BSD_SIGNALS
- #endif
- 
-+/*
-+ * NetBSD is cross-platform, so determine endianness from machine-specific
-+ * header files.
-+ */
-+#if defined(__NetBSD__)
-+#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>
diff --git a/net/speakfreely-crypto/pkg/COMMENT b/net/speakfreely-crypto/pkg/COMMENT
deleted file mode 100644
index 355759d99eb..00000000000
--- a/net/speakfreely-crypto/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Internet "phone" for UNIX
diff --git a/net/speakfreely-crypto/pkg/DESCR b/net/speakfreely-crypto/pkg/DESCR
deleted file mode 100644
index d32fa0b46c2..00000000000
--- a/net/speakfreely-crypto/pkg/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-crypto/pkg/PLIST b/net/speakfreely-crypto/pkg/PLIST
deleted file mode 100644
index 7404a890abf..00000000000
--- a/net/speakfreely-crypto/pkg/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/11 05:49:03 jlam 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