[pkgsrc/trunk]: pkgsrc/databases/openldap fix avl_* function prototype confli...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef64bfa320af
branches:  trunk
changeset: 510942:ef64bfa320af
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Apr 07 00:35:02 2006 +0000

description:
fix avl_* function prototype conflicts on Solaris, so this now builds
on Solaris.

diffstat:

 databases/openldap/Makefile |  17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 5589c6c07d08 -r ef64bfa320af databases/openldap/Makefile
--- a/databases/openldap/Makefile       Fri Apr 07 00:29:52 2006 +0000
+++ b/databases/openldap/Makefile       Fri Apr 07 00:35:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2006/03/14 16:23:46 joerg Exp $
+# $NetBSD: Makefile,v 1.111 2006/04/07 00:35:02 grant Exp $
 
 DISTNAME=      openldap-2.3.11
 PKGREVISION=   2
@@ -28,6 +28,21 @@
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+# the internal avl_* prototypes conflict with those in <sys/avl.h> which
+# is included by another system header file on Solaris, so subst them.
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=                conflict
+SUBST_STAGE.conflict=  post-patch
+SUBST_FILES.conflict=  ${WRKSRC}/*/*.h
+SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_SED.conflict+=   -e 's,avl_free,openldap_avl_free,g'
+SUBST_SED.conflict+=   -e 's,avl_insert,openldap_avl_insert,g'
+SUBST_SED.conflict+=   -e 's,avl_delete,openldap_avl_delete,g'
+SUBST_SED.conflict+=   -e 's,avl_find,openldap_avl_find,g'
+SUBST_SED.conflict+=   -e 's,avl_find2,openldap_avl_find2,g'
+SUBST_MESSAGE.conflict=        Fixing conflicting function prototypes.
+.endif
+
 CPPFLAGS.Darwin+=      -DBIND_8_COMPAT
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}