workaround for changed soname versioning (OpenLDAP ITS#3016)

Spotted by:	Andrzej Tobola <A.Tobola@wilk.2a.pl>

9 files changed, 81 insertions, 27 deletions

diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 8e5b7557c1e8..dc4e1c53c91f 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -40,7 +40,7 @@ BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
 .endif
 
 .if defined(CLIENT_ONLY)
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-client
 OPENLDAP_PKGFILESUFX?=	.client
 
@@ -52,7 +52,7 @@ PORTDOCS=		drafts rfc
 .error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
 .endif
 .else
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-server
 OPENLDAP_PKGFILESUFX?=
 
@@ -255,7 +255,7 @@ post-patch:
 		${WRKSRC}/servers/slapd/slapd.conf
 
 pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.'`" ]; then \
+	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
 		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
 		${FALSE}; \
 	fi
diff --git a/net/openldap22-server/files/patch-build::top.mk b/net/openldap22-server/files/patch-build::top.mk
index 94551ea27b27..7eab45e9ea09 100644
--- a/net/openldap22-server/files/patch-build::top.mk
+++ b/net/openldap22-server/files/patch-build::top.mk
@@ -1,11 +1,20 @@
---- build/top.mk.orig	Mon Apr  7 22:23:26 2003
-+++ build/top.mk	Mon Jul  7 05:35:52 2003
-@@ -192,6 +192,8 @@
+--- build/top.mk.orig	Wed Mar 17 21:15:31 2004
++++ build/top.mk	Wed Mar 24 03:37:31 2004
+@@ -68,7 +68,7 @@
+ 
+ LIBTOOL = @LIBTOOL@
+ LIBVERSION = @OPENLDAP_LIBVERSION@
+-LTVERSION = -release $(LIBVERSION)
++LTVERSION = -version-info $(LIBVERSION)
+ 
+ # libtool --only flag for libraries: platform specific
+ NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
+@@ -190,6 +190,8 @@
+ 
  SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
  SLURPD_LIBS = @SLURPD_LIBS@
- 
-+SLAPI_LIBS = @SLAPI_LIBS@
 +
++SLAPI_LIBS = @SLAPI_LIBS@
+ 
  # Our Defaults
  CC = $(AC_CC)
- DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
diff --git a/net/openldap22-server/files/patch-build::version.var b/net/openldap22-server/files/patch-build::version.var
new file mode 100644
index 000000000000..022f3ee19538
--- /dev/null
+++ b/net/openldap22-server/files/patch-build::version.var
@@ -0,0 +1,9 @@
+--- build/version.var.orig	Wed Mar 24 03:30:40 2004
++++ build/version.var	Wed Mar 24 03:30:55 2004
+@@ -17,5 +17,5 @@
+ ol_minor=2
+ ol_patch=7
+ ol_api_inc=20207
+-ol_api_lib=2.2.7
++ol_api_lib=202:7:3
+ ol_release_date="2004/03/22"
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 8e5b7557c1e8..dc4e1c53c91f 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -40,7 +40,7 @@ BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
 .endif
 
 .if defined(CLIENT_ONLY)
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-client
 OPENLDAP_PKGFILESUFX?=	.client
 
@@ -52,7 +52,7 @@ PORTDOCS=		drafts rfc
 .error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
 .endif
 .else
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-server
 OPENLDAP_PKGFILESUFX?=
 
@@ -255,7 +255,7 @@ post-patch:
 		${WRKSRC}/servers/slapd/slapd.conf
 
 pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.'`" ]; then \
+	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
 		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
 		${FALSE}; \
 	fi
diff --git a/net/openldap23-server/files/patch-build::top.mk b/net/openldap23-server/files/patch-build::top.mk
index 94551ea27b27..7eab45e9ea09 100644
--- a/net/openldap23-server/files/patch-build::top.mk
+++ b/net/openldap23-server/files/patch-build::top.mk
@@ -1,11 +1,20 @@
---- build/top.mk.orig	Mon Apr  7 22:23:26 2003
-+++ build/top.mk	Mon Jul  7 05:35:52 2003
-@@ -192,6 +192,8 @@
+--- build/top.mk.orig	Wed Mar 17 21:15:31 2004
++++ build/top.mk	Wed Mar 24 03:37:31 2004
+@@ -68,7 +68,7 @@
+ 
+ LIBTOOL = @LIBTOOL@
+ LIBVERSION = @OPENLDAP_LIBVERSION@
+-LTVERSION = -release $(LIBVERSION)
++LTVERSION = -version-info $(LIBVERSION)
+ 
+ # libtool --only flag for libraries: platform specific
+ NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
+@@ -190,6 +190,8 @@
+ 
  SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
  SLURPD_LIBS = @SLURPD_LIBS@
- 
-+SLAPI_LIBS = @SLAPI_LIBS@
 +
++SLAPI_LIBS = @SLAPI_LIBS@
+ 
  # Our Defaults
  CC = $(AC_CC)
- DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
diff --git a/net/openldap23-server/files/patch-build::version.var b/net/openldap23-server/files/patch-build::version.var
new file mode 100644
index 000000000000..022f3ee19538
--- /dev/null
+++ b/net/openldap23-server/files/patch-build::version.var
@@ -0,0 +1,9 @@
+--- build/version.var.orig	Wed Mar 24 03:30:40 2004
++++ build/version.var	Wed Mar 24 03:30:55 2004
+@@ -17,5 +17,5 @@
+ ol_minor=2
+ ol_patch=7
+ ol_api_inc=20207
+-ol_api_lib=2.2.7
++ol_api_lib=202:7:3
+ ol_release_date="2004/03/22"
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 8e5b7557c1e8..dc4e1c53c91f 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -40,7 +40,7 @@ BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
 .endif
 
 .if defined(CLIENT_ONLY)
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-client
 OPENLDAP_PKGFILESUFX?=	.client
 
@@ -52,7 +52,7 @@ PORTDOCS=		drafts rfc
 .error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
 .endif
 .else
-OPENLDAP_PORTVERSION=	0
+OPENLDAP_PORTVERSION=	1
 OPENLDAP_PKGNAMESUFFIX?=-server
 OPENLDAP_PKGFILESUFX?=
 
@@ -255,7 +255,7 @@ post-patch:
 		${WRKSRC}/servers/slapd/slapd.conf
 
 pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.'`" ]; then \
+	@if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \
 		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
 		${FALSE}; \
 	fi
diff --git a/net/openldap24-server/files/patch-build::top.mk b/net/openldap24-server/files/patch-build::top.mk
index 94551ea27b27..7eab45e9ea09 100644
--- a/net/openldap24-server/files/patch-build::top.mk
+++ b/net/openldap24-server/files/patch-build::top.mk
@@ -1,11 +1,20 @@
---- build/top.mk.orig	Mon Apr  7 22:23:26 2003
-+++ build/top.mk	Mon Jul  7 05:35:52 2003
-@@ -192,6 +192,8 @@
+--- build/top.mk.orig	Wed Mar 17 21:15:31 2004
++++ build/top.mk	Wed Mar 24 03:37:31 2004
+@@ -68,7 +68,7 @@
+ 
+ LIBTOOL = @LIBTOOL@
+ LIBVERSION = @OPENLDAP_LIBVERSION@
+-LTVERSION = -release $(LIBVERSION)
++LTVERSION = -version-info $(LIBVERSION)
+ 
+ # libtool --only flag for libraries: platform specific
+ NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
+@@ -190,6 +190,8 @@
+ 
  SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
  SLURPD_LIBS = @SLURPD_LIBS@
- 
-+SLAPI_LIBS = @SLAPI_LIBS@
 +
++SLAPI_LIBS = @SLAPI_LIBS@
+ 
  # Our Defaults
  CC = $(AC_CC)
- DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
diff --git a/net/openldap24-server/files/patch-build::version.var b/net/openldap24-server/files/patch-build::version.var
new file mode 100644
index 000000000000..022f3ee19538
--- /dev/null
+++ b/net/openldap24-server/files/patch-build::version.var
@@ -0,0 +1,9 @@
+--- build/version.var.orig	Wed Mar 24 03:30:40 2004
++++ build/version.var	Wed Mar 24 03:30:55 2004
+@@ -17,5 +17,5 @@
+ ol_minor=2
+ ol_patch=7
+ ol_api_inc=20207
+-ol_api_lib=2.2.7
++ol_api_lib=202:7:3
+ ol_release_date="2004/03/22"