buildlink1 -> buildlink2.

4 files changed, 25 insertions, 14 deletions

diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index fbbe9426726..6f5490b332c 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/06/17 10:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/25 10:30:36 wiz Exp $
 #
 
 DISTNAME=		speak_freely-7.2
@@ -10,8 +10,7 @@ MAINTAINER=		johnam@mail.kemper.org
 HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
 COMMENT=		Internet "phone" for UNIX
 
-DEPENDS+=		gsm-1.0.10:../../audio/gsm
-
+USE_BUILDLINK2=		YES
 NO_CONFIGURE=		YES
 USE_PERL5=		YES
 
@@ -35,7 +34,7 @@ CCFLAGS+=		-DHALF_DUPLEX
 
 .if defined(USE_CRYPTO) && ${USE_CRYPTO} == "YES"
 HAVE_LIBCRYPTO=		YES
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 .if defined(USE_IDEA) && ${USE_IDEA} == "YES"
 LICENSE=		no-commercial-use
@@ -62,4 +61,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/busy.au ${SOUNDDIR}
 	${INSTALL_DATA} ${WRKSRC}/ring.au ${SOUNDDIR}
 
+.include "../../audio/gsm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/speakfreely/distinfo b/net/speakfreely/distinfo
index 6ab812cb3da..d3b88a52441 100644
--- a/net/speakfreely/distinfo
+++ b/net/speakfreely/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:34 wiz Exp $
+$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) = 0a14f4ebf0244a5dc5ef8f84dae1881da02620fa
+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) = f4ea2a87c1cf30127f1139f51489782bb01537ee
+SHA1 (patch-ah) = ea18245b2311906cf100f45e2588af40afc90efd
 SHA1 (patch-ai) = 961576afb09f30d9bf0f772c42fb7f2e2fe9febd
diff --git a/net/speakfreely/patches/patch-aa b/net/speakfreely/patches/patch-aa
index 9b57a32ad1b..139124b52c8 100644
--- a/net/speakfreely/patches/patch-aa
+++ b/net/speakfreely/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/04/27 03:29:44 jlam Exp $
+$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
@@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.3 2000/04/27 03:29:44 jlam Exp $
 +# Crypto
 +.if defined(USE_CRYPTO) && $(USE_CRYPTO) == "YES"
 +.if defined(HAVE_LIBCRYPTO) && $(HAVE_LIBCRYPTO) == "YES"
-+CRYPTOFLAGS =	-I$(SSLBASE)/include/openssl
++CRYPTOFLAGS =	-I$(SSLBASE)/include
 +CRYPTOLIBS =	des/des.a -Wl,-R$(SSLBASE)/lib -L$(SSLBASE)/lib -lcrypto
 +CRYPTOOBJS =	deslib.o
 +.else
@@ -95,8 +95,8 @@ $NetBSD: patch-aa,v 1.3 2000/04/27 03:29:44 jlam Exp $
 +.endif
 +
 +.if defined(HAVE_GSM) && ${HAVE_GSM} == "YES"
-+GSMFLAGS =	-I${LOCALBASE}/include
-+GSMLIBS =	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lgsm
++GSMFLAGS =	-I${BUILDLINK_PREFIX.gsm}/include
++GSMLIBS =	-Wl,-R${BUILDLINK_PREFIX.gsm}/lib -L${BUILDLINK_PREFIX.gsm}/lib -lgsm
 +GSMOBJS =
 +.else
 +GSMFLAGS =	-Igsm/inc
diff --git a/net/speakfreely/patches/patch-ah b/net/speakfreely/patches/patch-ah
index 7aea43d8852..1bb1a5a2ca4 100644
--- a/net/speakfreely/patches/patch-ah
+++ b/net/speakfreely/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2000/01/17 16:02:34 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2002/10/25 10:30:37 wiz Exp $
 
---- speakfree.h.orig	Tue Sep 14 08:17:32 1999
-+++ speakfree.h	Sat Jan 15 11:59:59 2000
+--- speakfree.h.orig	Tue Sep 14 14:17:32 1999
++++ speakfree.h
 @@ -20,6 +20,18 @@
  #define _BSD_SIGNALS
  #endif
@@ -21,3 +21,14 @@ $NetBSD: patch-ah,v 1.1 2000/01/17 16:02:34 jlam Exp $
  #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"