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

[ryandesign at macports.org]

Revision: 63088
          http://trac.macports.org/changeset/63088
Author:   ryandesign at macports.org
Date:     2010-01-25 16:16:23 -0800 (Mon, 25 Jan 2010)
Log Message:
-----------
imap-uw: fix build on Snow Leopard when not using ssl_pam variant; see #21638

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

Added Paths:
-----------
    trunk/dports/mail/imap-uw/files/patch-snowleopard.diff

Removed Paths:
-------------
    trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_pam.c.diff

Modified: trunk/dports/mail/imap-uw/Portfile
===================================================================
--- trunk/dports/mail/imap-uw/Portfile	2010-01-25 23:58:17 UTC (rev 63087)
+++ trunk/dports/mail/imap-uw/Portfile	2010-01-26 00:16:23 UTC (rev 63088)
@@ -32,12 +32,16 @@
 # Enable IPv6 support
 build.args-append   IP=6
 
+if {"darwin" == ${os.platform} && ${os.major} >= 10} {
+    patchfiles-append   patch-snowleopard.diff
+}
+
 # Default is to enable SSL support and plaintext authentication
 # permitted only in SSL/TLS sessions.
 
 # Variant to enable SSL support and plaintext authentication
 variant ssl_plain description { enable SSL support and plaintext authentication } {
-   patchfiles       patch-Makefile.diff
+   patchfiles-append    patch-Makefile.diff
    build.args-append    SSLTYPE=unix
 }
 
@@ -45,12 +49,8 @@
 variant ssl_pam description { enable SSL with PAM support } {
    depends_lib      lib:libssl.0.9:openssl
 
-   patchfiles       patch-Makefile.diff
+   patchfiles-append    patch-Makefile.diff
 
-    if {${os.major} >= 10} {
-        patchfiles-append   patch-src-osdep-unix-ckp_pam.c.diff
-    }
-
    build.target     oxp
    build.args-append    SSLTYPE=unix
 

Added: trunk/dports/mail/imap-uw/files/patch-snowleopard.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-snowleopard.diff	                        (rev 0)
+++ trunk/dports/mail/imap-uw/files/patch-snowleopard.diff	2010-01-26 00:16:23 UTC (rev 63088)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2008-06-04 13:43:35.000000000 -0500
++++ Makefile	2010-01-25 18:06:19.000000000 -0600
+@@ -418,7 +418,6 @@
+ 	$(TOUCH) ip6
+ 	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
+ 	PASSWDTYPE=pam \
+-	EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
+ 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
+ 
+ osx:	osxok an

Deleted: trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_pam.c.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_pam.c.diff	2010-01-25 23:58:17 UTC (rev 63087)
+++ trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_pam.c.diff	2010-01-26 00:16:23 UTC (rev 63088)
@@ -1,16 +0,0 @@
-*** src/osdep/unix/ckp_pam.c.orig	Sat Sep 26 15:40:19 2009
---- src/osdep/unix/ckp_pam.c	Sat Sep 26 15:40:54 2009
-***************
-*** 27,37 ****
-   */
-  
-  
-- #ifdef MAC_OSX_KLUDGE		/* why can't Apple be compatible? */
-- #include <pam/pam_appl.h>
-- #else
-  #include <security/pam_appl.h>
-- #endif
-  
-  struct checkpw_cred {
-    char *uname;			/* user name */
---- 27,33 ----
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100125/436b3529/attachment.html>