[94385] trunk/dports/mail/alpine
jmr at macports.org
jmr at macports.org
Sun Jun 17 12:28:47 PDT 2012
Revision: 94385
https://trac.macports.org/changeset/94385
Author: jmr at macports.org
Date: 2012-06-17 12:28:44 -0700 (Sun, 17 Jun 2012)
Log Message:
-----------
alpine: fix include/lib paths (#24954)
Modified Paths:
--------------
trunk/dports/mail/alpine/Portfile
trunk/dports/mail/alpine/files/alpine-osx-10.6.patch
Added Paths:
-----------
trunk/dports/mail/alpine/files/patch-imap_Makefile.diff
Modified: trunk/dports/mail/alpine/Portfile
===================================================================
--- trunk/dports/mail/alpine/Portfile 2012-06-17 18:10:57 UTC (rev 94384)
+++ trunk/dports/mail/alpine/Portfile 2012-06-17 19:28:44 UTC (rev 94385)
@@ -22,13 +22,18 @@
use_bzip2 yes
patchfiles patch-Makefile.in.diff \
- patch-configure.diff
+ patch-configure.diff \
+ patch-imap_Makefile.diff
patch.pre_args -p1
if {${os.platform} == "darwin" && ${os.major} >= 10} {
patchfiles-append alpine-osx-10.6.patch
}
+post-patch {
+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/imap/Makefile
+}
+
default_variants +without_tcl
depends_lib \
@@ -49,8 +54,8 @@
-with-krb5-lib-dir=${prefix}/lib \
-with-ldap-include-dir=${prefix}/include \
-with-ldap-lib-dir=${prefix}/lib \
- -with-ssl-include-dir=${prefix}/include \
- -with-ssl-lib-dir=${prefix}/lib \
+ --with-ssl-include-dir=${prefix}/include/openssl \
+ --with-ssl-lib-dir=${prefix}/lib \
--with-local-password-cache-method \
--with-debug-level=0
Modified: trunk/dports/mail/alpine/files/alpine-osx-10.6.patch
===================================================================
--- trunk/dports/mail/alpine/files/alpine-osx-10.6.patch 2012-06-17 18:10:57 UTC (rev 94384)
+++ trunk/dports/mail/alpine/files/alpine-osx-10.6.patch 2012-06-17 19:28:44 UTC (rev 94385)
@@ -1,16 +1,3 @@
-diff -rc alpine-2.00/imap/Makefile alpine-2.00-10.6/imap/Makefile
-*** alpine-2.00/imap/Makefile 2008-06-04 19:43:35.000000000 +0100
---- alpine-2.00-10.6/imap/Makefile 2009-09-02 10:55:38.000000000 +0100
-***************
-*** 418,424 ****
- $(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
---- 418,423 ----
diff -rc alpine-2.00/imap/src/osdep/unix/ckp_pam.c alpine-2.00-10.6/imap/src/osdep/unix/ckp_pam.c
*** alpine-2.00/imap/src/osdep/unix/ckp_pam.c 2008-06-04 19:18:34.000000000 +0100
--- alpine-2.00-10.6/imap/src/osdep/unix/ckp_pam.c 2009-09-02 10:56:36.000000000 +0100
Added: trunk/dports/mail/alpine/files/patch-imap_Makefile.diff
===================================================================
--- trunk/dports/mail/alpine/files/patch-imap_Makefile.diff (rev 0)
+++ trunk/dports/mail/alpine/files/patch-imap_Makefile.diff 2012-06-17 19:28:44 UTC (rev 94385)
@@ -0,0 +1,17 @@
+--- alpine-2.00/imap/Makefile.orig 2008-06-05 04:43:35.000000000 +1000
++++ alpine-2.00/imap/Makefile 2012-06-18 05:05:25.000000000 +1000
+@@ -419,12 +419,12 @@
+ $(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"
++ SPECIALS="SSLINCLUDE=__PREFIX__/include/openssl SSLLIB=__PREFIX__/lib GSSINCLUDE=__PREFIX__/include GSSLIB=__PREFIX__/lib PAMDLFLAGS=-lpam"
+
+ osx: osxok an
+ $(TOUCH) ip6
+ $(BUILD) BUILDTYPE=$@ IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
+- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
++ SPECIALS="SSLINCLUDE=__PREFIX__/include/openssl SSLLIB=__PREFIX__/lib GSSINCLUDE=__PREFIX__/include GSSLIB=__PREFIX__/lib"
+
+ osxok:
+ @$(SH) -c '(test ! -f /usr/include/pam/pam_appl.h ) || make osxwarn'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120617/d2f2a4d5/attachment.html>
More information about the macports-changes
mailing list