ports/175340: [PATCH] net/nss-pam-ldapd Default nslcd build broken

[John Marshall]

>Number:         175340
>Category:       ports
>Synopsis:       [PATCH] net/nss-pam-ldapd Default nslcd build broken
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 16 02:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     John Marshall
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwsrv08.mby.riverwillow.net.au 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243728: Sat Dec 1 14:25:07 AEDT 2012 root at rwsrv08.mby.riverwillow.net.au:/usr/obj/usr/src/sys/RWSRV08 amd64


	
>Description:

The optionsNG rewrite by the commiter in r310469 unintentionally broke
the default build of the nslcd daemon.  The incorrect assumption was
that a NSLCD option existed.  The port's maintainer has a note in the
Makefile about not wanting to make NSLCD an option (yet), so the
attached patch reverts to the previous code (which disables build of
nslcd ONLY if WITHOUT_NSLCD is defined) rather than adding a NSLCD
option to correct the introduced problem.
	
>How-To-Repeat:

Install the port and try (/usr/local/etc/rc.d/nslcd start).  The rc
script fails because it cannot find the daemon.

>Fix:

	

--- nss-pam-ldapd.diff begins here ---
Index: net/nss-pam-ldapd/Makefile
===================================================================
--- net/nss-pam-ldapd/Makefile	(revision 310470)
+++ net/nss-pam-ldapd/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# Ports collection Makefile for:	nss_ldapd
-# Date created:				23/7/2009
-# Whom:					melifaro at ipfw.ru
-#
+# Created by: melifaro at ipfw.ru
 # $FreeBSD$
 #
 # vim: ft=pmake tw=78 fo=cq
@@ -101,14 +98,14 @@
 # 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)
--- nss-pam-ldapd.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: