svn commit: r348481 - in head/net/nss-pam-ldapd: . files

[Ryan Steinmetz]

Author: zi
Date: Mon Mar 17 15:20:03 2014
New Revision: 348481
URL: http://svnweb.freebsd.org/changeset/ports/348481
QAT: https://qat.redports.org/buildarchive/r348481/

Log:
  - Update to 0.8.14
  - Fix style issues in Makefile

Modified:
  head/net/nss-pam-ldapd/Makefile
  head/net/nss-pam-ldapd/distinfo
  head/net/nss-pam-ldapd/files/nslcd.in

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Mon Mar 17 15:06:22 2014	(r348480)
+++ head/net/nss-pam-ldapd/Makefile	Mon Mar 17 15:20:03 2014	(r348481)
@@ -2,8 +2,7 @@
 # $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/
@@ -15,9 +14,6 @@ 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
@@ -29,19 +25,19 @@ 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
@@ -56,7 +52,7 @@ 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"

Modified: head/net/nss-pam-ldapd/distinfo
==============================================================================
--- head/net/nss-pam-ldapd/distinfo	Mon Mar 17 15:06:22 2014	(r348480)
+++ head/net/nss-pam-ldapd/distinfo	Mon Mar 17 15:20:03 2014	(r348481)
@@ -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

Modified: head/net/nss-pam-ldapd/files/nslcd.in
==============================================================================
--- head/net/nss-pam-ldapd/files/nslcd.in	Mon Mar 17 15:06:22 2014	(r348480)
+++ head/net/nss-pam-ldapd/files/nslcd.in	Mon Mar 17 15:20:03 2014	(r348481)
@@ -33,14 +33,14 @@ 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
 }