aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-03-13 08:03:50 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-03-13 08:03:50 +0000
commit48ffecfd7443f8566d20b46f5c8b4e86b3defd1a (patch)
tree77e08477e2f8a8b762146e3a9c208ab68b264cfb
parentf45f1bdd19c0cd9974d80f072f880321d1ce5a1b (diff)
downloadports-48ffecfd7443f8566d20b46f5c8b4e86b3defd1a.tar.gz
ports-48ffecfd7443f8566d20b46f5c8b4e86b3defd1a.zip
Fix ldap handling.
Submitted by: sheldonh
Notes
Notes: svn path=/head/; revision=26791
-rw-r--r--mail/exim-devel/Makefile21
-rw-r--r--mail/exim-devel/files/Makefile6
-rw-r--r--mail/exim-old/Makefile21
-rw-r--r--mail/exim-old/files/Makefile6
-rw-r--r--mail/exim/Makefile21
-rw-r--r--mail/exim/files/Makefile6
6 files changed, 18 insertions, 63 deletions
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 0faf3ed67892..0950523b9d72 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -23,17 +23,12 @@ USE_PERL5= YES
MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
-# Uncomment the USE_LDAP, USE_MYSQL and USE_PAM definitions to link against
-# libldap, libmysqlclient and libpam respectively. The libpam linkage is
+# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# libmysqlclient and libpam respectively. The libpam linkage is
# required for SMTP AUTH support.
-#USE_LDAP= YES
#USE_MYSQL= YES
#USE_PAM= YES
-# If USE_LDAP==YES then LDAP_LIB_TYPE should be one of UMICHIGAN, NETSCAPE or
-# SOLARIS7:
-LDAP_LIB_TYPE= UMICHIGAN
-
# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
# must be left uncommented.
PAM_CRAM_MD5= YES
@@ -52,15 +47,6 @@ SEDLIST= -e 's,XX_PREFIX_XX,${PREFIX},' \
SEDLIST+= -e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
.endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -lber -lldap,' \
- -e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
- -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},'
-.else
-SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \
- -e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
-.endif
-
.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,'
@@ -68,8 +54,7 @@ SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,'
.endif
-.if ( !defined(USE_LDAP) || ${USE_LDAP} != YES ) && \
- ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
SEDLIST+= -e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
.endif
diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile
index 9bdafa248abd..cfb2d153222c 100644
--- a/mail/exim-devel/files/Makefile
+++ b/mail/exim-devel/files/Makefile
@@ -321,8 +321,8 @@ LOOKUP_LSEARCH=yes
# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include
# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient
-LOOKUP_INCLUDE=XX_LDAP_INCLUDE_XX XX_MYSQL_INCLUDE_XX
-LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX
# If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
# library you have. Unfortunately, though most of their functions are the
@@ -334,7 +334,7 @@ LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
# LDAP_LIB_TYPE=UMICHIGAN
# LDAP_LIB_TYPE=NETSCAPE
# LDAP_LIB_TYPE=SOLARIS7
-LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
+#LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
# If you don't set any of these, Exim applies a heuristic to distinguish the
# University of Michigan library, but it cannot distinguish between the other
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 0faf3ed67892..0950523b9d72 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -23,17 +23,12 @@ USE_PERL5= YES
MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
-# Uncomment the USE_LDAP, USE_MYSQL and USE_PAM definitions to link against
-# libldap, libmysqlclient and libpam respectively. The libpam linkage is
+# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# libmysqlclient and libpam respectively. The libpam linkage is
# required for SMTP AUTH support.
-#USE_LDAP= YES
#USE_MYSQL= YES
#USE_PAM= YES
-# If USE_LDAP==YES then LDAP_LIB_TYPE should be one of UMICHIGAN, NETSCAPE or
-# SOLARIS7:
-LDAP_LIB_TYPE= UMICHIGAN
-
# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
# must be left uncommented.
PAM_CRAM_MD5= YES
@@ -52,15 +47,6 @@ SEDLIST= -e 's,XX_PREFIX_XX,${PREFIX},' \
SEDLIST+= -e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
.endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -lber -lldap,' \
- -e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
- -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},'
-.else
-SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \
- -e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
-.endif
-
.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,'
@@ -68,8 +54,7 @@ SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,'
.endif
-.if ( !defined(USE_LDAP) || ${USE_LDAP} != YES ) && \
- ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
SEDLIST+= -e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
.endif
diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile
index 9bdafa248abd..cfb2d153222c 100644
--- a/mail/exim-old/files/Makefile
+++ b/mail/exim-old/files/Makefile
@@ -321,8 +321,8 @@ LOOKUP_LSEARCH=yes
# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include
# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient
-LOOKUP_INCLUDE=XX_LDAP_INCLUDE_XX XX_MYSQL_INCLUDE_XX
-LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX
# If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
# library you have. Unfortunately, though most of their functions are the
@@ -334,7 +334,7 @@ LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
# LDAP_LIB_TYPE=UMICHIGAN
# LDAP_LIB_TYPE=NETSCAPE
# LDAP_LIB_TYPE=SOLARIS7
-LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
+#LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
# If you don't set any of these, Exim applies a heuristic to distinguish the
# University of Michigan library, but it cannot distinguish between the other
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0faf3ed67892..0950523b9d72 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -23,17 +23,12 @@ USE_PERL5= YES
MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
-# Uncomment the USE_LDAP, USE_MYSQL and USE_PAM definitions to link against
-# libldap, libmysqlclient and libpam respectively. The libpam linkage is
+# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# libmysqlclient and libpam respectively. The libpam linkage is
# required for SMTP AUTH support.
-#USE_LDAP= YES
#USE_MYSQL= YES
#USE_PAM= YES
-# If USE_LDAP==YES then LDAP_LIB_TYPE should be one of UMICHIGAN, NETSCAPE or
-# SOLARIS7:
-LDAP_LIB_TYPE= UMICHIGAN
-
# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
# must be left uncommented.
PAM_CRAM_MD5= YES
@@ -52,15 +47,6 @@ SEDLIST= -e 's,XX_PREFIX_XX,${PREFIX},' \
SEDLIST+= -e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
.endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -lber -lldap,' \
- -e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
- -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},'
-.else
-SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \
- -e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
-.endif
-
.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,'
@@ -68,8 +54,7 @@ SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,'
.endif
-.if ( !defined(USE_LDAP) || ${USE_LDAP} != YES ) && \
- ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
SEDLIST+= -e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
.endif
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index 9bdafa248abd..cfb2d153222c 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -321,8 +321,8 @@ LOOKUP_LSEARCH=yes
# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include
# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient
-LOOKUP_INCLUDE=XX_LDAP_INCLUDE_XX XX_MYSQL_INCLUDE_XX
-LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX
# If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
# library you have. Unfortunately, though most of their functions are the
@@ -334,7 +334,7 @@ LOOKUP_LIBS=XX_LDAP_LIBS_XX XX_MYSQL_LIBS_XX
# LDAP_LIB_TYPE=UMICHIGAN
# LDAP_LIB_TYPE=NETSCAPE
# LDAP_LIB_TYPE=SOLARIS7
-LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
+#LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
# If you don't set any of these, Exim applies a heuristic to distinguish the
# University of Michigan library, but it cannot distinguish between the other