CVS commit: pkgsrc/net

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 27 08:12:01 UTC 2019

Modified Files:
        pkgsrc/net/isc-dhclient4: Makefile
        pkgsrc/net/isc-dhcp4: Makefile.common options.mk
        pkgsrc/net/isc-dhcpd4: Makefile
        pkgsrc/net/isc-dhcrelay4: Makefile

Log Message:
isc-dhcp4: add LDAP as an option; pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/isc-dhclient4/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/isc-dhcp4/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/isc-dhcpd4/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/isc-dhcrelay4/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/isc-dhclient4/Makefile
diff -u pkgsrc/net/isc-dhclient4/Makefile:1.11 pkgsrc/net/isc-dhclient4/Makefile:1.12
--- pkgsrc/net/isc-dhclient4/Makefile:1.11      Tue Oct 14 13:53:00 2014
+++ pkgsrc/net/isc-dhclient4/Makefile   Tue Aug 27 08:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/10/14 13:53:00 taca Exp $
+# $NetBSD: Makefile,v 1.12 2019/08/27 08:12:01 adam Exp $
 
 PKGNAME=       isc-dhclient-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Client
@@ -10,7 +10,7 @@ CONF_FILES+=  ${EGDIR}/dhclient.conf ${PK
 RCD_SCRIPTS=   isc_dhclient
 FILES_SUBST+=  DHCP_HOME=${DHCP_HOME}
 
-.include "${.CURDIR}/../isc-dhcp4/options.mk"
+.include "../../net/isc-dhcp4/options.mk"
 
 INSTALLATION_DIRS+=    ${EGDIR}
 

Index: pkgsrc/net/isc-dhcp4/Makefile.common
diff -u pkgsrc/net/isc-dhcp4/Makefile.common:1.38 pkgsrc/net/isc-dhcp4/Makefile.common:1.39
--- pkgsrc/net/isc-dhcp4/Makefile.common:1.38   Tue Jun 18 20:02:24 2019
+++ pkgsrc/net/isc-dhcp4/Makefile.common        Tue Aug 27 08:12:01 2019
@@ -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

Index: pkgsrc/net/isc-dhcp4/options.mk
diff -u pkgsrc/net/isc-dhcp4/options.mk:1.2 pkgsrc/net/isc-dhcp4/options.mk:1.3
--- pkgsrc/net/isc-dhcp4/options.mk:1.2 Tue Jun 12 15:45:59 2012
+++ pkgsrc/net/isc-dhcp4/options.mk     Tue Aug 27 08:12:01 2019
@@ -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

Index: pkgsrc/net/isc-dhcpd4/Makefile
diff -u pkgsrc/net/isc-dhcpd4/Makefile:1.13 pkgsrc/net/isc-dhcpd4/Makefile:1.14
--- pkgsrc/net/isc-dhcpd4/Makefile:1.13 Tue Oct 14 13:53:01 2014
+++ pkgsrc/net/isc-dhcpd4/Makefile      Tue Aug 27 08:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/10/14 13:53:01 taca Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/27 08:12:01 adam Exp $
 
 PKGNAME=       isc-dhcpd-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Server
@@ -14,7 +14,7 @@ SMF_METHODS=  isc-dhcpd
 FILES_SUBST+=  DHCP_HOME=${DHCP_HOME:Q}
 FILES_SUBST+=  DHCP_PID=${DHCP_PID:Q}
 
-.include "${.CURDIR}/../isc-dhcp4/options.mk"
+.include "../../net/isc-dhcp4/options.mk"
 
 INSTALLATION_DIRS+=    ${EGDIR}
 

Index: pkgsrc/net/isc-dhcrelay4/Makefile
diff -u pkgsrc/net/isc-dhcrelay4/Makefile:1.10 pkgsrc/net/isc-dhcrelay4/Makefile:1.11
--- pkgsrc/net/isc-dhcrelay4/Makefile:1.10      Tue Oct 14 13:53:01 2014
+++ pkgsrc/net/isc-dhcrelay4/Makefile   Tue Aug 27 08:12:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/10/14 13:53:01 taca Exp $
+# $NetBSD: Makefile,v 1.11 2019/08/27 08:12:01 adam Exp $
 
 PKGNAME=       isc-dhcrelay-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Relay
@@ -8,7 +8,7 @@ SUBDIR=         relay
 RCD_SCRIPTS=   isc_dhcrelay
 FILES_SUBST+=  DHCP_HOME=${DHCP_HOME}
 
-.include "${.CURDIR}/../isc-dhcp4/options.mk"
+.include "../../net/isc-dhcp4/options.mk"
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../net/isc-dhcp4/buildlink3.mk"