Thu Mar 8 05:01:04 2012 UTC ()
Move the inclusion of openldap-server/options.mk to *before* krb5.bl3.mk.
Otherwise, with non-native kerberos, bdb.buildlink3.mk is included by
heimdal's bl3.mk before BDB_ACCEPTED is set, we get the wrong answer out,
and the package fails to build.

It's a good thing heimdal doesn't also need to set BDB_ACCEPTED I guess...


(dholland)
diff -r1.9 -r1.10 pkgsrc/databases/openldap-smbk5pwd/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/databases/openldap-smbk5pwd/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-smbk5pwd/Makefile 2010/12/17 10:20:51 1.9
+++ pkgsrc/databases/openldap-smbk5pwd/Makefile 2012/03/08 05:01:03 1.10
@@ -1,41 +1,42 @@ @@ -1,41 +1,42 @@
1# $NetBSD: Makefile,v 1.9 2010/12/17 10:20:51 adam Exp $ 1# $NetBSD: Makefile,v 1.10 2012/03/08 05:01:03 dholland Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/} 3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/}
4COMMENT= Samba and Kerberos password sync for OpenLDAP 4COMMENT= Samba and Kerberos password sync for OpenLDAP
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 7DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11USE_LIBTOOL= yes 11USE_LIBTOOL= yes
12 12
13BUILD_DIRS= include contrib/slapd-modules/smbk5pwd 13BUILD_DIRS= include contrib/slapd-modules/smbk5pwd
14INSTALLATION_DIRS+= lib/openldap 14INSTALLATION_DIRS+= lib/openldap
15 15
16do-install: 16do-install:
17 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 17 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
18 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ 18 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
19 ${DESTDIR}${PREFIX}/lib/openldap 19 ${DESTDIR}${PREFIX}/lib/openldap
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.if ${OPSYS} == "NetBSD" 23.if ${OPSYS} == "NetBSD"
24LIBS+= -ldes 24LIBS+= -ldes
25.endif 25.endif
26 26
 27.include "../../databases/openldap-server/options.mk"
 28
27.include "../../mk/krb5.buildlink3.mk" 29.include "../../mk/krb5.buildlink3.mk"
28 30
29.if ${KRB5_TYPE} == "heimdal" 31.if ${KRB5_TYPE} == "heimdal"
30CPPFLAGS+= -DDO_SAMBA -DDO_KRB5 32CPPFLAGS+= -DDO_SAMBA -DDO_KRB5
31LIBS+= -lkrb5 -lkadm5srv 33LIBS+= -lkrb5 -lkadm5srv
32.else 34.else
33CPPFLAGS+= -DDO_SAMBA 35CPPFLAGS+= -DDO_SAMBA
34.endif 36.endif
35 37
36MAKE_ENV+= LIBS=${LIBS:M*:Q} 38MAKE_ENV+= LIBS=${LIBS:M*:Q}
37 39
38.include "../../databases/openldap/Makefile.common" 40.include "../../databases/openldap/Makefile.common"
39.include "../../databases/openldap-client/buildlink3.mk" 41.include "../../databases/openldap-client/buildlink3.mk"
40.include "../../databases/openldap-server/options.mk" 
41.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"