[21421] trunk/dports/mail/dovecot

[source_changes at macosforge.org]

Revision: 21421
          http://trac.macosforge.org/projects/macports/changeset/21421
Author:   jberry at macports.org
Date:     2007-01-23 21:14:15 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------
Update dovecot --> 1.0.rc19. Hardlinks avoidance for HFS has been adopted upstream, and 1.0 is nigh.

Modified Paths:
--------------
    trunk/dports/mail/dovecot/Portfile

Removed Paths:
-------------
    trunk/dports/mail/dovecot/files/patch-avoid-hardlinks.diff

Modified: trunk/dports/mail/dovecot/Portfile
===================================================================
--- trunk/dports/mail/dovecot/Portfile	2007-01-24 05:13:00 UTC (rev 21420)
+++ trunk/dports/mail/dovecot/Portfile	2007-01-24 05:14:15 UTC (rev 21421)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                dovecot
-version             1.0.rc15
+version             1.0.rc19
 epoch               20060722
 
 categories          mail
@@ -20,9 +20,9 @@
 
 master_sites        ${homepage}releases/
 distname            dovecot-${version}
-checksums           rmd160  904ef7d1f0fbfe8055f13d9036f7107f498b522e \
-                    sha1    9b618d0c1562aa64bd1e055ffa9fe5f2412514af \
-                    md5     26f3d2b075856b1b1d180146363819e6
+checksums           rmd160  feb9e5927ab2c651273c9aaec1727b894a5a6e17 \
+                    sha1    c9c41ed83c775e8eecc40fe13bab135261383b82 \
+                    md5     f2c1df951f3e9bd61aa51890ab158ab7
 
 depends_lib         port:libiconv \
 					port:pkgconfig \
@@ -59,12 +59,6 @@
     configure.args-append --with-ioloop=kqueue
 }
 
-platform darwin {
-	# Patch to avoid making hardlinks, which perform poorly on hfs+
-	patchfiles-append patch-avoid-hardlinks.diff
-	configure.args-append CFLAGS=-DAVOID_HARDLINKS
-}
-
 variant postgres    {   
     depends_lib-append  port:postgresql8
     configure.args-append   --with-pgsql

Deleted: trunk/dports/mail/dovecot/files/patch-avoid-hardlinks.diff
===================================================================
--- trunk/dports/mail/dovecot/files/patch-avoid-hardlinks.diff	2007-01-24 05:13:00 UTC (rev 21420)
+++ trunk/dports/mail/dovecot/files/patch-avoid-hardlinks.diff	2007-01-24 05:14:15 UTC (rev 21421)
@@ -1,79 +0,0 @@
-Index: src/lib/file-copy.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/lib/file-copy.c,v
-retrieving revision 1.1.2.3
-diff -u -r1.1.2.3 file-copy.c
---- src/lib/file-copy.c	1 Jul 2006 17:45:16 -0000	1.1.2.3
-+++ src/lib/file-copy.c	9 Aug 2006 22:54:17 -0000
-@@ -20,6 +20,10 @@
- 	int fd_in, fd_out;
- 	off_t ret;
- 
-+#ifdef AVOID_HARDLINKS
-+	try_hardlink = FALSE;
-+#endif
-+
- 	if (try_hardlink) {
- 		/* see if hardlinking works */
- 		if (link(srcpath, tmppath) == 0)
-Index: src/lib/file-dotlock.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/lib/file-dotlock.c,v
-retrieving revision 1.35.2.3
-diff -u -r1.35.2.3 file-dotlock.c
---- src/lib/file-dotlock.c	8 Jun 2006 16:13:46 -0000	1.35.2.3
-+++ src/lib/file-dotlock.c	9 Aug 2006 22:54:17 -0000
-@@ -401,9 +401,13 @@
- 			if ((flags & DOTLOCK_CREATE_FLAG_CHECKONLY) != 0)
- 				break;
- 
--			ret = set->use_excl_lock ?
--				try_create_lock_excl(&lock_info, write_pid) :
--				try_create_lock_hardlink(&lock_info, write_pid,
-+			ret = 
-+#ifdef AVOID_HARDLINKS
-+				TRUE || 
-+#endif
-+				set->use_excl_lock ?
-+					try_create_lock_excl(&lock_info, write_pid) :
-+					try_create_lock_hardlink(&lock_info, write_pid,
- 							 tmp_path);
- 			if (ret != 0)
- 				break;
-Index: src/lib-storage/index/maildir/maildir-save.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
-retrieving revision 1.70.2.2
-diff -u -r1.70.2.2 maildir-save.c
---- src/lib-storage/index/maildir/maildir-save.c	1 Jul 2006 18:33:03 -0000	1.70.2.2
-+++ src/lib-storage/index/maildir/maildir-save.c	9 Aug 2006 22:54:18 -0000
-@@ -72,6 +72,20 @@
- 		t_strconcat(ctx->newdir, "/", destname, NULL) :
- 		t_strconcat(ctx->curdir, "/", destname, NULL);
- 
-+#ifdef AVOID_HARDLINKS
-+	if (rename(tmp_path, new_path) == 0)
-+		ret = 0;
-+	else {
-+		ret = -1;
-+		if (ENOSPACE(errno)) {
-+			mail_storage_set_error(STORAGE(ctx->mbox->storage),
-+					       "Not enough disk space");
-+		} else {
-+			mail_storage_set_critical(STORAGE(ctx->mbox->storage),
-+				"rename(%s, %s) failed: %m", tmp_path, new_path);
-+		}
-+	}
-+#else
- 	if (link(tmp_path, new_path) == 0)
- 		ret = 0;
- 	else {
-@@ -89,6 +103,8 @@
- 		mail_storage_set_critical(STORAGE(ctx->mbox->storage),
- 			"unlink(%s) failed: %m", tmp_path);
- 	}
-+#endif
-+
- 	t_pop();
- 	return ret;
- }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070123/ca38ce70/attachment.html