diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index c70352f5a49..512079d5256 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,23 +1,17 @@ -# $OpenBSD: Makefile,v 1.65 2006/04/08 20:28:36 sturm Exp $ +# $OpenBSD: Makefile,v 1.66 2006/06/19 08:22:35 bernd Exp $ COMMENT= "Open source LDAP software (client)" COMMENT-server= "Open source LDAP software (server)" -DISTNAME= openldap-2.3.11 -FULLPKGNAME= ${DISTNAME:S/-/-client-/}p4 -PKGNAME-server= ${DISTNAME:S/-/-server-/}p4 -SHARED_LIBS= lber-2.3 8.1 \ - lber 8.1 \ - ldap-2.3 8.1 \ - ldap 8.1 \ - ldap_r-2.3 8.1 \ - ldap_r 8.1 -MODGNU_SHARED_LIBS= lber-2.3 '' \ - lber '' \ - ldap-2.3 '' \ - ldap '' \ - ldap_r-2.3 '' \ - ldap_r '' +DISTNAME= openldap-2.3.24 +FULLPKGNAME= ${DISTNAME:S/-/-client-/} +PKGNAME-server= ${DISTNAME:S/-/-server-/} +SHARED_LIBS= lber-2.3 9.0 \ + lber 9.0 \ + ldap-2.3 9.0 \ + ldap 9.0 \ + ldap_r-2.3 9.0 \ + ldap_r 9.0 CATEGORIES= databases net HOMEPAGE= http://www.openldap.org/ diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 949e3f050f7..641fdcbeadc 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -MD5 (openldap-2.3.11.tgz) = fbde128a8421b8d2ea587a25057a281e -RMD160 (openldap-2.3.11.tgz) = 4947c7f15b70dfd55ff30028228ec915064feba1 -SHA1 (openldap-2.3.11.tgz) = e7a4a5b2d50b8138ed835b7e9e722814f1877806 -SIZE (openldap-2.3.11.tgz) = 3657646 +MD5 (openldap-2.3.24.tgz) = 3e58de30abc959ec88730123cecdb6d1 +RMD160 (openldap-2.3.24.tgz) = 8b4be685de2c2a7ace1debe97d5bda2354b57a06 +SHA1 (openldap-2.3.24.tgz) = e00f7a017d9223708b77b0df3a612d236789b380 +SIZE (openldap-2.3.24.tgz) = 3756405 diff --git a/databases/openldap/patches/patch-build_top_mk b/databases/openldap/patches/patch-build_top_mk index ce56d541da5..68d71c5f218 100644 --- a/databases/openldap/patches/patch-build_top_mk +++ b/databases/openldap/patches/patch-build_top_mk @@ -1,24 +1,6 @@ -$OpenBSD: patch-build_top_mk,v 1.3 2005/12/29 14:00:36 bernd Exp $ +$OpenBSD: patch-build_top_mk,v 1.4 2006/06/19 08:22:35 bernd Exp $ --- build/top.mk.orig Mon Aug 29 20:46:17 2005 +++ build/top.mk Wed Dec 28 12:04:37 2005 -@@ -73,7 +73,7 @@ MKVERSION = $(top_srcdir)/build/mkversio - LIBTOOL = @LIBTOOL@ - LIBRELEASE = @OPENLDAP_LIBRELEASE@ - LIBVERSION = @OPENLDAP_LIBVERSION@ --LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION) -+LTVERSION = -release $(LIBRELEASE) - - # libtool --only flag for libraries: platform specific - NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC) -@@ -112,7 +112,7 @@ LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) - $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c - - LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ -- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) -+ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(LIBRARY_LT_VERSION) - - LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ - $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c @@ -121,7 +121,7 @@ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) -- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) diff --git a/databases/openldap/patches/patch-build_version_var b/databases/openldap/patches/patch-build_version_var deleted file mode 100644 index 2fbccca42a5..00000000000 --- a/databases/openldap/patches/patch-build_version_var +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-build_version_var,v 1.1 2005/11/07 15:59:08 mbalmer Exp $ ---- build/version.var.orig Thu Oct 20 13:06:49 2005 -+++ build/version.var Thu Oct 20 13:07:22 2005 -@@ -17,7 +17,7 @@ ol_major=2 - ol_minor=3 - ol_patch=11 - ol_api_inc=20311 --ol_api_current=1 --ol_api_revision=6 -+ol_api_current=8 -+ol_api_revision=1 - ol_api_age=1 - ol_release_date="2005/10/13" diff --git a/databases/openldap/patches/patch-configure b/databases/openldap/patches/patch-configure index 677769ef10a..98780f71f70 100644 --- a/databases/openldap/patches/patch-configure +++ b/databases/openldap/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.2 2005/11/07 15:59:08 mbalmer Exp $ ---- configure.orig Wed Oct 5 20:41:09 2005 -+++ configure Tue Oct 18 14:30:27 2005 -@@ -9443,7 +9443,6 @@ openbsd*) +$OpenBSD: patch-configure,v 1.3 2006/06/19 08:22:35 bernd Exp $ +--- configure.orig Sat Apr 8 19:49:11 2006 ++++ configure Fri Jun 16 11:32:56 2006 +@@ -9478,7 +9478,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.2 2005/11/07 15:59:08 mbalmer Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -34518,6 +34517,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -36188,6 +36187,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/databases/openldap/patches/patch-libraries_liblber_Makefile_in b/databases/openldap/patches/patch-libraries_liblber_Makefile_in deleted file mode 100644 index 6f1219162b5..00000000000 --- a/databases/openldap/patches/patch-libraries_liblber_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libraries_liblber_Makefile_in,v 1.1 2005/12/29 14:00:36 bernd Exp $ ---- libraries/liblber/Makefile.in.orig Wed Dec 28 11:56:03 2005 -+++ libraries/liblber/Makefile.in Wed Dec 28 11:57:47 2005 -@@ -14,6 +14,7 @@ - ## . - - LIBRARY = liblber.la -+LIBRARY_LT_VERSION = $(liblber_la_LDFLAGS) - - NT_SRCS = nt_err.c - NT_OBJS = nt_err.lo diff --git a/databases/openldap/patches/patch-libraries_libldap_Makefile_in b/databases/openldap/patches/patch-libraries_libldap_Makefile_in deleted file mode 100644 index 7229b4b5f09..00000000000 --- a/databases/openldap/patches/patch-libraries_libldap_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libraries_libldap_Makefile_in,v 1.1 2005/12/29 14:00:36 bernd Exp $ ---- libraries/libldap/Makefile.in.orig Wed Dec 28 11:58:46 2005 -+++ libraries/libldap/Makefile.in Wed Dec 28 11:59:01 2005 -@@ -14,6 +14,7 @@ - ## . - - LIBRARY = libldap.la -+LIBRARY_LT_VERSION = $(libldap_la_LDFLAGS) - - PROGRAMS = apitest dntest ftest ltest - diff --git a/databases/openldap/patches/patch-libraries_libldap_r_Makefile_in b/databases/openldap/patches/patch-libraries_libldap_r_Makefile_in deleted file mode 100644 index d949f508824..00000000000 --- a/databases/openldap/patches/patch-libraries_libldap_r_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libraries_libldap_r_Makefile_in,v 1.1 2005/12/29 14:00:36 bernd Exp $ ---- libraries/libldap_r/Makefile.in.orig Wed Dec 28 11:59:21 2005 -+++ libraries/libldap_r/Makefile.in Wed Dec 28 11:59:38 2005 -@@ -14,6 +14,7 @@ - ## . - - LIBRARY = libldap_r.la -+LIBRARY_LT_VERSION = $(libldap_r_la_LDFLAGS) - - PROGRAMS = apitest ltest -