Fix building openldap-smbk5pwd on machines other than NetBSD, and without kerberos if Heimdal not found (only Samba support).

3 files changed, 23 insertions, 8 deletions

diff --git a/databases/openldap-smbk5pwd/MESSAGE b/databases/openldap-smbk5pwd/MESSAGE
index bddab83ef38..f61ab6bda6b 100644
--- a/databases/openldap-smbk5pwd/MESSAGE
+++ b/databases/openldap-smbk5pwd/MESSAGE
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2009/01/31 16:00:55 manu Exp $
+$NetBSD: MESSAGE,v 1.2 2010/12/17 10:20:51 adam Exp $
 
 Please note that this module require slapd to be built with dynamic
-module support. THis can be obtained by adding the following to mk.conf:
+module support. This can be obtained by adding the following to mk.conf:
   PKG_OPTIONS.openldap-server=   dso
 
 In order to enable the use of this module, add this directive to slapd.conf:
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index 7fcaeedf2cb..9383529ae3c 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/07/24 11:15:17 ghen Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/17 10:20:51 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
 COMMENT=	Samba and Kerberos password sync for OpenLDAP
@@ -11,15 +11,31 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=		yes
 
 BUILD_DIRS=		include contrib/slapd-modules/smbk5pwd
+INSTALLATION_DIRS+=	lib/openldap
 
 do-install:
-	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openldap
-	${LIBTOOL} --mode=install ${INSTALL_DATA}			\
+	${LIBTOOL} --mode=install ${INSTALL_LIB}			\
 		   ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la	\
 		   ${DESTDIR}${PREFIX}/lib/openldap
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+LIBS+=		-ldes
+.endif
+
+.include "../../mk/krb5.buildlink3.mk"
+
+.if ${KRB5_TYPE} == "heimdal"
+CPPFLAGS+=	-DDO_SAMBA -DDO_KRB5
+LIBS+=		-lkrb5 -lkadm5srv
+.else
+CPPFLAGS+=	-DDO_SAMBA
+.endif
+
+MAKE_ENV+=	LIBS=${LIBS:M*:Q}
+
 .include "../../databases/openldap/Makefile.common"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../databases/openldap-server/options.mk"
-.include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-smbk5pwd/PLIST b/databases/openldap-smbk5pwd/PLIST
index 50ace53aa01..9da1885fc15 100644
--- a/databases/openldap-smbk5pwd/PLIST
+++ b/databases/openldap-smbk5pwd/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:20 joerg Exp $
-lib/openldap/smbk5pwd.a
+@comment $NetBSD: PLIST,v 1.3 2010/12/17 10:20:51 adam Exp $
 lib/openldap/smbk5pwd.la