- Honor custom PREFIX [1]

- Remove 6.x support
- Pacify portlint(1)

PR:		ports/161689
Submitted by:	Andrew Kolchoogin <gadm@web.trunk-com.ru> [1]
Approved by:	maintainer timeout (2+ weeks)

3 files changed, 12 insertions, 14 deletions

diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 0fdef46f24c1..0d09887633f4 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -11,12 +11,13 @@ PORTREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			http://static.ipfw.ru/files/
-LICENSE=		LGPL21 LGPL3
-LICENSE_COMB=		dual
 
 MAINTAINER=		melifaro@ipfw.ru
 COMMENT=		Advanced fork of nss_ldap
 
+LICENSE=		LGPL21 LGPL3
+LICENSE_COMB=		dual
+
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_OPENLDAP=		yes
@@ -33,10 +34,6 @@ GROUPS=			nslcd
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-IGNORE=			problems with nss/libc TLS
-.endif
-
 .if ${OSVERSION} < 800000
 EXTRA_PATCHES+=		${FILESDIR}/rtld_nss__nslcd.c
 .endif
@@ -92,7 +89,6 @@ MAN8+=			nslcd.8
 post-extract:
 	@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in
 	@${REINPLACE_CMD} -e 's/shadow.$$(OBJEXT)/shadow.$$(OBJEXT) bsdnss.$$(OBJEXT)/;s/shadow\.c/shadow.c bsdnss.c/' ${WRKSRC}/nss/Makefile.in
-	#@${REINPLACE_CMD} -e '/^$$(ACLOCAL_M4/,+2d' ${WRKSRC}/Makefile.in
 
 post-configure:
 	${REINPLACE_CMD} -e 's/^\(CFLAGS.*\) \-O2 \(.*\)$$/\1 -O0 \2/' ${WRKSRC}/nss/Makefile
diff --git a/net/nss-pam-ldapd/files/nslcd.in b/net/nss-pam-ldapd/files/nslcd.in
index bf46a661777f..4cd4285d3fc1 100644
--- a/net/nss-pam-ldapd/files/nslcd.in
+++ b/net/nss-pam-ldapd/files/nslcd.in
@@ -21,7 +21,7 @@ rcvar=$(set_rcvar)
 start_postcmd="nslcd_poststart"
 
 nslcd_poststart () {
-       until $(/usr/local/sbin/nslcd -c); do
+       until $(%%PREFIX%%/sbin/${name} -c); do
                echo " Waiting for nslcd to start"
                sleep 1
        done
diff --git a/net/nss-pam-ldapd/pkg-descr b/net/nss-pam-ldapd/pkg-descr
index 96563dd67bae..91d85ced6bf6 100644
--- a/net/nss-pam-ldapd/pkg-descr
+++ b/net/nss-pam-ldapd/pkg-descr
@@ -1,14 +1,16 @@
-nss-pam-ldapd, a Name Service Switch (NSS) module and Pluggable Authentication 
-Module (PAM) that allows your LDAP server to provide user account, group, host 
-name, alias, netgroup, and basically any other information that you would 
-normally get from /etc flat files or NIS. It also alows you to do 
-authentication to an LDAP server. 
+nss-pam-ldapd, a Name Service Switch (NSS) module and
+Pluggable Authentication Module (PAM) that allows your
+LDAP server to provide user account, group, host name,
+alias, netgroup, and basically any other information that
+you would normally get from /etc flat files or NIS. It also
+allows you to do authentication to an LDAP server.
 
 Key differences from nss_ldap:
 * lighter NSS library
 * lighter PAM library
 * simpler internal semantics
-* clear separation between NSS, PAM and LDAP code (the server part could easily be implemented in another language)
+* clear separation between NSS, PAM and LDAP code (the server
+  part could easily be implemented in another language)
 * less connections to the LDAP server
 
 WWW: http://arthurdejong.org/nss-pam-ldapd/