Index: branches/2016Q4/mail/lbdb/Makefile
===================================================================
--- branches/2016Q4/mail/lbdb/Makefile	(revision 429586)
+++ branches/2016Q4/mail/lbdb/Makefile	(revision 429587)
@@ -1,71 +1,73 @@
 # Created by: mwest@uct.ac.za
 # $FreeBSD$
 
 PORTNAME=	lbdb
 PORTVERSION=	0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spinnaker.de/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Tools for use with mutt external mail address query feature
 
 RUN_DEPENDS=	gsed:textproc/gsed
 
 OPTIONS_DEFINE=	ABOOK EVOLUTION GPG LDAP
 ABOOK_DESC=	abook address book support
 EVOLUTION_DESC=	Ximan Evolution support
 GPG_DESC=	GNU Privacy Guard support
 
 WRKSRC=		${WRKDIR}/lbdb-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-lbdb-dotlock \
 		--libdir=${PREFIX}/libexec/lbdb
 MAKE_ARGS=	install_prefix=${STAGEDIR}
 USES=		gmake perl5
 
-.include <bsd.port.options.mk>
-
 .if exists (/usr/bin/getent)
-WITH_GETENT=	yes
+PLIST_SUB+=	GETENT=""
+.else
+PLIST_SUB+=	GETENT="@comment "
 .endif
 
+.if exists (/usr/bin/ypcat)
+PLIST_SUB+=	YPCAT=""
+.else
+PLIST_SUB+=	YPCAT="@comment "
+.endif
+
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MGPG}
 BUILD_DEPENDS+=	gpg:security/gnupg
 RUN_DEPENDS+=	gpg:security/gnupg
 PLIST_SUB+=	GPG=""
 .else
 PLIST_SUB+=	GPG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MABOOK}
 BUILD_DEPENDS+=	abook:mail/abook
 RUN_DEPENDS+=	abook:mail/abook
 PLIST_SUB+=	ABOOK=""
 .else
 PLIST_SUB+=	ABOOK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 BUILD_DEPENDS+=	evolution:mail/evolution
 RUN_DEPENDS+=	evolution:mail/evolution
 PLIST_SUB+=	EVOLUTION=""
 .else
 PLIST_SUB+=	EVOLUTION="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGETENT}
-PLIST_SUB+=	GETENT=""
-.else
-PLIST_SUB+=	GETENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/m_muttalias.sh.in
 
 .include <bsd.port.mk>
Index: branches/2016Q4/mail/lbdb/pkg-plist
===================================================================
--- branches/2016Q4/mail/lbdb/pkg-plist	(revision 429586)
+++ branches/2016Q4/mail/lbdb/pkg-plist	(revision 429587)
@@ -1,37 +1,37 @@
 bin/lbdb-fetchaddr
 bin/lbdb_dotlock
 bin/lbdbq
 bin/nodelist2lbdb
 etc/lbdb.rc
 etc/lbdb_ldap.rc
 libexec/lbdb/fetchaddr
 libexec/lbdb/lbdb-munge
 libexec/lbdb/lbdb_bbdb_query.el
 libexec/lbdb/lbdb_lib
 %%ABOOK%%libexec/lbdb/m_abook
 libexec/lbdb/m_bbdb
 %%EVOLUTION%%libexec/lbdb/m_evolution
 libexec/lbdb/m_fido
 libexec/lbdb/m_finger
 %%GETENT%%libexec/lbdb/m_getent
 libexec/lbdb/m_gnomecard
 %%GPG%%libexec/lbdb/m_gpg
 libexec/lbdb/m_inmail
 libexec/lbdb/m_ldap
 libexec/lbdb/m_muttalias
 libexec/lbdb/m_palm
 libexec/lbdb/m_passwd
 libexec/lbdb/m_pine
 libexec/lbdb/m_wanderlust
-libexec/lbdb/m_yppasswd
+%%YPCAT%%libexec/lbdb/m_yppasswd
 libexec/lbdb/munge
 libexec/lbdb/munge-keeporder
 libexec/lbdb/mutt_ldap_query
 libexec/lbdb/palm_lsaddr
 libexec/lbdb/qpto8bit
 libexec/lbdb/tac
 man/man1/lbdb-fetchaddr.1.gz
 man/man1/lbdb_dotlock.1.gz
 man/man1/lbdbq.1.gz
 man/man1/mutt_ldap_query.1.gz
 man/man1/nodelist2lbdb.1.gz
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 429586)
+++ branches/2016Q4	(revision 429587)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r429501