1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Upgrade to 6.1c

This commit is contained in:
Andrey A. Chernov 1997-09-23 23:30:44 +00:00
parent 726643f6f8
commit 3f77b93c9e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=8008
10 changed files with 122 additions and 154 deletions

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: speak_freely
# Original WWW site: http://www.fourmilab.ch/speakfree/unix/index.html
# Version required: 6.1b
# Version required: 6.1c
# Date created: 18 Apr 1996
# Whom: ache
#
# $Id: Makefile,v 1.2 1996/11/11 23:24:31 ache Exp $
# $Id: Makefile,v 1.3 1996/11/18 11:33:26 asami Exp $
#
DISTNAME= speak_freely-6.1b
DISTNAME= speak_freely-6.1c
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
@ -26,7 +26,7 @@ do-install:
install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
fi
cd ${WRKSRC}; \
$(INSTALL_DATA) ring.au ${SFLIB}
$(INSTALL_DATA) busy.au ring.au ${SFLIB}
cd ${WRKSRC}; \
for p in ${UTILS}; do \
$(INSTALL_PROGRAM) $$p ${PREFIX}/bin; \

View File

@ -1 +1 @@
MD5 (speak_freely-6.1b.tar.gz) = ed549a90e45f48c46d8e084e450a6238
MD5 (speak_freely-6.1c.tar.gz) = 52f42e45bd78ddd069c8ef81d8bc8e83

View File

@ -1,24 +1,26 @@
*** Makefile.bak Thu May 22 15:10:44 1997
--- Makefile Wed Jun 11 22:36:10 1997
*** Makefile.orig Mon Jul 21 17:06:21 1997
--- Makefile Wed Sep 24 02:36:37 1997
***************
*** 15,22 ****
# will tell you whether these components are present on your system.
# If they aren't, you need to install them before building Speak
# Freely.
! CC = cc -float -signed
! LFLAGS = -laudio -lcurses -lm
*** 32,40 ****
# THREADS, you can also remove the "-lpthread" library specification
# from the LFLAGS line, which may cause an error if the system does
# not include the POSIX threads library.
! CC = cc -fsingle # for Sun Compiler
! CCFLAGS = -DSolaris -DTHREADS
! LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread
# SunOS 4.1.x
#CC = cc -fsingle -DOLDCC
--- 15,22 ----
# will tell you whether these components are present on your system.
# If they aren't, you need to install them before building Speak
# Freely.
! #CC = cc -float -signed
! #LFLAGS = -laudio -lcurses -lm
# FreeBSD 2.2 courtesy of Andrey A. Chernov
#
--- 32,40 ----
# THREADS, you can also remove the "-lpthread" library specification
# from the LFLAGS line, which may cause an error if the system does
# not include the POSIX threads library.
! #CC = cc -fsingle # for Sun Compiler
! #CCFLAGS = -DSolaris -DTHREADS
! #LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread
# SunOS 4.1.x
#CC = cc -fsingle -DOLDCC
# FreeBSD 2.2 courtesy of Andrey A. Chernov
#
***************
*** 46,53 ****
# Depending on how your driver handles non-blocking I/O,
@ -29,19 +31,18 @@
# ** Linux users please note: many Linux audio drivers are
# half-duplex, even through your sound card may actually
--- 46,53 ----
--- 46,54 ----
# Depending on how your driver handles non-blocking I/O,
# you may also have to add -DAUDIO_BLOCKING to the
# CCFLAGS line.
! PREFIX=/usr/local
! CCFLAGS = -DM_LITTLE_ENDIAN
! LFLAGS = -lcurses -ltermcap -lcompat -lm
! LFLAGS = -L${PREFIX}/lib -lcurses -ltermcap -lcompat -lm
# ** Linux users please note: many Linux audio drivers are
# half-duplex, even through your sound card may actually
***************
*** 76,87 ****
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
#LFLAGS = -lAlib -lcurses -ltermcap -lm
*** 78,87 ****
# Where Perl is located on your system. This is used to make
# a directly-executable version of sfvod.
@ -52,12 +53,8 @@
# If your getdomainname() does not return the DNS domainname, define:
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
--- 76,89 ----
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
#LFLAGS = -lAlib -lcurses -ltermcap -lm
--- 79,88 ----
+ PREFIX=/usr/local
+
# Where Perl is located on your system. This is used to make
# a directly-executable version of sfvod.
! PERL = /usr/bin/perl
@ -68,7 +65,7 @@
# If your getdomainname() does not return the DNS domainname, define:
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
***************
*** 110,120 ****
*** 108,118 ****
CARGS = -DInternet_Port=$(INTERNET_PORT)
#DEBUG = -g -DHEXDUMP
@ -76,11 +73,11 @@
# Compiler flags
! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod
--- 112,130 ----
--- 109,127 ----
CARGS = -DInternet_Port=$(INTERNET_PORT)
#DEBUG = -g -DHEXDUMP
@ -96,12 +93,12 @@
# Compiler flags
! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod
***************
*** 122,134 ****
*** 120,132 ****
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o
@ -115,22 +112,22 @@
LWLDOBJS = lwld.o xdsub.o
--- 132,144 ----
--- 129,141 ----
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o
! sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o xdsub.o
! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -L${PREFIX}/lib -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(LFLAGS) -o sfspeaker
! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(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 hp_audio.o
! sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o
! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lm -L${PREFIX}/lib -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike
! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o -lm lpc10/liblpc10.a -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike
LWLDOBJS = lwld.o xdsub.o
***************
*** 142,149 ****
*** 140,147 ****
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
@ -139,7 +136,7 @@
sfvod: sfvod.pl
echo \#\! $(PERL) >sfvod
--- 152,159 ----
--- 149,156 ----
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
@ -149,7 +146,7 @@
sfvod: sfvod.pl
echo \#\! $(PERL) >sfvod
***************
*** 159,169 ****
*** 157,167 ****
chmod 755 sfvod
adpcmlib.o:
@ -161,7 +158,7 @@
echo "LIBDES" >libdes.o
lpclib.o:
--- 169,181 ----
--- 166,178 ----
chmod 755 sfvod
adpcmlib.o:
@ -176,28 +173,7 @@
lpclib.o:
***************
*** 175,181 ****
echo "LPC" >lpc10lib.o
gsmlib.o:
! ( echo "Building GSM library."; cd gsm ; make CC="$(CC)" )
echo "GSM" >gsmlib.o
deslib.o:
--- 187,193 ----
echo "LPC" >lpc10lib.o
gsmlib.o:
! ( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" )
echo "GSM" >gsmlib.o
deslib.o:
***************
*** 183,193 ****
echo "DES" >deslib.o
md5lib.o:
! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" )
*** 185,191 ****
echo "MD5" >md5lib.o
idealib.o:
@ -205,11 +181,7 @@
echo "IDEA" >idealib.o
codecs.o: codecs.c speakfree.h
--- 195,205 ----
echo "DES" >deslib.o
md5lib.o:
! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" )
--- 196,202 ----
echo "MD5" >md5lib.o
idealib.o:

View File

@ -1,5 +1,5 @@
*** soundbyte.c.orig Wed Mar 5 23:04:49 1997
--- soundbyte.c Wed Jun 11 22:50:54 1997
--- soundbyte.c Wed Sep 24 02:39:23 1997
***************
*** 15,21 ****
--- 15,23 ----
@ -13,8 +13,19 @@
#endif
***************
*** 72,77 ****
--- 74,81 ----
static unsigned char *playbuf= NULL; /* Current play pointer */
static int squelch = 0; /* Squelch value */
+ void soundplayvol();
+
/* Convert local gain into device parameters */
static unsigned scale_gain(g)
***************
*** 96,101 ****
--- 98,108 ----
--- 100,110 ----
}
#endif
@ -28,7 +39,7 @@
access. Return TRUE if successful, FALSE
***************
*** 145,150 ****
--- 152,172 ----
--- 154,174 ----
}
ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info);
#endif
@ -52,7 +63,7 @@
if (errno != EINTR) {
***************
*** 160,165 ****
--- 182,196 ----
--- 184,198 ----
void soundterm()
{
if (audiof >= 0) {
@ -80,7 +91,7 @@
/* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */
--- 241,270 ----
--- 243,272 ----
arg = (value << 8) | value;

View File

@ -5,6 +5,7 @@ sbin/sfecho
sbin/sflwld
sbin/sfvod
lib/speak_freely/ring.au
lib/speak_freely/busy.au
man/man1/sfspeaker.1.gz
man/man1/sfmike.1.gz
man/man1/sflwl.1.gz

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: speak_freely
# Original WWW site: http://www.fourmilab.ch/speakfree/unix/index.html
# Version required: 6.1b
# Version required: 6.1c
# Date created: 18 Apr 1996
# Whom: ache
#
# $Id: Makefile,v 1.2 1996/11/11 23:24:31 ache Exp $
# $Id: Makefile,v 1.3 1996/11/18 11:33:26 asami Exp $
#
DISTNAME= speak_freely-6.1b
DISTNAME= speak_freely-6.1c
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
@ -26,7 +26,7 @@ do-install:
install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
fi
cd ${WRKSRC}; \
$(INSTALL_DATA) ring.au ${SFLIB}
$(INSTALL_DATA) busy.au ring.au ${SFLIB}
cd ${WRKSRC}; \
for p in ${UTILS}; do \
$(INSTALL_PROGRAM) $$p ${PREFIX}/bin; \

View File

@ -1 +1 @@
MD5 (speak_freely-6.1b.tar.gz) = ed549a90e45f48c46d8e084e450a6238
MD5 (speak_freely-6.1c.tar.gz) = 52f42e45bd78ddd069c8ef81d8bc8e83

View File

@ -1,24 +1,26 @@
*** Makefile.bak Thu May 22 15:10:44 1997
--- Makefile Wed Jun 11 22:36:10 1997
*** Makefile.orig Mon Jul 21 17:06:21 1997
--- Makefile Wed Sep 24 02:36:37 1997
***************
*** 15,22 ****
# will tell you whether these components are present on your system.
# If they aren't, you need to install them before building Speak
# Freely.
! CC = cc -float -signed
! LFLAGS = -laudio -lcurses -lm
*** 32,40 ****
# THREADS, you can also remove the "-lpthread" library specification
# from the LFLAGS line, which may cause an error if the system does
# not include the POSIX threads library.
! CC = cc -fsingle # for Sun Compiler
! CCFLAGS = -DSolaris -DTHREADS
! LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread
# SunOS 4.1.x
#CC = cc -fsingle -DOLDCC
--- 15,22 ----
# will tell you whether these components are present on your system.
# If they aren't, you need to install them before building Speak
# Freely.
! #CC = cc -float -signed
! #LFLAGS = -laudio -lcurses -lm
# FreeBSD 2.2 courtesy of Andrey A. Chernov
#
--- 32,40 ----
# THREADS, you can also remove the "-lpthread" library specification
# from the LFLAGS line, which may cause an error if the system does
# not include the POSIX threads library.
! #CC = cc -fsingle # for Sun Compiler
! #CCFLAGS = -DSolaris -DTHREADS
! #LFLAGS = -lcurses -lsocket -lnsl -lm -lpthread
# SunOS 4.1.x
#CC = cc -fsingle -DOLDCC
# FreeBSD 2.2 courtesy of Andrey A. Chernov
#
***************
*** 46,53 ****
# Depending on how your driver handles non-blocking I/O,
@ -29,19 +31,18 @@
# ** Linux users please note: many Linux audio drivers are
# half-duplex, even through your sound card may actually
--- 46,53 ----
--- 46,54 ----
# Depending on how your driver handles non-blocking I/O,
# you may also have to add -DAUDIO_BLOCKING to the
# CCFLAGS line.
! PREFIX=/usr/local
! CCFLAGS = -DM_LITTLE_ENDIAN
! LFLAGS = -lcurses -ltermcap -lcompat -lm
! LFLAGS = -L${PREFIX}/lib -lcurses -ltermcap -lcompat -lm
# ** Linux users please note: many Linux audio drivers are
# half-duplex, even through your sound card may actually
***************
*** 76,87 ****
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
#LFLAGS = -lAlib -lcurses -ltermcap -lm
*** 78,87 ****
# Where Perl is located on your system. This is used to make
# a directly-executable version of sfvod.
@ -52,12 +53,8 @@
# If your getdomainname() does not return the DNS domainname, define:
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
--- 76,89 ----
#CCFLAGS = -DHEWLETT_PACKARD -DOLDCC
#LFLAGS = -lAlib -lcurses -ltermcap -lm
--- 79,88 ----
+ PREFIX=/usr/local
+
# Where Perl is located on your system. This is used to make
# a directly-executable version of sfvod.
! PERL = /usr/bin/perl
@ -68,7 +65,7 @@
# If your getdomainname() does not return the DNS domainname, define:
#DOMAIN=-DMYDOMAIN=\"somedomain.net\"
***************
*** 110,120 ****
*** 108,118 ****
CARGS = -DInternet_Port=$(INTERNET_PORT)
#DEBUG = -g -DHEXDUMP
@ -76,11 +73,11 @@
# Compiler flags
! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
! CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod
--- 112,130 ----
--- 109,127 ----
CARGS = -DInternet_Port=$(INTERNET_PORT)
#DEBUG = -g -DHEXDUMP
@ -96,12 +93,12 @@
# Compiler flags
! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) -DRelno=$(REL) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
! CFLAGS += $(DEBUG) -Iadpcm -Ilpc -Iidea $(IDES) -I/usr/include -I${PREFIX}/include $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
PROGRAMS = sfspeaker sfmike sflwld sflwl sfecho sfvod
***************
*** 122,134 ****
*** 120,132 ****
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o
@ -115,22 +112,22 @@
LWLDOBJS = lwld.o xdsub.o
--- 132,144 ----
--- 129,141 ----
SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o ulaw.o usleep.o vatpkt.o vox.o hp_audio.o
! sfspeaker: $(SPKROBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o xdsub.o
! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -L${PREFIX}/lib -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(LFLAGS) -o sfspeaker
! $(CC) $(SPKROBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lgsm lpc/lpc.o xdsub.o -lmd $(LDES) $(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 hp_audio.o
! sfmike: $(MIKEOBJS) adpcmlib.o lpclib.o lpc10lib.o deslib.o idealib.o libdes.o
! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o lpc10/liblpc10.a -lm -L${PREFIX}/lib -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike
! $(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.o idea/idea.o -lm lpc10/liblpc10.a -lgsm lpc/lpc.o -lmd $(LDES) $(LFLAGS) -o sfmike
LWLDOBJS = lwld.o xdsub.o
***************
*** 142,149 ****
*** 140,147 ****
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
@ -139,7 +136,7 @@
sfvod: sfvod.pl
echo \#\! $(PERL) >sfvod
--- 152,159 ----
--- 149,156 ----
ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
@ -149,7 +146,7 @@
sfvod: sfvod.pl
echo \#\! $(PERL) >sfvod
***************
*** 159,169 ****
*** 157,167 ****
chmod 755 sfvod
adpcmlib.o:
@ -161,7 +158,7 @@
echo "LIBDES" >libdes.o
lpclib.o:
--- 169,181 ----
--- 166,178 ----
chmod 755 sfvod
adpcmlib.o:
@ -176,28 +173,7 @@
lpclib.o:
***************
*** 175,181 ****
echo "LPC" >lpc10lib.o
gsmlib.o:
! ( echo "Building GSM library."; cd gsm ; make CC="$(CC)" )
echo "GSM" >gsmlib.o
deslib.o:
--- 187,193 ----
echo "LPC" >lpc10lib.o
gsmlib.o:
! ( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" )
echo "GSM" >gsmlib.o
deslib.o:
***************
*** 183,193 ****
echo "DES" >deslib.o
md5lib.o:
! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" )
*** 185,191 ****
echo "MD5" >md5lib.o
idealib.o:
@ -205,11 +181,7 @@
echo "IDEA" >idealib.o
codecs.o: codecs.c speakfree.h
--- 195,205 ----
echo "DES" >deslib.o
md5lib.o:
! ( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" )
--- 196,202 ----
echo "MD5" >md5lib.o
idealib.o:

View File

@ -1,5 +1,5 @@
*** soundbyte.c.orig Wed Mar 5 23:04:49 1997
--- soundbyte.c Wed Jun 11 22:50:54 1997
--- soundbyte.c Wed Sep 24 02:39:23 1997
***************
*** 15,21 ****
--- 15,23 ----
@ -13,8 +13,19 @@
#endif
***************
*** 72,77 ****
--- 74,81 ----
static unsigned char *playbuf= NULL; /* Current play pointer */
static int squelch = 0; /* Squelch value */
+ void soundplayvol();
+
/* Convert local gain into device parameters */
static unsigned scale_gain(g)
***************
*** 96,101 ****
--- 98,108 ----
--- 100,110 ----
}
#endif
@ -28,7 +39,7 @@
access. Return TRUE if successful, FALSE
***************
*** 145,150 ****
--- 152,172 ----
--- 154,174 ----
}
ioctl(Audio_fd, AUDIO_SETINFO, &Audio_info);
#endif
@ -52,7 +63,7 @@
if (errno != EINTR) {
***************
*** 160,165 ****
--- 182,196 ----
--- 184,198 ----
void soundterm()
{
if (audiof >= 0) {
@ -80,7 +91,7 @@
/* SOUNDRECGAIN -- Set recording gain from 0 (minimum) to 100 (maximum). */
--- 241,270 ----
--- 243,272 ----
arg = (value << 8) | value;

View File

@ -5,6 +5,7 @@ sbin/sfecho
sbin/sflwld
sbin/sfvod
lib/speak_freely/ring.au
lib/speak_freely/busy.au
man/man1/sfspeaker.1.gz
man/man1/sfmike.1.gz
man/man1/sflwl.1.gz