diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-02-14 04:12:22 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-02-14 04:12:22 +0000 |
| commit | 058359db3fd9b59a7964230683aa1fe71d11dc77 (patch) | |
| tree | fafd24a5a26a2bc11f6ab4a6d9d6c348128e4fc9 | |
| parent | release slurpie & trinokiller (diff) | |
USE_OPENSSL
Submitted by: Jim Bloom <bloom@acm.org>
Notes
Notes:
svn path=/head/; revision=25811
| -rw-r--r-- | security/cyrus-sasl/Makefile | 13 | ||||
| -rw-r--r-- | security/cyrus-sasl/files/patch-ab | 18 | ||||
| -rw-r--r-- | security/cyrus-sasl2/Makefile | 13 | ||||
| -rw-r--r-- | security/cyrus-sasl2/files/patch-ab | 18 |
4 files changed, 46 insertions, 16 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index e819d4113457..e4563b769a3a 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -14,12 +14,11 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ MAINTAINER= hetzels@westbend.net -BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl +USE_OPENSSL= NORSA -SASL_VER= 1.5.15 +.include <bsd.port.pre.mk> -RESTRICTED= "Contains cryptography" +SASL_VER= 1.5.15 Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html @@ -43,6 +42,10 @@ CONFIGURE_ARGS= \ CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME} .endif +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ + OPENSSLINC=${OPENSSLINC} \ + OPENSSLLIB=${OPENSSLLIB} + DOCS= README README.Y2K TODO INSTALL ChangeLog NEWS DOC2= draft-newman-auth-scram-03.txt \ @@ -88,4 +91,4 @@ post-install: @${MV} ${WRKDIR}/tmp.plist ${TMPPLIST} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab index 7818e6664158..646c62a2b086 100644 --- a/security/cyrus-sasl/files/patch-ab +++ b/security/cyrus-sasl/files/patch-ab @@ -1,6 +1,18 @@ ---- configure.in.orig Thu Jan 13 23:00:16 2000 -+++ configure.in Fri Jan 14 17:56:41 2000 -@@ -222,6 +222,7 @@ +--- configure.in.orig Fri Jan 14 00:00:16 2000 ++++ configure.in Mon Feb 7 15:14:50 2000 +@@ -49,8 +49,9 @@ + dnl check for -R, etc. switch + CMU_GUESS_RUNPATH_SWITCH + dnl let's just link against local. otherwise we never find anything useful. +-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" +-CMU_ADD_LIBPATH("/usr/local/lib") ++CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}" ++CMU_ADD_LIBPATH("${LOCALBASE}/lib") ++CMU_ADD_LIBPATH("${OPENSSLLIB}") + + if test "$enable_java" = yes; then + AC_PATH_PROG(JAVAC, javac, no) +@@ -222,6 +223,7 @@ AC_CHECK_LIB(crypt, crypt, LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes, cmu_have_crypt=no)) diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index e819d4113457..e4563b769a3a 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -14,12 +14,11 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ MAINTAINER= hetzels@westbend.net -BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl +USE_OPENSSL= NORSA -SASL_VER= 1.5.15 +.include <bsd.port.pre.mk> -RESTRICTED= "Contains cryptography" +SASL_VER= 1.5.15 Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html @@ -43,6 +42,10 @@ CONFIGURE_ARGS= \ CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME} .endif +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ + OPENSSLINC=${OPENSSLINC} \ + OPENSSLLIB=${OPENSSLLIB} + DOCS= README README.Y2K TODO INSTALL ChangeLog NEWS DOC2= draft-newman-auth-scram-03.txt \ @@ -88,4 +91,4 @@ post-install: @${MV} ${WRKDIR}/tmp.plist ${TMPPLIST} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab index 7818e6664158..646c62a2b086 100644 --- a/security/cyrus-sasl2/files/patch-ab +++ b/security/cyrus-sasl2/files/patch-ab @@ -1,6 +1,18 @@ ---- configure.in.orig Thu Jan 13 23:00:16 2000 -+++ configure.in Fri Jan 14 17:56:41 2000 -@@ -222,6 +222,7 @@ +--- configure.in.orig Fri Jan 14 00:00:16 2000 ++++ configure.in Mon Feb 7 15:14:50 2000 +@@ -49,8 +49,9 @@ + dnl check for -R, etc. switch + CMU_GUESS_RUNPATH_SWITCH + dnl let's just link against local. otherwise we never find anything useful. +-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" +-CMU_ADD_LIBPATH("/usr/local/lib") ++CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}" ++CMU_ADD_LIBPATH("${LOCALBASE}/lib") ++CMU_ADD_LIBPATH("${OPENSSLLIB}") + + if test "$enable_java" = yes; then + AC_PATH_PROG(JAVAC, javac, no) +@@ -222,6 +223,7 @@ AC_CHECK_LIB(crypt, crypt, LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes, cmu_have_crypt=no)) |