Revision: 99156 http://trac.macports.org//changeset/99156 Author: jmr@macports.org Date: 2012-10-28 14:18:59 -0700 (Sun, 28 Oct 2012) Log Message: ----------- mailsync: fix build on 10.6+ (#36310) Modified Paths: -------------- trunk/dports/mail/mailsync/Portfile trunk/dports/mail/mailsync/files/patch-configure Added Paths: ----------- trunk/dports/mail/mailsync/files/patch-configure-oldpam Modified: trunk/dports/mail/mailsync/Portfile =================================================================== --- trunk/dports/mail/mailsync/Portfile 2012-10-28 20:31:06 UTC (rev 99155) +++ trunk/dports/mail/mailsync/Portfile 2012-10-28 21:18:59 UTC (rev 99156) @@ -29,4 +29,9 @@ --mandir=${prefix}/share/man configure.cppflags "-I${prefix}/include/c-client" -patchfiles patch-configure +platform darwin { + patchfiles-append patch-configure + if {${os.major} <= 9} { + patchfiles-append patch-configure-oldpam + } +} Modified: trunk/dports/mail/mailsync/files/patch-configure =================================================================== --- trunk/dports/mail/mailsync/files/patch-configure 2012-10-28 20:31:06 UTC (rev 99155) +++ trunk/dports/mail/mailsync/files/patch-configure 2012-10-28 21:18:59 UTC (rev 99156) @@ -18,33 +18,6 @@ PAM_LDFLAGS="-L${p}" echo "$as_me:$LINENO: result: found in ${p}" >&5 echo "${ECHO_T}found in ${p}" >&6 -@@ -5343,7 +5343,7 @@ - echo "$as_me:$LINENO: checking for pam headers" >&5 - echo $ECHO_N "checking for pam headers... $ECHO_C" >&6 - for p in `eval "echo {${PAMLOCATIONS}}{/include,/include/pam,,/pam}"` ; do -- if test -r "${p}/security/pam_appl.h" ; then -+ if test -r "${p}/pam_appl.h"; then - PAM_INCLUDES="-I${p}" - echo "$as_me:$LINENO: result: found in ${p}" >&5 - echo "${ECHO_T}found in ${p}" >&6 -@@ -5374,7 +5374,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- #include <security/pam_appl.h> -+ #include <pam_appl.h> - main(int argc,char **argv) { - } - -@@ -5447,7 +5447,7 @@ - - - -- CCLIENTLOCATIONS="/usr,/usr/local" -+ CCLIENTLOCATIONS="/usr,/usr/local,/opt/local" - HAVE_CCLIENT="no" - CCLIENT_LIBS="" - CCLIENT_INCLUDES="" @@ -5496,8 +5496,8 @@ { (exit 1); exit 1; }; } Added: trunk/dports/mail/mailsync/files/patch-configure-oldpam =================================================================== --- trunk/dports/mail/mailsync/files/patch-configure-oldpam (rev 0) +++ trunk/dports/mail/mailsync/files/patch-configure-oldpam 2012-10-28 21:18:59 UTC (rev 99156) @@ -0,0 +1,20 @@ +--- configure.orig 2004-06-30 01:04:12.000000000 -0700 ++++ configure 2008-01-08 23:40:58.000000000 -0800 +@@ -5343,7 +5343,7 @@ + echo "$as_me:$LINENO: checking for pam headers" >&5 + echo $ECHO_N "checking for pam headers... $ECHO_C" >&6 + for p in `eval "echo {${PAMLOCATIONS}}{/include,/include/pam,,/pam}"` ; do +- if test -r "${p}/security/pam_appl.h" ; then ++ if test -r "${p}/pam/pam_appl.h"; then + PAM_INCLUDES="-I${p}" + echo "$as_me:$LINENO: result: found in ${p}" >&5 + echo "${ECHO_T}found in ${p}" >&6 +@@ -5374,7 +5374,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +- #include <security/pam_appl.h> ++ #include <pam/pam_appl.h> + main(int argc,char **argv) { + } +