6 files changed, 54 insertions, 6 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index c9edfb0e8b84..956b920dacd1 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.2.3
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc
index 9b2b0276a019..b7d414f9fbb2 100644
--- a/mail/cyrus-imapd24/files/patch-bc
+++ b/mail/cyrus-imapd24/files/patch-bc
@@ -1,8 +1,17 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Jul 15 00:56:08 2003
-+++ imap/Makefile.in	Fri Jul 18 00:35:34 2003
-@@ -241,13 +241,13 @@
+--- imap/Makefile.in.orig	Wed Nov 12 13:02:01 2003
++++ imap/Makefile.in	Fri Feb 13 18:36:00 2004
+@@ -135,7 +135,7 @@
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+ 	for file in $(PROGS); \
+ 	do \
+-		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
+ 	done
+ 	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
+ 
+@@ -242,13 +242,13 @@
  	$(CC) $(LDFLAGS) -o mupdate \
  	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
  	 mutex_pthread.o tls.o libimap.a \
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in
new file mode 100644
index 000000000000..e353a147b054
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-master::Makefile.in
@@ -0,0 +1,13 @@
+Index: master/Makefile.in
+diff -u master/Makefile.in.orig master/Makefile.in
+--- master/Makefile.in.orig	Wed Nov 12 13:02:03 2003
++++ master/Makefile.in	Fri Feb 13 18:33:15 2004
+@@ -78,7 +78,7 @@
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+ 	for file in $(PROGS); \
+ 	do \
+-		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++		$(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
+ 	done
+ 
+ .c.o:
diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
new file mode 100644
index 000000000000..d49703fa25b4
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
@@ -0,0 +1,13 @@
+Index: notifyd/Makefile.in
+diff -u notifyd/Makefile.in.orig notifyd/Makefile.in
+--- notifyd/Makefile.in.orig	Wed Nov 12 13:02:10 2003
++++ notifyd/Makefile.in	Fri Feb 13 18:41:07 2004
+@@ -79,7 +79,7 @@
+ all: notifyd
+ 
+ install:
+-	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
++	$(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path)
+ 
+ OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
+ 
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
index d54f608b1f92..52b3737e58bc 100644
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
@@ -1,7 +1,7 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
 --- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
-+++ sieve/Makefile.in	Fri Jan 16 03:47:03 2004
++++ sieve/Makefile.in	Fri Feb 13 18:39:33 2004
 @@ -33,6 +33,7 @@
  YACC = @YACC@
  YFLAGS = -d
@@ -15,7 +15,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  install: sievec
  	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
 -	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -s -m 755 sievec $(DESTDIR)$(service_path) || exit
  
  test: $(DEPLIBS) libsieve.a test.o
  	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
new file mode 100644
index 000000000000..4e0bc2841c2c
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
@@ -0,0 +1,13 @@
+Index: timsieved/Makefile.in
+diff -u timsieved/Makefile.in.orig timsieved/Makefile.in
+--- timsieved/Makefile.in.orig	Wed Nov 12 13:02:14 2003
++++ timsieved/Makefile.in	Fri Feb 13 18:51:17 2004
+@@ -79,7 +79,7 @@
+ all: timsieved
+ 
+ install:
+-	$(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
++	$(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path)
+ 
+ OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
+ 	../imap/tls.o