[53675] trunk/dports/mail/imap-uw

[snc at macports.org]

Revision: 53675
          http://trac.macports.org/changeset/53675
Author:   snc at macports.org
Date:     2009-07-11 11:17:52 -0700 (Sat, 11 Jul 2009)
Log Message:
-----------
applied patches from #20263, successfully built

Modified Paths:
--------------
    trunk/dports/mail/imap-uw/Portfile

Added Paths:
-----------
    trunk/dports/mail/imap-uw/files/patch-Makefile.diff
    trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff

Removed Paths:
-------------
    trunk/dports/mail/imap-uw/files/patch-Makefile
    trunk/dports/mail/imap-uw/files/patch-env_unix.c

Modified: trunk/dports/mail/imap-uw/Portfile
===================================================================
--- trunk/dports/mail/imap-uw/Portfile	2009-07-11 16:16:29 UTC (rev 53674)
+++ trunk/dports/mail/imap-uw/Portfile	2009-07-11 18:17:52 UTC (rev 53675)
@@ -1,9 +1,11 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
+
 PortSystem		1.0
 
 name			imap-uw
 version			2007
-revision		1
+revision        2
 categories		mail
 maintainers		nomaintainer
 description		University of Washington IMAP daemon
@@ -41,7 +43,7 @@
 
 # Variant to enable SSL support and plaintext authentication
 variant ssl_plain {
-	patchfiles	patch-Makefile
+	patchfiles	patch-Makefile.diff
 	build.args-append	SSLTYPE=unix
 }
 
@@ -49,7 +51,7 @@
 variant ssl_pam {
 	depends_lib	lib:libssl.0.9:openssl
 
-	patchfiles	patch-Makefile
+	patchfiles	patch-Makefile.diff
 	build.target	oxp
 	build.args-append	SSLTYPE=unix
 
@@ -85,7 +87,7 @@
 
 # Variant to set the default mail subdirectory name to "Mail"
 variant subdir {
-	patchfiles-append	patch-env_unix.c
+	patchfiles-append	patch-env_unix.c.diff
 }
 
 destroot {

Deleted: trunk/dports/mail/imap-uw/files/patch-Makefile
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-Makefile	2009-07-11 16:16:29 UTC (rev 53674)
+++ trunk/dports/mail/imap-uw/files/patch-Makefile	2009-07-11 18:17:52 UTC (rev 53675)
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Feb 28 23:16:55 2003
-+++ Makefile	Fri Feb 28 23:18:00 2003
-@@ -396,9 +396,9 @@
- 	@echo + In order to rectify this problem, you MUST build with:
- 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
--	@echo
--	@echo Do you want to continue this build anyway?  Type y or n please:
--	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-+#	@echo
-+#	@echo Do you want to continue this build anyway?  Type y or n please:
-+#	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
- 
- sslnone:
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Added: trunk/dports/mail/imap-uw/files/patch-Makefile.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/mail/imap-uw/files/patch-Makefile.diff	2009-07-11 18:17:52 UTC (rev 53675)
@@ -0,0 +1,15 @@
+--- Makefile.orig	Fri Feb 28 23:16:55 2003
++++ Makefile	Fri Feb 28 23:18:00 2003
+@@ -570,9 +570,9 @@
+ 	@echo + In order to rectify this problem, you MUST build with:
+ 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-	@echo
+-	@echo Do you want to continue this build anyway?  Type y or n please:
+-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
++#	@echo
++#	@echo Do you want to continue this build anyway?  Type y or n please:
++#	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
+ 
+ nounenc:
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Deleted: trunk/dports/mail/imap-uw/files/patch-env_unix.c
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-env_unix.c	2009-07-11 16:16:29 UTC (rev 53674)
+++ trunk/dports/mail/imap-uw/files/patch-env_unix.c	2009-07-11 18:17:52 UTC (rev 53675)
@@ -1,11 +0,0 @@
---- src/osdep/unix/env_unix.c-orig	Wed Nov  5 17:09:13 2003
-+++ src/osdep/unix/env_unix.c	Wed Nov  5 17:11:16 2003
-@@ -29,7 +29,7 @@
- static char *myMailboxDir = NIL;/* mailbox directory name */
- static char *myLocalHost = NIL;	/* local host name */
- static char *myNewsrc = NIL;	/* newsrc file name */
--static char *mailsubdir = NIL;	/* mail subdirectory name */
-+static char *mailsubdir = "Mail";	/* mail subdirectory name */
- static char *sysInbox = NIL;	/* system inbox name */
- static char *newsActive = NIL;	/* news active file */
- static char *newsSpool = NIL;	/* news spool */

Added: trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff	                        (rev 0)
+++ trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff	2009-07-11 18:17:52 UTC (rev 53675)
@@ -0,0 +1,11 @@
+--- src/osdep/unix/env_unix.c-orig	Wed Nov  5 17:09:13 2003
++++ src/osdep/unix/env_unix.c	Wed Nov  5 17:11:16 2003
+@@ -68,7 +68,7 @@
+ static char *myServerName = NIL;/* server name */
+ static char *myLocalHost = NIL;	/* local host name */
+ static char *myNewsrc = NIL;	/* newsrc file name */
+-static char *mailsubdir = NIL;	/* mailbox subdirectory name */
++static char *mailsubdir = "Mail";	/* mailbox subdirectory name */
+ static char *sysInbox = NIL;	/* system inbox name */
+ static char *newsActive = NIL;	/* news active file */
+ static char *newsSpool = NIL;	/* news spool */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090711/6b917ece/attachment-0001.html>