From b575453554c0bac53218f51a03418f4d39abfb60 Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Mon, 29 May 2000 02:36:54 +0000
Subject: Update to version 1.2.10.
PR: 18841
Submitted by: R\xe9mi Guyomarch <rguyom@321.net>
---
net/openldap/Makefile | 5 +++--
net/openldap/distinfo | 2 +-
net/openldap/files/patch-aa | 12 ++++++++++++
net/openldap/files/patch-ab | 8 ++++++++
net/openldap/files/patch-ac | 12 ++++++++++++
net/openldap/files/patch-db | 14 +++++++-------
6 files changed, 43 insertions(+), 10 deletions(-)
create mode 100644 net/openldap/files/patch-aa
create mode 100644 net/openldap/files/patch-ab
create mode 100644 net/openldap/files/patch-ac
(limited to 'net/openldap')
diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index 9a7cf89..cfdaaf6 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-PORTVERSION= 1.2.9
+PORTVERSION= 1.2.10
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
@@ -25,10 +25,11 @@ MAINTAINER= ulmo@earthling.net
BUILD_DEPENDS= ${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \
LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+= --enable-ldbm --with-ldbm-api=db2
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=/var/run --enable-shared --enable-dns
+CONFIGURE_ARGS+= --localstatedir=/var/run --enable-shared --enable-dns
# Include tcp-wrapper support
.if exists(/usr/include/tcpd.h)
diff --git a/net/openldap/distinfo b/net/openldap/distinfo
index 680f37b..9bc43a3 100644
--- a/net/openldap/distinfo
+++ b/net/openldap/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.2.9.tgz) = d6ef63849c5a5367cfac84f99a0263e2
+MD5 (openldap-1.2.10.tgz) = d4b904a4da62bbfb2110dfc0cddb6b90
diff --git a/net/openldap/files/patch-aa b/net/openldap/files/patch-aa
new file mode 100644
index 0000000..22b7d8d
--- /dev/null
+++ b/net/openldap/files/patch-aa
@@ -0,0 +1,12 @@
+--- build/lib-shared.mk~ Thu May 25 22:46:57 2000
++++ build/lib-shared.mk Thu May 25 22:50:24 2000
+@@ -20,5 +20,9 @@
+ (d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
+ $(RM) ../`$(BASENAME) $@ .la`.a; \
+ (d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
++ # If we want our binaries to link dynamically with libldap{,_r} liblber...
++ # We also symlink the .so.# so we can run the tests without installing
++ (d=`$(PWD)`; t=`$(BASENAME) $@ .la`.so; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
++ (d=`$(PWD)`; b=`$(BASENAME) $@ .la`; t=`ls $$d/.libs/$$b.so.?`; $(LN_S) `$(BASENAME) $$d`/.libs/`$(BASENAME) $$t` ../`$(BASENAME) $$t`)
+
+ Makefile: $(top_srcdir)/build/lib-shared.mk
diff --git a/net/openldap/files/patch-ab b/net/openldap/files/patch-ab
new file mode 100644
index 0000000..0e6d89b
--- /dev/null
+++ b/net/openldap/files/patch-ab
@@ -0,0 +1,8 @@
+--- tests/scripts/defines.sh~ Wed May 26 02:06:42 1999
++++ tests/scripts/defines.sh Thu May 25 22:53:23 2000
+@@ -53,3 +53,5 @@
+ ACLOUTMASTER=$DATADIR/acl.out.master
+ REPLOUTMASTER=$DATADIR/repl.out.master
+ MODSRCHFILTERS=$DATADIR/modify.search.filters
++# Just in case we linked the binaries dynamically
++export LD_LIBRARY_PATH=`pwd`/../libraries
diff --git a/net/openldap/files/patch-ac b/net/openldap/files/patch-ac
new file mode 100644
index 0000000..e491cbc
--- /dev/null
+++ b/net/openldap/files/patch-ac
@@ -0,0 +1,12 @@
+--- build/lib.mk~ Thu Jan 7 18:36:30 1999
++++ build/lib.mk Thu May 25 22:58:26 2000
+@@ -27,7 +27,8 @@
+ clean-common: FORCE
+ $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
+ $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
+- *.o *.lo a.out core version.c .libs/*
++ *.o *.lo a.out core version.c .libs/* \
++ ../`$(BASENAME) $(LIBRARY) .la`.so*
+
+ depend-common: FORCE
+ $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
diff --git a/net/openldap/files/patch-db b/net/openldap/files/patch-db
index 489f067..c04351b 100644
--- a/net/openldap/files/patch-db
+++ b/net/openldap/files/patch-db
@@ -1,13 +1,13 @@
---- configure.orig Mon Jan 17 11:53:36 2000
-+++ configure Thu Mar 2 18:40:40 2000
-@@ -6011,14 +6011,14 @@
+--- configure~ Fri Mar 10 22:18:23 2000
++++ configure Thu May 25 23:48:13 2000
+@@ -6113,14 +6113,14 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_LIBS="$LIBS"
- echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6
--echo "configure:6016: checking for db_open in -ldb" >&5
+-echo "configure:6118: checking for db_open in -ldb" >&5
+ echo $ac_n "checking for db_open in -ldb2""... $ac_c" 1>&6
-+echo "configure:6016: checking for db_open in -ldb2" >&5
++echo "configure:6118: checking for db_open in -ldb2" >&5
ac_lib_var=`echo db'_'db_open | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,9 +16,9 @@
-LIBS="-ldb $LIBS"
+LIBS="-ldb2 $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 6024 "configure"
+ #line 6126 "configure"
#include "confdefs.h"
-@@ -6046,7 +6046,7 @@
+@@ -6148,7 +6148,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
--
cgit v1.1