aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authoroliver <oliver@FreeBSD.org>2004-03-17 02:51:29 +0800
committeroliver <oliver@FreeBSD.org>2004-03-17 02:51:29 +0800
commit37d4074b870f45ec39bc9701ce6676b1b34d415e (patch)
tree6b9a4d026169a512f2c5d3c9ab00307519cff69c /mail
parent2c133e8796be6bea2d24b701a39e30698d80ca33 (diff)
downloadfreebsd-ports-gnome-37d4074b870f45ec39bc9701ce6676b1b34d415e.tar.gz
freebsd-ports-gnome-37d4074b870f45ec39bc9701ce6676b1b34d415e.tar.zst
freebsd-ports-gnome-37d4074b870f45ec39bc9701ce6676b1b34d415e.zip
fix build in case WITH_LDAP is specified
Noted By: Damir Horvat <damir@x-si.org>, sudv@protek37.kem.ru
Diffstat (limited to 'mail')
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/courier-imap/files/patch-ldap24
2 files changed, 18 insertions, 10 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 40de5a0032b0..4801af5c9fa4 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -192,8 +192,8 @@ EXTRA_DOCS= README INSTALL AUTHORS imap/ChangeLog
post-patch:
@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
${WRKSRC}/liblock/configure
- @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g' \
- ${WRKSRC}/authlib/configure
+ @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/authlib/configure
@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
${WRKSRC}/authlib/installlist.in
@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
diff --git a/mail/courier-imap/files/patch-ldap b/mail/courier-imap/files/patch-ldap
index 0fd212c70cdb..dd788f580a39 100644
--- a/mail/courier-imap/files/patch-ldap
+++ b/mail/courier-imap/files/patch-ldap
@@ -1,13 +1,21 @@
---- authlib/configure.orig Mon Apr 8 23:36:04 2002
-+++ authlib/configure Mon Apr 8 23:35:24 2002
-@@ -554,6 +554,10 @@
- > $cache_file
+--- authlib/configure.orig Wed Mar 3 05:54:13 2004
++++ authlib/configure Tue Mar 16 19:36:40 2004
+@@ -1268,6 +1268,10 @@
+ { (exit 1); exit 1; }; }
fi
-+CFLAGS="$CFLAGS -I/usr/local/include"
-+CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+LDFLAGS="-L/usr/local/lib $LDFLAGS"
++CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
++CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
++LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
+
ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -5088,6 +5092,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif