After STAGE support commit, stage paths get coded. Fix it.

Submitted by:	Matthew D. Fuller
Approved by:	wg (mentor)

2 files changed, 40 insertions, 37 deletions

diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index a22655ab739d..01f429d0f91a 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -3,25 +3,26 @@
 
 PORTNAME=	lbdb
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spinnaker.de/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	alexey@renatasystems.org
-COMMENT=	Set of tools for use with mutt's external mail address query feature
+COMMENT=	Tools for use with mutt external mail address query feature
 
-RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
-OPTIONS_DEFINE=	ABOOK EVOLUTION GPG
+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
-GNU_CONFIGURE_PREFIX=	${STAGEDIR}${PREFIX}
-CONFIGURE_ARGS=	--enable-lbdb-dotlock --libdir=${STAGEDIR}${PREFIX}/libexec
+CONFIGURE_ARGS=	--enable-lbdb-dotlock \
+		--libdir=${PREFIX}/libexec/lbdb
+MAKE_ARGS=	install_prefix=${STAGEDIR}
 USES=		gmake perl5
 
 .include <bsd.port.options.mk>
@@ -60,10 +61,11 @@ PLIST_SUB+=	GETENT=""
 PLIST_SUB+=	GETENT="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MLDAP}
+RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/m_muttalias.sh.in
 
-post-configure:
-	${REINPLACE_CMD} -e 's%mandir=.*%mandir=${STAGEDIR}${PREFIX}/man%' ${WRKSRC}/Makefile
-
 .include <bsd.port.mk>
diff --git a/mail/lbdb/pkg-plist b/mail/lbdb/pkg-plist
index bc6688ed7573..0c7f468debcb 100644
--- a/mail/lbdb/pkg-plist
+++ b/mail/lbdb/pkg-plist
@@ -2,36 +2,37 @@ bin/lbdb-fetchaddr
 bin/lbdb_dotlock
 bin/lbdbq
 bin/nodelist2lbdb
-%%ETCDIR%%.rc
-%%ETCDIR%%_ldap.rc
-libexec/fetchaddr
-libexec/lbdb-munge
-libexec/lbdb_bbdb_query.el
-libexec/lbdb_lib
-%%ABOOK%%libexec/m_abook
-libexec/m_bbdb
-%%EVOLUTION%%libexec/m_evolution
-libexec/m_fido
-libexec/m_finger
-%%GETENT%%libexec/m_getent
-libexec/m_gnomecard
-%%GPG%%libexec/m_gpg
-libexec/m_inmail
-libexec/m_ldap
-libexec/m_muttalias
-libexec/m_palm
-libexec/m_passwd
-libexec/m_pine
-libexec/m_wanderlust
-libexec/m_yppasswd
-libexec/munge
-libexec/munge-keeporder
-libexec/mutt_ldap_query
-libexec/palm_lsaddr
-libexec/qpto8bit
-libexec/tac
+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
+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
+@dirrm libexec/lbdb