Index: head/net/nss-pam-ldapd/Makefile
===================================================================
--- head/net/nss-pam-ldapd/Makefile	(revision 348480)
+++ head/net/nss-pam-ldapd/Makefile	(revision 348481)
@@ -1,129 +1,125 @@
 # Created by: melifaro@ipfw.ru
 # $FreeBSD$
 
 PORTNAME=		nss-pam-ldapd
-PORTVERSION=		0.8.13
-PORTREVISION=		2
+PORTVERSION=		0.8.14
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
     			http://mirrors.rit.edu/zi/
 
 MAINTAINER?=		zi@FreeBSD.org
 COMMENT?=		Advanced fork of nss_ldap
 
 LICENSE=		LGPL21 LGPL3
 LICENSE_COMB=		dual
 
 GNU_CONFIGURE=		yes
-# Gmake seems to be not really needed anymore.
-# Gmake specific constructs are limited to maintainer targets
-# USE_GMAKE=		yes
 USE_OPENLDAP=		yes
 USE_RC_SUBR=		nslcd
 PAM_LDAP_SHMAJOR=	1
 NSS_LDAP_SHMAJOR=	1
 PKGMESSAGE=		${WRKDIR}/pkg-message
 SUB_FILES+=		pkg-message
 
 NSLCD_PIDFILE?=		/var/run/nslcd.pid
 NSLCD_SOCKET?=		/var/run/nslcd.ctl
 
 .if defined(SLAVE_PORT)
-OPTIONS_DEFINE=	SASL
-OPTIONS_MULTI=	MG1
+OPTIONS_DEFINE=		SASL
+OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	PAM NSS
-PAM_DESC=	Build pam_ldap
-NSS_DESC=	Build nss support
-SASL_DESC=	Build sasl support
+PAM_DESC=		Build pam_ldap
+NSS_DESC=		Build nss support
+SASL_DESC=		Build sasl support
 OPTIONS_DEFAULT=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-[0-9]*
 .else
-OPTIONS_MULTI=	MG1
+OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	PAM NSS
-PAM_DESC=	Build pam_ldap
-NSS_DESC=	Build nss support
+PAM_DESC=		Build pam_ldap
+NSS_DESC=		Build nss support
 OPTIONS_DEFAULT=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-sasl-[0-9]*
 .endif
 
 USERS=			nslcd
 GROUPS=			nslcd
 
 .include <bsd.port.options.mk>
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--with-nslcd-pidfile=${NSLCD_PIDFILE} \
 			--with-nslcd-socket=${NSLCD_SOCKET} \
-			--with-ldap-lib=openldap --disable-kerberos \
+			--with-ldap-lib=openldap \
 			--with-nss-ldap-soname=nss_ldap.so.${NSS_LDAP_SHMAJOR}
 
 CONFIG_FILE=		"nslcd.conf"
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PREFIX}/etc/${CONFIG_FILE}
 PLIST_SUB+=		CONFIG="${CONFIG_FILE}" \
 			PAM_LDAP_SHMAJOR="${PAM_LDAP_SHMAJOR}" \
 			NSS_LDAP_SHMAJOR="${NSS_LDAP_SHMAJOR}"
 SUB_LIST+=		CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}"
 
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif
 
 .if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam \
 			--with-pam-seclib-dir=${PREFIX}/lib \
 			--with-pam-ldap-soname=pam_ldap.so.${PAM_LDAP_SHMAJOR}
 CONFLICTS+=		pam_ldap-1.*
 PLIST_SUB+=		PAM=""
 .else
 CONFIGURE_ARGS+=	--disable-pam
 PLIST_SUB+=		PAM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNSS}
 CONFIGURE_ARGS+=	--enable-nss
 CONFLICTS+=		nss_ldap-1.*
 PLIST_SUB+=		NSS=""
 SUB_LIST+=		NSS_MESSAGE="WARNING: Be sure to set uid and gid configuration parameters to make nslcd run under unprivileged user."
 .else
 CONFIGURE_ARGS+=	--disable-nss
 PLIST_SUB+=		NSS="@comment "
 SUB_LIST+=		NSS_MESSAGE=""
 .endif
 
 # 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 defined(WITHOUT_NSLCD)
 CONFIGURE_ARGS+=	--disable-nslcd
 PLIST_SUB+=		NSLCD="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-nslcd
 PLIST_SUB+=		NSLCD=""
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in
 
 post-configure:
 	${REINPLACE_CMD} -e 's/^\(CFLAGS.*\) \-O2 \(.*\)$$/\1 -O0 \2/' ${WRKSRC}/nss/Makefile
 
 show-pkgmessage::
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE} | ${FMT} 75 79; ${ECHO_CMD}
 
 # We take care of the sample file, upstream install target installs the actual
 # file if it does not exist yet.
 post-install: show-pkgmessage
 	@${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${STAGEDIR}${PREFIX}/etc/nslcd.conf.sample
 .if ${PORT_OPTIONS:MNSS}
 	@${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/nss_ldap.so
 .endif
 .if ${PORT_OPTIONS:MPAM}
 	@${LN} -fs pam_ldap.so.${PAM_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/pam_ldap.so
 .endif
 
 .include <bsd.port.mk>
Index: head/net/nss-pam-ldapd/distinfo
===================================================================
--- head/net/nss-pam-ldapd/distinfo	(revision 348480)
+++ head/net/nss-pam-ldapd/distinfo	(revision 348481)
@@ -1,2 +1,2 @@
-SHA256 (nss-pam-ldapd-0.8.13.tar.gz) = b792ae98c98402ac25db49d54c4c53b860d45c9a7a7e24587e03a5fda7ee5d22
-SIZE (nss-pam-ldapd-0.8.13.tar.gz) = 487295
+SHA256 (nss-pam-ldapd-0.8.14.tar.gz) = a29ceb9b7eda386ca38f16115ffec61425462cca6b5e560c44c3d51edc03a63f
+SIZE (nss-pam-ldapd-0.8.14.tar.gz) = 508949
Index: head/net/nss-pam-ldapd/files/nslcd.in
===================================================================
--- head/net/nss-pam-ldapd/files/nslcd.in	(revision 348480)
+++ head/net/nss-pam-ldapd/files/nslcd.in	(revision 348481)
@@ -1,90 +1,90 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nslcd
 # REQUIRE: NETWORKING ldconfig resolv
 # BEFORE: syslogd
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable the nslcd daemon:
 #
 # nslcd_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=nslcd
 rcvar=nslcd_enable
 
 load_rc_config ${name}
 
 : ${nslcd_enable:=NO}
 : ${nslcd_supervisor=NO}
 
 command="/usr/sbin/daemon";
 start_precmd=nslcd_prestart
 start_cmd=nslcd_start
 status_cmd=nslcd_status
 stop_cmd=nslcd_stop
 
 nslcd_prestart()
 {
 	if checkyesno nslcd_supervisor ; then
 	    	notsupported=$(${command} -r 3>&1 1>&2 2>&3 | grep -c illegal)
 		if [ ${notsupported} -eq 0 ]; then
-			command_args="-f -r %%PREFIX%%/sbin/nslcd -d"
+			command_args="-f -r %%PREFIX%%/sbin/nslcd -n"
 		else
 		    	echo "Your FreeBSD version's daemon(8) does not support supervision.";
 			echo "${name} was not started.";
 			exit 1
 		fi
 	else
-		command_args="-f %%PREFIX%%/sbin/nslcd -d"
+		command_args="-f %%PREFIX%%/sbin/nslcd"
 	fi
 }
 
 nslcd_start()
 {
 	nslcd_findpid
 	if [ ! ${mypid} = '' ]; then
 		echo "${name} is running with PID ${mypid}.";
 	else
 		echo "Starting ${name}."
 		${command} ${command_args}
 	fi
 }
 
 nslcd_status()
 {
 	nslcd_findpid
 	if [ ! ${mypid} = '' ]; then
 		echo "${name} is running with PID ${mypid}.";
 	else
 		echo "${name} not running?";
 		return 1
 	fi
 }
 
 nslcd_stop()
 {
 	nslcd_findpid
 	if [ ! ${mypid} = '' ]; then
 		echo "Stopping ${name}.";
 		kill -TERM ${mypid};
 		wait_for_pids ${mypid};
 	else
 		echo "${name} not running?";
 	fi
 }
 
 nslcd_findpid()
 {
 	if ! checkyesno nslcd_supervisor && $(%%PREFIX%%/sbin/nslcd -c && pgrep -F /var/run/nslcd.pid > /dev/null); then
 		mypid=$(cat /var/run/nslcd.pid) 
 	else
 		mypid=$(pgrep -f "daemon: %%PREFIX%%/sbin/nslcd")
 	fi
 }
 
 run_rc_command "$1"