From owner-svn-ports-head@FreeBSD.ORG  Tue Jan 22 07:26:39 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 AEC3044A;
 Tue, 22 Jan 2013 07:26:39 +0000 (UTC) (envelope-from jgh@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 8ADA7991;
 Tue, 22 Jan 2013 07:26:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7Qd5a057113;
 Tue, 22 Jan 2013 07:26:39 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7QdUw057112;
 Tue, 22 Jan 2013 07:26:39 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201301220726.r0M7QdUw057112@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Tue, 22 Jan 2013 07:26:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310808 - head/net/nss-pam-ldapd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 07:26:39 -0000

Author: jgh
Date: Tue Jan 22 07:26:38 2013
New Revision: 310808
URL: http://svnweb.freebsd.org/changeset/ports/310808

Log:
  - add NSLCD KNOB reverted in r310469
  
  PR:		175340
  Submitted by:	 john.marshall@riverwillow.com.au
  Reviewed by:	bapt (portmgr)
  Approved by:	maintainer, rflynn@acsalaska.net (implicit)

Modified:
  head/net/nss-pam-ldapd/Makefile

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Tue Jan 22 07:20:08 2013	(r310807)
+++ head/net/nss-pam-ldapd/Makefile	Tue Jan 22 07:26:38 2013	(r310808)
@@ -1,14 +1,9 @@
-# Ports collection Makefile for:	nss_ldapd
-# Date created:				23/7/2009
-# Whom:					melifaro@ipfw.ru
-#
+# Created by: melifaro@ipfw.ru
 # $FreeBSD$
-#
-# vim: ft=pmake tw=78 fo=cq
-#
 
 PORTNAME=		nss-pam-ldapd
 PORTVERSION=		0.8.12
+PORTREVISION=	1
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/
 
@@ -101,20 +96,16 @@ SUB_LIST+=		NSS_MESSAGE=""
 # Won't hook this in to OPTIONS until PADL ports are at least DEPRECATED.
 # It doesn't do the software any good to run as replacement for the PADL ports
 # without running the daemon.
-.if ${PORT_OPTIONS:MNSLCD)
+.if defined(WITHOUT_NSLCD)
+CONFIGURE_ARGS+=	--disable-nslcd
+PLIST_SUB+=		NSLCD="@comment "
+.else
 CONFIGURE_ARGS+=	--enable-nslcd
 PLIST_SUB+=		NSLCD=""
 MAN5+=			nslcd.conf.5
 MAN8+=			nslcd.8
-.else
-CONFIGURE_ARGS+=	--disable-nslcd
-PLIST_SUB+=		NSLCD="@comment "
 .endif
 
-# these are unconditionally installed (bug filed upstream)
-MAN5+=			nslcd.conf.5
-MAN8+=			nslcd.8
-
 post-extract:
 	@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in