Skip to content

Commit 422b046

Browse files
author
adam
committed
isc-dhcp4: add LDAP as an option; pkglint fixes
1 parent 4dc476f commit 422b046

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

net/isc-dhclient4/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.11 2014/10/14 13:53:00 taca Exp $
1+
# $NetBSD: Makefile,v 1.12 2019/08/27 08:12:01 adam Exp $
22

33
PKGNAME= isc-dhclient-${DHVER}
44
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client
@@ -10,7 +10,7 @@ CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
1010
RCD_SCRIPTS= isc_dhclient
1111
FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
1212

13-
.include "${.CURDIR}/../isc-dhcp4/options.mk"
13+
.include "../../net/isc-dhcp4/options.mk"
1414

1515
INSTALLATION_DIRS+= ${EGDIR}
1616

net/isc-dhcp4/Makefile.common

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile.common,v 1.38 2019/06/18 20:02:24 nia Exp $
1+
# $NetBSD: Makefile.common,v 1.39 2019/08/27 08:12:01 adam Exp $
22
#
33
# used by net/isc-dhcp4/Makefile
44
# used by net/isc-dhcpd4/Makefile
@@ -29,8 +29,8 @@ PKG_SYSCONFSUBDIR= dhcp
2929
USE_TOOLS+= gmake gunzip gzip tar
3030
USE_LANGUAGES+= c99 c++
3131

32-
PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
33-
DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
32+
PATCHDIR= ${.CURDIR}/../../net/isc-dhcp4/patches
33+
DISTINFO_FILE= ${.CURDIR}/../../net/isc-dhcp4/distinfo
3434
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
3535
BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID
3636

@@ -63,15 +63,15 @@ SUBST_CLASSES+= config
6363
SUBST_STAGE.config= pre-configure
6464
SUBST_FILES.config= includes/dhcpd.h
6565
SUBST_VARS.config= PREFIX PKG_SYSCONFDIR
66-
SUBST_MESSAGE.config= Fixing configuration files.
66+
SUBST_MESSAGE.config= Fixing configuration files.
6767

6868
BUILD_DIRS= ${BUILD_SUBDIR}
6969
INSTALL_DIRS= ${SUBDIR}
7070

7171
# XXX This crap should replaced by a dependency on net/libbind, but
7272
# that seems to be a different version of libbind.
7373
post-extract:
74-
(cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -)
74+
cd ${WRKSRC}/bind && ${TAR} -zxf bind.tar.gz
7575

7676
BIND_CONFIGURE_ARGS+= --disable-kqueue
7777
BIND_CONFIGURE_ARGS+= --disable-epoll

net/isc-dhcp4/options.mk

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:59 wiz Exp $
1+
# $NetBSD: options.mk,v 1.3 2019/08/27 08:12:01 adam Exp $
22

33
PKG_OPTIONS_VAR= PKG_OPTIONS.dhcp
4-
PKG_SUPPORTED_OPTIONS+= inet6
4+
PKG_SUPPORTED_OPTIONS+= inet6 ldap
55
PKG_SUGGESTED_OPTIONS= inet6
66

77
.include "../../mk/bsd.options.mk"
@@ -14,3 +14,11 @@ CONFIGURE_ARGS+= --enable-dhcpv6
1414
.else
1515
CONFIGURE_ARGS+= --disable-dhcpv6
1616
.endif
17+
18+
.if !empty(PKG_OPTIONS:Mldap)
19+
CONFIGURE_ARGS+= --with-ldap
20+
CONFIGURE_ARGS+= --with-ldapcrypto
21+
.include "../../databases/openldap-client/buildlink3.mk"
22+
.else
23+
CONFIGURE_ARGS+= --without-ldap
24+
.endif

net/isc-dhcpd4/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.13 2014/10/14 13:53:01 taca Exp $
1+
# $NetBSD: Makefile,v 1.14 2019/08/27 08:12:01 adam Exp $
22

33
PKGNAME= isc-dhcpd-${DHVER}
44
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server
@@ -14,7 +14,7 @@ SMF_METHODS= isc-dhcpd
1414
FILES_SUBST+= DHCP_HOME=${DHCP_HOME:Q}
1515
FILES_SUBST+= DHCP_PID=${DHCP_PID:Q}
1616

17-
.include "${.CURDIR}/../isc-dhcp4/options.mk"
17+
.include "../../net/isc-dhcp4/options.mk"
1818

1919
INSTALLATION_DIRS+= ${EGDIR}
2020

net/isc-dhcrelay4/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.10 2014/10/14 13:53:01 taca Exp $
1+
# $NetBSD: Makefile,v 1.11 2019/08/27 08:12:01 adam Exp $
22

33
PKGNAME= isc-dhcrelay-${DHVER}
44
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay
@@ -8,7 +8,7 @@ SUBDIR= relay
88
RCD_SCRIPTS= isc_dhcrelay
99
FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
1010

11-
.include "${.CURDIR}/../isc-dhcp4/options.mk"
11+
.include "../../net/isc-dhcp4/options.mk"
1212

1313
.include "../../net/isc-dhcp4/Makefile.common"
1414
.include "../../net/isc-dhcp4/buildlink3.mk"

0 commit comments

Comments
 (0)