diff options
Diffstat (limited to 'databases/openldap/Makefile')
| -rw-r--r-- | databases/openldap/Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 467b46398bf..f0d2e73d0a5 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.110 2006/03/14 16:23:46 joerg Exp $ +# $NetBSD: Makefile,v 1.110.2.1 2006/05/22 12:58:24 salo Exp $ -DISTNAME= openldap-2.3.11 -PKGREVISION= 2 +DISTNAME= openldap-2.3.23 SVR4_PKGNAME= oldap CATEGORIES= databases MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ @@ -28,6 +27,21 @@ FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} .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} |