diff options
| author | wiz <wiz> | 2000-12-08 14:32:00 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-12-08 14:32:00 +0000 |
| commit | 411438fec91e4f9a0b121e521f87eda84ba7866c (patch) | |
| tree | 1ba55c30d0f4d506a2d04d528d1a4197ade27f18 /security/cyrus-sasl | |
| parent | d3dcca16a0bc0af42f6233e733b214a3b95d91ef (diff) | |
| download | pkgsrc-411438fec91e4f9a0b121e521f87eda84ba7866c.tar.gz | |
Fix kerberos4 recognition if ${PREFIX} != /usr/local.
Also change libdes recognition so that it builds with openssl. Fixes pkg/11170.
Diffstat (limited to 'security/cyrus-sasl')
| -rw-r--r-- | security/cyrus-sasl/Makefile | 6 | ||||
| -rw-r--r-- | security/cyrus-sasl/files/patch-sum | 3 | ||||
| -rw-r--r-- | security/cyrus-sasl/patches/patch-ab | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index b3deb6d93d7..1221fc6c8a3 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/10/25 08:00:24 rh Exp $ +# $NetBSD: Makefile,v 1.4 2000/12/08 14:32:00 wiz Exp $ DISTNAME= cyrus-sasl-1.5.24 PKGNAME= ${DISTNAME}nb1 @@ -17,8 +17,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig .if !exists(/usr/include/openssl/rc4.h) DEPENDS+= openssl-0.9.*:../../security/openssl CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include" -.else -CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/openssl" .endif CONFIGURE_ARGS+= --with-plugindir=${PREFIX}/lib/sasl @@ -31,7 +29,7 @@ DEPENDS+= PAM-*:../../security/PAM CONFIGURE_ARGS+= --with-pwcheck .endif .if defined(KERBEROS) && (${KERBEROS} == 4) -CONFIGURE_ARGS+= --enable-krb4 +CONFIGURE_ARGS+= --enable-krb4=${PREFIX} DEPENDS+= kth-krb4-*:../../security/kth-krb4 .else CONFIGURE_ARGS+= --disable-krb4 diff --git a/security/cyrus-sasl/files/patch-sum b/security/cyrus-sasl/files/patch-sum index d4a38c0be39..cd5196e074d 100644 --- a/security/cyrus-sasl/files/patch-sum +++ b/security/cyrus-sasl/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/08/25 15:23:49 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/12/08 14:32:01 wiz Exp $ MD5 (patch-aa) = b52859d030d1017a4ed95ce103f9f53d +MD5 (patch-ab) = f2e1354733f40c1be91cb784858f9b97 diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab new file mode 100644 index 00000000000..90d98beb252 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2000/12/08 14:32:01 wiz Exp $ + +--- configure.orig Fri Jul 21 04:35:50 2000 ++++ configure +@@ -3512,6 +3512,8 @@ + echo "$ac_t""yes" 1>&6 + LIB_DES="-ldes"; + with_des=yes ++# we want the des code form openssl ++ with_des=no + else + echo "$ac_t""no" 1>&6 + with_des=no |