diff options
| author | jlam <jlam> | 2000-04-27 03:29:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-04-27 03:29:42 +0000 |
| commit | 53937d5ee2d7f0676a96add33d933a0ba8f1e4dd (patch) | |
| tree | e9d872c72b7b9fb54f863126bc2fbe7db40d8039 /net/speakfreely | |
| parent | a04cf56d758c8726634f600a0e0801ea79bed4b1 (diff) | |
| download | pkgsrc-53937d5ee2d7f0676a96add33d933a0ba8f1e4dd.tar.gz | |
Make use of USE_SSL.
Diffstat (limited to 'net/speakfreely')
| -rw-r--r-- | net/speakfreely/Makefile | 19 | ||||
| -rw-r--r-- | net/speakfreely/files/patch-sum | 4 | ||||
| -rw-r--r-- | net/speakfreely/patches/patch-aa | 6 |
3 files changed, 9 insertions, 20 deletions
diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile index 0effd8997da..a4be228e11a 100644 --- a/net/speakfreely/Makefile +++ b/net/speakfreely/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/01/17 16:02:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2000/04/27 03:29:42 jlam Exp $ # DISTNAME= speak_freely-7.1 @@ -37,21 +37,10 @@ CCFLAGS+= -DHALF_DUPLEX .endif .if defined(USE_CRYPTO) && ${USE_CRYPTO} == "YES" -.if exists (/usr/include/openssl/blowfish.h) HAVE_LIBCRYPTO= YES -OPENSSLDIR= /usr -.else -# -# We have a choice of either using the included sources for crypto or to simply -# DEPEND on security/openssl. Not sure which is the right way to go, so for -# now, just DEPEND on security/openssl. -# -#HAVE_LIBCRYPTO= NO -HAVE_LIBCRYPTO= YES -OPENSSLDIR= ${LOCALBASE} -DEPENDS+= openssl-*:../../security/openssl -.endif +USE_SSL= # defined RESTRICTED= "Crypto; export-controlled" + .if defined(USE_IDEA) && ${USE_IDEA} == "YES" LICENSE= no-commercial-use .endif @@ -61,7 +50,7 @@ SOUNDDIR= ${PREFIX}/share/speakfreely MAKE_ENV+= PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \ SOUNDDIR="${SOUNDDIR}" MAKE_ENV+= USE_CRYPTO="${USE_CRYPTO}" HAVE_LIBCRYPTO="${HAVE_LIBCRYPTO}" \ - OPENSSLDIR="${OPENSSLDIR}" USE_IDEA="${USE_IDEA}" + SSLBASE="${SSLBASE}" USE_IDEA="${USE_IDEA}" MAKE_ENV+= HAVE_GSM=YES HAVE_MD5=YES MAKE_ENV+= DOMAIN= diff --git a/net/speakfreely/files/patch-sum b/net/speakfreely/files/patch-sum index 69fb6f540ad..d23c682b66f 100644 --- a/net/speakfreely/files/patch-sum +++ b/net/speakfreely/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/01/17 16:02:34 jlam Exp $ +$NetBSD: patch-sum,v 1.4 2000/04/27 03:29:44 jlam Exp $ -MD5 (patch-aa) = 39474a4df6fc42cc8b874444d2398b9d +MD5 (patch-aa) = a3aa76b59f05c568443b1426e99e514f MD5 (patch-ab) = 5c676114edc6c971bf4a58ea8a30dbfb MD5 (patch-ac) = c5646be033cb2de99cccd4c17c405d09 MD5 (patch-ad) = 8a60453687bcc4c92df85067809c8fc0 diff --git a/net/speakfreely/patches/patch-aa b/net/speakfreely/patches/patch-aa index bff631984c0..9b57a32ad1b 100644 --- a/net/speakfreely/patches/patch-aa +++ b/net/speakfreely/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/01/17 16:02:34 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2000/04/27 03:29:44 jlam Exp $ --- Makefile.orig Sat Sep 18 11:29:44 1999 +++ Makefile Sat Jan 15 12:34:29 2000 @@ -74,8 +74,8 @@ $NetBSD: patch-aa,v 1.2 2000/01/17 16:02:34 jlam Exp $ +# Crypto +.if defined(USE_CRYPTO) && $(USE_CRYPTO) == "YES" +.if defined(HAVE_LIBCRYPTO) && $(HAVE_LIBCRYPTO) == "YES" -+CRYPTOFLAGS = -I$(OPENSSLDIR)/include/openssl -+CRYPTOLIBS = des/des.a -Wl,-R$(OPENSSLDIR)/lib -L$(OPENSSLDIR)/lib -lcrypto ++CRYPTOFLAGS = -I$(SSLBASE)/include/openssl ++CRYPTOLIBS = des/des.a -Wl,-R$(SSLBASE)/lib -L$(SSLBASE)/lib -lcrypto +CRYPTOOBJS = deslib.o +.else +CRYPTOFLAGS = -Ilibdes -Iblowfish |