summaryrefslogtreecommitdiff
path: root/net/isc-dhcp4
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2019-08-27 08:12:01 +0000
committeradam <adam@pkgsrc.org>2019-08-27 08:12:01 +0000
commit8ede23130eef0fa83e40db0f8e33fa91e56f580b (patch)
treeb277f133c50f6705533bdfa24b5b973183e6e3bc /net/isc-dhcp4
parentf92ddef39c9659acaad98c427ded4bd32f81786f (diff)
downloadpkgsrc-8ede23130eef0fa83e40db0f8e33fa91e56f580b.tar.gz
isc-dhcp4: add LDAP as an option; pkglint fixes
Diffstat (limited to 'net/isc-dhcp4')
-rw-r--r--net/isc-dhcp4/Makefile.common10
-rw-r--r--net/isc-dhcp4/options.mk12
2 files changed, 15 insertions, 7 deletions
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 6482c04fd39..613f8e45c80 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2019/06/18 20:02:24 nia Exp $
+# $NetBSD: Makefile.common,v 1.39 2019/08/27 08:12:01 adam Exp $
#
# used by net/isc-dhcp4/Makefile
# used by net/isc-dhcpd4/Makefile
@@ -29,8 +29,8 @@ PKG_SYSCONFSUBDIR= dhcp
USE_TOOLS+= gmake gunzip gzip tar
USE_LANGUAGES+= c99 c++
-PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
-DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
+PATCHDIR= ${.CURDIR}/../../net/isc-dhcp4/patches
+DISTINFO_FILE= ${.CURDIR}/../../net/isc-dhcp4/distinfo
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID
@@ -63,7 +63,7 @@ SUBST_CLASSES+= config
SUBST_STAGE.config= pre-configure
SUBST_FILES.config= includes/dhcpd.h
SUBST_VARS.config= PREFIX PKG_SYSCONFDIR
-SUBST_MESSAGE.config= Fixing configuration files.
+SUBST_MESSAGE.config= Fixing configuration files.
BUILD_DIRS= ${BUILD_SUBDIR}
INSTALL_DIRS= ${SUBDIR}
@@ -71,7 +71,7 @@ INSTALL_DIRS= ${SUBDIR}
# XXX This crap should replaced by a dependency on net/libbind, but
# that seems to be a different version of libbind.
post-extract:
- (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -)
+ cd ${WRKSRC}/bind && ${TAR} -zxf bind.tar.gz
BIND_CONFIGURE_ARGS+= --disable-kqueue
BIND_CONFIGURE_ARGS+= --disable-epoll
diff --git a/net/isc-dhcp4/options.mk b/net/isc-dhcp4/options.mk
index cb0601028a0..0125df53418 100644
--- a/net/isc-dhcp4/options.mk
+++ b/net/isc-dhcp4/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:59 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/08/27 08:12:01 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dhcp
-PKG_SUPPORTED_OPTIONS+= inet6
+PKG_SUPPORTED_OPTIONS+= inet6 ldap
PKG_SUGGESTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
@@ -14,3 +14,11 @@ CONFIGURE_ARGS+= --enable-dhcpv6
.else
CONFIGURE_ARGS+= --disable-dhcpv6
.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= --with-ldapcrypto
+.include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-ldap
+.endif