diff options
| author | kim <kim@pkgsrc.org> | 1999-06-12 03:01:44 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 1999-06-12 03:01:44 +0000 |
| commit | 4254edae70e79ed24a0eede13836575f2eeb2532 (patch) | |
| tree | 7b9f2898647568ca42fdfa7f9829614b315f15f9 /mail | |
| parent | 40cc65c5445b2c9d03da05eba88c3e617ac7fb0c (diff) | |
| download | pkgsrc-4254edae70e79ed24a0eede13836575f2eeb2532.tar.gz | |
Now uses the pkg Tcl as it should.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus/Makefile | 9 | ||||
| -rw-r--r-- | mail/cyrus/patches/patch-aa | 13 |
2 files changed, 17 insertions, 5 deletions
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile index 7f46ef34771..22cdaeda60c 100644 --- a/mail/cyrus/Makefile +++ b/mail/cyrus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/05/03 23:39:22 tv Exp $ +# $NetBSD: Makefile,v 1.5 1999/06/12 03:01:44 kim Exp $ DISTNAME= cyrus-imapd-v1.5.14 CATEGORIES= mail @@ -6,6 +6,8 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= kim@tac.nyc.ny.us +DEPENDS+= tcl-8.0.5:../../lang/tcl80 + GNU_CONFIGURE= yes # XXX This package is not ready for general use! @@ -17,9 +19,10 @@ GNU_CONFIGURE= yes # XXX # XXX + Kim -CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus +CONFIGURE_ARGS+= --with-cyrus-prefix=${LOCALBASE}/cyrus CONFIGURE_ARGS+= --with-statedir=/var/run -CONFIGURE_ARGS+= --with-tcl=/usr/local/tcl +CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/tcl8.0 +CONFIGURE_ARGS+= --enable-netscapehack .include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus/patches/patch-aa b/mail/cyrus/patches/patch-aa index f886f70a8d8..25682cbd51c 100644 --- a/mail/cyrus/patches/patch-aa +++ b/mail/cyrus/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/03/07 00:27:18 kim Exp $ +$NetBSD: patch-aa,v 1.2 1999/06/12 03:01:44 kim Exp $ --- configure.orig Tue Aug 4 01:52:57 1998 -+++ configure Thu Oct 22 21:31:35 1998 ++++ configure Fri Jun 11 22:41:23 1999 @@ -1269,14 +1269,14 @@ fi @@ -47,6 +47,15 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/07 00:27:18 kim Exp $ krb|krb_*) login_progs=krbck;; esac +@@ -2869,7 +2871,7 @@ + echo "configure:2870: checking with Tcl on how it says it should be compiled" >&5 + . ${TclLibBase}/tclConfig.sh + +- TCL_CPPFLAGS="-I${TCL_PREFIX}/include" ++ TCL_CPPFLAGS="-I${TCL_PREFIX}/include/tcl8.0" + TCL_LIBS="${TCL_LD_SEARCH_FLAGS} ${TCL_LIB_SPEC} ${TCL_LIBS}" + + @@ -3094,11 +3096,11 @@ with_krb="${withval}" fi |