From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 26 18:23:24 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 09100624;
 Wed, 26 Jun 2013 18:23:24 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EE35513C9;
 Wed, 26 Jun 2013 18:23:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5QINNIX017761;
 Wed, 26 Jun 2013 18:23:23 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5QINNXQ017760;
 Wed, 26 Jun 2013 18:23:23 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201306261823.r5QINNXQ017760@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Wed, 26 Jun 2013 18:23:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321805 - head/net/isc-dhcp42-server
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jun 2013 18:23:24 -0000

Author: zi
Date: Wed Jun 26 18:23:23 2013
New Revision: 321805
URL: http://svnweb.freebsd.org/changeset/ports/321805

Log:
  - Fix pkg-plist issue when LDAP is enabled

Modified:
  head/net/isc-dhcp42-server/Makefile   (contents, props changed)

Modified: head/net/isc-dhcp42-server/Makefile
==============================================================================
--- head/net/isc-dhcp42-server/Makefile	Wed Jun 26 17:42:21 2013	(r321804)
+++ head/net/isc-dhcp42-server/Makefile	Wed Jun 26 18:23:23 2013	(r321805)
@@ -114,6 +114,7 @@ CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	yes
 LDAP_SCRIPT=	${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap
 LDAP_SCHEMA=	${WRKSRC}/contrib/ldap/dhcp.schema
+LDAP_README=	${WRKSRC}/contrib/ldap/README.ldap
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 PORTDOCS+=	README.ldap
 PLIST_SUB+=	SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP=""
@@ -168,9 +169,9 @@ do-install:
 	${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
 	${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${PREFIX}/bin
 .endif
-.if ${PORT_OPTIONS:MLDAP} && empty(PORT_OPTIONS:MDOCS)
+.if ${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/contrib/ldap/README.ldap ${DOCSDIR}
+	${INSTALL_MAN} ${LDAP_README} ${DOCSDIR}
 .endif
 .endif