Update speakfreely to 7.2.

4 files changed, 28 insertions, 28 deletions

diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index a4be228e11a..b9e79041e3c 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2000/04/27 03:29:42 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/29 03:12:19 jlam Exp $
 #
 
-DISTNAME=		speak_freely-7.1
-PKGNAME=		speakfreely-7.1
+DISTNAME=		speak_freely-7.2
+PKGNAME=		speakfreely-7.2
 CATEGORIES=		net audio
 MASTER_SITES=		http://www.fourmilab.ch/speakfree/unix/
 
@@ -11,12 +11,12 @@ HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
 
 DEPENDS+=		gsm-1.0.10:../../audio/gsm
 
-USE_PERL=		yes
+USE_PERL=		# defined
 PERL_PATH=		${LOCALBASE}/bin/perl
 
 MIRROR_DISTFILE=	no			# source includes crypto code
 
-NO_CONFIGURE=		yes
+NO_CONFIGURE=		# defined
 
 BUILD_DEFS+=		SPEAKFREELY_OPTIONS USE_CRYPTO USE_IDEA
 
diff --git a/net/speakfreely/files/md5 b/net/speakfreely/files/md5
index d1e5a1c7741..fdcfff8c576 100644
--- a/net/speakfreely/files/md5
+++ b/net/speakfreely/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
+$NetBSD: md5,v 1.2 2000/07/29 03:12:20 jlam Exp $
 
-MD5 (speak_freely-7.1.tar.gz) = f06e4115c7139f7e30ea57064b324558
+MD5 (speak_freely-7.2.tar.gz) = 1fe80725e252270ea4170ebc20e2a059
diff --git a/net/speakfreely/files/patch-sum b/net/speakfreely/files/patch-sum
index d23c682b66f..79d793dfa85 100644
--- a/net/speakfreely/files/patch-sum
+++ b/net/speakfreely/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.4 2000/04/27 03:29:44 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/07/29 03:12:20 jlam Exp $
 
 MD5 (patch-aa) = a3aa76b59f05c568443b1426e99e514f
 MD5 (patch-ab) = 5c676114edc6c971bf4a58ea8a30dbfb
 MD5 (patch-ac) = c5646be033cb2de99cccd4c17c405d09
-MD5 (patch-ad) = 8a60453687bcc4c92df85067809c8fc0
+MD5 (patch-ad) = 6b34963a1d26012bc402c62efff223d1
 MD5 (patch-ae) = 17d39f606a9e10a5ccacf60ff66f5ee2
 MD5 (patch-af) = 71613cf5bd06c275c6024e6b4434c162
 MD5 (patch-ag) = c8b03f34dd63fc6065aad32924dfda89
diff --git a/net/speakfreely/patches/patch-ad b/net/speakfreely/patches/patch-ad
index 47b8ff950d7..97287b7cf5e 100644
--- a/net/speakfreely/patches/patch-ad
+++ b/net/speakfreely/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2000/07/29 03:12:20 jlam Exp $
 
---- mike.c.orig	Tue Sep 14 09:27:51 1999
-+++ mike.c	Sat Jan 15 12:52:38 2000
+--- 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 */
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      char blowfish_spec; 	      /* Nonzero if Blowfish key specified */
  #ifdef CRYPTO
      BF_KEY blowfishkey; 	      /* Destination Blowfish key, if any */
-@@ -87,8 +89,10 @@
+@@ -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 */
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  static char curblowfish_spec = FALSE; /* Nonzero if Blowfish key specified */
  #ifdef CRYPTO
  static BF_KEY curblowfishkey;	      /* Blowfish key */
-@@ -485,8 +489,10 @@
+@@ -429,8 +433,10 @@
      bcopy(curkey, d->deskey, 9);
      bcopy(currtpkey, d->rtpdeskey, 9);
      bcopy(curvatkey, d->vatdeskey, 9);
@@ -35,7 +35,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      d->blowfish_spec = curblowfish_spec;
  #ifdef CRYPTO
      bcopy(&curblowfishkey, &(d->blowfishkey), sizeof(BF_KEY));
-@@ -655,8 +661,12 @@
+@@ -599,8 +605,12 @@
  #endif
  
  #ifdef CRYPTO
@@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  	    soundbuf ebuf;
  	    int i;
  	    LONG slen, plen = 0;
-@@ -733,6 +743,7 @@
+@@ -677,6 +687,7 @@
  		}
  	    }
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  	    /* IDEA encryption. */
  
  	    if (d->ideakey[0]) {
-@@ -755,6 +766,7 @@
+@@ -699,6 +710,7 @@
  		close_idea();
  		ebuf.compression |= fEncIDEA;
  	    }
@@ -64,7 +64,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  
  	    /* Blowfish encryption. */
  
-@@ -779,6 +791,7 @@
+@@ -723,6 +735,7 @@
  		ebuf.compression |= fEncBF;
  	    }
  
@@ -72,7 +72,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  	    /* PGP encryption. */
  
  	    if (d->pgpkey[0]) {
-@@ -801,6 +814,7 @@
+@@ -745,6 +758,7 @@
  		close_idea();
  		ebuf.compression |= fEncPGP;
  	    }
@@ -80,7 +80,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  
  	    /* Key file encryption. */
  
-@@ -1659,7 +1673,7 @@
+@@ -1593,7 +1607,7 @@
      MD5Init(&md5c);
      MD5Update(&md5c, s, strlen(s));
      MD5Final(md5key1, &md5c);
@@ -89,7 +89,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      init_idearand(md5key, md5key1, time(NULL));
  #define nextrand    idearand()
  #else
-@@ -1683,7 +1697,7 @@
+@@ -1617,7 +1631,7 @@
  	    key[j] = nextrand;
  	}
      }
@@ -98,7 +98,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      close_idearand();
  #endif
  #undef nextrand
-@@ -1723,7 +1737,9 @@
+@@ -1657,7 +1671,9 @@
      V fprintf(stderr, "           -F         ADPCM compression\n");
      V fprintf(stderr, "           -G         Automatic gain control\n");
  #ifdef CRYPTO
@@ -108,7 +108,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      V fprintf(stderr, "           -Kkey      DES encrypt with key\n");
  #endif
      V fprintf(stderr, "           -L         Remote loopback\n");
-@@ -1753,7 +1769,7 @@
+@@ -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
@@ -117,7 +117,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
      V fprintf(stderr, "           -Z\"user..\" Send PGP session key for user(s)\n");
  #endif
      V fprintf(stderr, "\n");
-@@ -1946,6 +1962,7 @@
+@@ -1877,6 +1893,7 @@
  		    break;
  
  #ifdef CRYPTO
@@ -125,7 +125,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
                  case 'I':             /* -Ikey  --  Set IDEA key */
  		    if (strlen(op + 1) == 0) {
  			curideakey[0] = FALSE;
-@@ -1963,6 +1980,7 @@
+@@ -1894,6 +1911,7 @@
  			}
  		    }
  		    break;
@@ -133,7 +133,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  
                  case 'K':             /* -Kkey  --  Set DES key */
  		    desinit(1);       /* Initialise the DES library */
-@@ -2181,6 +2199,7 @@
+@@ -2107,6 +2125,7 @@
  #endif
  
  #ifdef CRYPTO
@@ -141,7 +141,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
                  case 'Z':             /* -Z"user1 user2..."  --  Send PGP
  						 encrypted session key to
  						 named users */
-@@ -2270,6 +2289,7 @@
+@@ -2196,6 +2215,7 @@
  		    }
  		    break;
  #endif
@@ -149,7 +149,7 @@ $NetBSD: patch-ad,v 1.2 2000/01/17 16:02:34 jlam Exp $
  	    }
  	} else {
  
-@@ -2281,10 +2301,15 @@
+@@ -2207,10 +2227,15 @@
  	    }
  
  	    if (rtp || vat) {