- Add sfreflect and sflaunch to be installed

- System-wide CFLAGS received appropriate respect
- System md5 library used instead of port's own
- GSM library now used properly from GSM port instead of SF port
- portlint (add dummy Whom: line in Makefile)
- move WWWs from Makefile to DESCR

PR:		15921
Submitted by:	Maxim Sobolev <sobomax@altavista.net>

7 files changed, 99 insertions, 9 deletions

diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile
index 1d76a6cfed47..ecd1824f93ab 100644
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    speak_freely
-# Original WWW site: http://www.fourmilab.ch/speakfree/unix/index.html
 # Version required:     7.1
 # Date created:         18 Apr 1996
+# Whom:                 Mister X (to make portlint happy ;)
 #
 # $FreeBSD$
 #
@@ -14,15 +14,17 @@ MAINTAINER=     ports@FreeBSD.org
 
 LIB_DEPENDS=    gsm.1:${PORTSDIR}/audio/gsm
 
-UTILS=   sfspeaker sfmike sflwl
-DEMNS=   sfecho sflwld
+UTILS=   sfspeaker sfmike sflwl sflaunch
+DEMNS=   sfecho sflwld sfreflect
 DDEMNS=  sfvod
 SFLIB=   ${PREFIX}/lib/speak_freely
 MAN1=	 ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
 
+MAKE_ENV="OPTFLAGS=${CFLAGS}"
+
 do-install:
 	if [ ! -d ${SFLIB} ]; then \
-		install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
+		${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \
 	fi
 	cd ${WRKSRC}; \
 	$(INSTALL_DATA) busy.au ring.au ${SFLIB}
diff --git a/mbone/speak_freely/files/patch-aa b/mbone/speak_freely/files/patch-aa
index 10ed5fbf8055..63bbf0206ecd 100644
--- a/mbone/speak_freely/files/patch-aa
+++ b/mbone/speak_freely/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Sep 18 10:29:44 1999
-+++ Makefile	Fri Dec 31 15:40:34 1999
+--- Makefile.orig	Sat Sep 18 18:29:44 1999
++++ Makefile	Wed Jan  5 20:23:52 2000
 @@ -3,7 +3,7 @@
  
  # Debugging options
@@ -28,11 +28,50 @@
  #    CCFLAGS line.
 -#CCFLAGS = -DM_LITTLE_ENDIAN
 -#LFLAGS = -lcurses -ltermcap -lcompat -lm
-+CCFLAGS = -O2 -DM_LITTLE_ENDIAN -DHALF_DUPLEX
++CCFLAGS = -DM_LITTLE_ENDIAN -DHALF_DUPLEX
 +LFLAGS = -lcurses -ltermcap -lcompat -lm
  
  #			   Hewlett-Packard
  #		      (courtesy of Marc Kilian)
+@@ -269,7 +269,7 @@
+ 
+ #   Compiler flags
+ 
+-CFLAGS = $(DEBUG) -Iadpcm -Ilpc -Igsm/inc -Imd5 -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
++CFLAGS = $(OPTFLAGS) $(DEBUG) -Iadpcm -Ilpc -I$(LOCALBASE)/include -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
+ 
+ PROGRAMS = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect sfvod
+ 
+@@ -278,12 +278,12 @@
+ 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
++	$(CC) $(SPKROBJS) adpcm/adpcm-u.o blowfish/libblowfish.a des/des.a -lmd idea/idea.a lpc10/liblpc10.a -L/usr/local/lib -lgsm lpc/lpc.o xdsub.o libdes/libdes.a $(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
++	$(CC) $(MIKEOBJS) adpcm/adpcm-u.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a -L/usr/local/lib -lgsm lpc/lpc.o libdes/libdes.a $(LFLAGS) -o sfmike
+ 
+ LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
+ 
+@@ -303,12 +303,12 @@
+ 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
++	$(CC) $(ECHOOBJS) -lmd 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
++	$(CC) $(REFLECTOBJS) -lmd 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.
 @@ -337,7 +337,7 @@
  #	in make not necessarily available on all platforms.
  
@@ -42,17 +81,31 @@
  	echo "ADPCM" >adpcmlib.o
  
  deslib.o:
+@@ -349,11 +349,11 @@
+ 	echo "BLOWFISH" >libblowfish.o
+ 
+ libdes.o:
+-	( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" )
++	( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" )
+ 	echo "LIBDES" >libdes.o
+ 
+ lpclib.o:
+-	( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
++	( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" )
+ 	echo "LPC" >lpclib.o
+ 
+ lpc10lib.o:
 @@ -361,15 +361,15 @@
  	echo "LPC" >lpc10lib.o
  
  gsmlib.o:
 -	( echo "Building GSM library."; cd gsm ; make CC="$(CC)" )
-+	( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" )
++#	( echo "Building GSM library."; cd gsm ; make CC="$(CC) $(CCFLAGS)" )
  	echo "GSM" >gsmlib.o
  
  md5lib.o:
 -	( echo "Building MD5 library."; cd md5 ; make CC="$(CC)" )
-+	( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" )
++#	( echo "Building MD5 library."; cd md5 ; make CC="$(CC) $(CCFLAGS)" )
  	echo "MD5" >md5lib.o
  
  idealib.o:
diff --git a/mbone/speak_freely/files/patch-af b/mbone/speak_freely/files/patch-af
new file mode 100644
index 000000000000..8f99c43f7cd2
--- /dev/null
+++ b/mbone/speak_freely/files/patch-af
@@ -0,0 +1,11 @@
+--- blowfish/Makefile.orig	Wed Jan  5 20:12:14 2000
++++ blowfish/Makefile	Wed Jan  5 20:15:02 2000
+@@ -18,7 +18,7 @@
+ 
+ MAKE=make -f Makefile
+ CC=cc
+-CFLAG= -O
++CFLAG= $(OPTFLAGS)
+ 
+ #CC=gcc
+ #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
diff --git a/mbone/speak_freely/files/patch-ag b/mbone/speak_freely/files/patch-ag
new file mode 100644
index 000000000000..8de3e742784f
--- /dev/null
+++ b/mbone/speak_freely/files/patch-ag
@@ -0,0 +1,8 @@
+--- des/Makefile.orig	Wed Jan  5 20:20:30 2000
++++ des/Makefile	Wed Jan  5 20:20:44 2000
+@@ -1,4 +1,4 @@
+-CFLAGS=-O
++CFLAGS=$(OPTFLAGS)
+ 
+ all:	des.a
+ 
diff --git a/mbone/speak_freely/files/patch-ah b/mbone/speak_freely/files/patch-ah
new file mode 100644
index 000000000000..48e6d2a4b513
--- /dev/null
+++ b/mbone/speak_freely/files/patch-ah
@@ -0,0 +1,11 @@
+--- idea/Makefile.orig	Wed Jan  5 20:20:55 2000
++++ idea/Makefile	Wed Jan  5 20:21:08 2000
+@@ -7,7 +7,7 @@
+ #   Compiler flags
+ 
+ CC = cc
+-CFLAGS = -O
++CFLAGS = $(OPTFLAGS)
+ 
+ all:	idea.a
+ 
diff --git a/mbone/speak_freely/pkg-descr b/mbone/speak_freely/pkg-descr
index f66a6d8b6f1f..1361a82873e2 100644
--- a/mbone/speak_freely/pkg-descr
+++ b/mbone/speak_freely/pkg-descr
@@ -6,3 +6,6 @@
        Optional compression is provided,  allowing  conversations
        over  relatively  low-bandwidth	Internet links as well as
        local area networks.
+
+WWW: http://www.speakfreely.org/
+     http://www.fourmilab.ch/speakfree/unix/index.html
diff --git a/mbone/speak_freely/pkg-plist b/mbone/speak_freely/pkg-plist
index 245029b35455..39a54f5325c1 100644
--- a/mbone/speak_freely/pkg-plist
+++ b/mbone/speak_freely/pkg-plist
@@ -1,8 +1,10 @@
 bin/sfspeaker
 bin/sfmike
 bin/sflwl
+bin/sflaunch
 sbin/sfecho
 sbin/sflwld
+sbin/sfreflect
 sbin/sfvod
 lib/speak_freely/ring.au
 lib/speak_freely/busy.au