summaryrefslogtreecommitdiff
path: root/mail/cyrus-imapd23
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1998-02-15 12:14:15 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1998-02-15 12:14:15 +0000
commitfc02bf58cb8cd1964e153514efe43455319301a8 (patch)
tree7e9592659e9af422658c99c09ad5408c780df2d2 /mail/cyrus-imapd23
parentUpdate port to get patches from new site, and include all the new (diff)
Unbreak cyrus port.
Submitted by: Ian Vaudrey <i.vaudrey@bigfoot.com> PR: 4729
Notes
Notes: svn path=/head/; revision=9727
Diffstat (limited to 'mail/cyrus-imapd23')
-rw-r--r--mail/cyrus-imapd23/Makefile24
-rw-r--r--mail/cyrus-imapd23/files/patch-bb13
-rw-r--r--mail/cyrus-imapd23/files/patch-bc11
-rw-r--r--mail/cyrus-imapd23/files/patch-bd13
-rw-r--r--mail/cyrus-imapd23/files/patch-be13
-rw-r--r--mail/cyrus-imapd23/pkg-plist6
6 files changed, 62 insertions, 18 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 44f94224f855..979f24525b8d 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -3,7 +3,7 @@
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.ORG
#
-# $Id: Makefile,v 1.2 1997/09/02 09:46:50 max Exp $
+# $Id: Makefile,v 1.3 1997/11/22 01:11:27 asami Exp $
#
DISTNAME= cyrus-imapd-v1.5.2
@@ -13,13 +13,15 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= jfitz@FreeBSD.ORG
+LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
-BROKEN= tcl
-
HAS_CONFIGURE= YES
CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
- --with-cyrus-group=cyrus
+ --with-cyrus-group=cyrus \
+ --with-tcl=${PREFIX} \
+ --with-login=unix_pwcheck \
+ --with-auth=unix
MAN1= cyradm.1
MAN3= imclient.3
@@ -35,12 +37,14 @@ pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
post-install:
- ${MKDIR} ${PREFIX}/share/doc/cyrus/html
@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${PREFIX}/share/doc/cyrus/html
.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
.endfor
${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+.endif
${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
${MKDIR} -p -m 750 /var/spool/imap
/usr/sbin/chown cyrus.cyrus /var/spool/imap
@@ -58,13 +62,9 @@ post-install:
${PREFIX}/etc/imap/msg
/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
- echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/cyrus.sh
- echo "#" >> ${PREFIX}/etc/rc.d/cyrus.sh
- echo "" >> ${PREFIX}/etc/rc.d/cyrus.sh
- echo "if [ -x ${PREFIX}/cyrus/bin/pwcheck ]" >> ${PREFIX}/etc/rc.d/cyrus.sh
- echo "then" >> ${PREFIX}/etc/rc.d/cyrus.sh
- echo " ${PREFIX}/cyrus/bin/pwcheck & && echo -n ' pwcheck'" >> ${PREFIX}/etc/rc.d/cyrus.sh
- echo "fi" >> ${PREFIX}/etc/rc.d/cyrus.sh
+ cat ${FILESDIR}/cyrus.sh.pt1 > ${PREFIX}/etc/rc.d/cyrus.sh
+ echo PREFIX=${PREFIX} >> ${PREFIX}/etc/rc.d/cyrus.sh
+ cat ${FILESDIR}/cyrus.sh.pt2 >> ${PREFIX}/etc/rc.d/cyrus.sh
/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/files/patch-bb b/mail/cyrus-imapd23/files/patch-bb
new file mode 100644
index 000000000000..c690f73c4803
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-bb
@@ -0,0 +1,13 @@
+--- cyradm/Makefile.in.orig Sat Dec 21 02:07:57 1996
++++ cyradm/Makefile.in Wed Oct 8 13:56:57 1997
+@@ -21,8 +21,8 @@
+ RANLIB = @RANLIB@
+
+ DEFS = @DEFS@
+-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
+-LIBS = @LIBS@ @TCLLIBS@
++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@
++LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
+
+ CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc
new file mode 100644
index 000000000000..8c548bfb290d
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-bc
@@ -0,0 +1,11 @@
+--- imap/Makefile.in.orig Thu Mar 13 10:23:01 1997
++++ imap/Makefile.in Wed Oct 8 13:56:57 1997
+@@ -34,7 +34,7 @@
+ CYRUS_USER=@cyrus_user@
+ CYRUS_GROUP=@cyrus_group@
+
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
+ CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
+ LIBS = @LIBS@
+ DEPLIBS = ../et/libcom_err.a ../lib/libcyrus.a @DEPLIBS@
diff --git a/mail/cyrus-imapd23/files/patch-bd b/mail/cyrus-imapd23/files/patch-bd
new file mode 100644
index 000000000000..3268e64bb08a
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-bd
@@ -0,0 +1,13 @@
+--- imap/config.c.orig Sat Dec 21 02:08:11 1996
++++ imap/config.c Wed Oct 8 13:56:58 1997
+@@ -23,7 +23,9 @@
+
+ extern int errno;
+
+-#define CONFIG_FILENAME "/etc/imapd.conf"
++#if !defined(CONFIG_FILENAME)
++ #define CONFIG_FILENAME "/etc/imapd.conf"
++#endif
+
+ struct configlist {
+ char *key;
diff --git a/mail/cyrus-imapd23/files/patch-be b/mail/cyrus-imapd23/files/patch-be
new file mode 100644
index 000000000000..707298b92662
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-be
@@ -0,0 +1,13 @@
+--- imap/krbck.c.orig Sat Dec 21 02:08:21 1996
++++ imap/krbck.c Wed Oct 8 13:56:58 1997
+@@ -29,7 +29,9 @@
+
+ #define EXIT_CHOKE (int) 10
+
+-#define CONFIG_FILENAME "/etc/imapd.conf"
++#if !defined(CONFIG_FILENAME)
++ #define CONFIG_FILENAME "/etc/imapd.conf"
++#endif
+ #define MAX_FILENAME_LEN 255
+
+ int errno;
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 140dcbb474dc..27ff6f836c4d 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -62,12 +62,6 @@ share/doc/cyrus/install
share/doc/cyrus/overview
share/doc/cyrus/quota-extension
share/doc/cyrus/server-design
-@dirrm etc/imap/user
-@dirrm etc/imap/quota
-@dirrm etc/imap/proc
-@dirrm etc/imap/log
-@dirrm etc/imap/msg
-@dirrm etc/imap
@dirrm include/cyrus
@dirrm cyrus/bin
@dirrm cyrus