4 files changed, 37 insertions, 28 deletions

diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index fa98012a08ee..0c0c3167beea 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -6,49 +6,47 @@
 #
 
 PORTNAME=	ldapsh
-PORTVERSION=	2.0.b1
+PORTVERSION=	2.00
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://madstop.com/ldapsh/
-DISTNAME=	ldapsh-2.0b1
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	../../authors/id/L/LO/LOOSIFER/
 
 MAINTAINER=	flz@xbsd.org
 COMMENT=	Interactive shell used to administer ldap directories
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+		${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+		${SITE_PERL}/Parse/Lex.pm:${PORTSDIR}/devel/p5-ParseLex
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
-SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
-		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
+MAN1=		ldapsh.1
+MAN3=		Net::LDAP::Shell.3 \
+		Net::LDAP::Shell::Parse.3 Net::LDAP::Shell::Util.3
 
-USE_PERL5=	yes
-NO_BUILD=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/ldapsh
+PERL_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} > 500600
+MAN3+=		Net::LDAP::Config.3
+.else
+BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh
 
-pre-install:
-	${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message
-
-do-install:
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/ldapsh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/examples/LdapConfig.pl ${EXAMPLESDIR}/LdapConfig.pl
-	${CP} -r ${WRKSRC}/lib/Net ${SITE_PERL}
-
 post-install:
-	${CAT} ${PKGMESSAGE}
+	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${EXAMPLESDIR}/
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/ldapsh/distinfo b/net/ldapsh/distinfo
index e3d29335ad34..194dc5d707e8 100644
--- a/net/ldapsh/distinfo
+++ b/net/ldapsh/distinfo
@@ -1,2 +1,2 @@
-MD5 (ldapsh-2.0b1.tgz) = cd2a8d7ebfbde0a208f2f134439ce8f9
-SIZE (ldapsh-2.0b1.tgz) = 30677
+MD5 (ldapsh-2.00.tar.gz) = 3d7cc63f268ed05beea2fac95c5ecf87
+SIZE (ldapsh-2.00.tar.gz) = 41546
diff --git a/net/ldapsh/pkg-message b/net/ldapsh/files/pkg-message.in
index 9d2d33d54f5c..8fdccc45d7a7 100644
--- a/net/ldapsh/pkg-message
+++ b/net/ldapsh/files/pkg-message.in
@@ -2,8 +2,10 @@
 Before using ldapsh, you'll probably want to :
 
 - Create the configuration file (an example is in
-  %%EXAMPLESDIR%%/LdapConfig.pl, modify it to
-  suit your needs and place it in %%PREFIX%%/etc/)
+  %%EXAMPLESDIR%%/ldapsh_config, modify it to
+  suit your needs and place it in %%PREFIX%%/etc/).
+- You can create a per-user configuration, just name the
+  configuration file $HOME/.ldapsh_config.
 - See %%DOCSDIR%%/COMMANDS for an overview of
   the available commands.
 *************************************************************
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index 2f0328eefd1f..ec5a6e113adc 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -1,19 +1,28 @@
 bin/ldapsh
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh/.packlist
 %%SITE_PERL%%/Net/LDAP/Config.pm
 %%SITE_PERL%%/Net/LDAP/Shell.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/cat.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/clone.pm
+%%SITE_PERL%%/Net/LDAP/Shell/Commands/commands.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/edit.pm
+%%SITE_PERL%%/Net/LDAP/Shell/Commands/help.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/ls.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/new.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/rm.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/search.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/stub.pm
+%%SITE_PERL%%/Net/LDAP/Shell/Complete.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Desc.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Schema.pm
+%%SITE_PERL%%/Net/LDAP/Shell/Parse.pm
+%%SITE_PERL%%/Net/LDAP/Shell/Parser.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Util.pm
+%%SITE_PERL%%/Net/LDAP/Shell/grammar.yp
+%%SITE_PERL%%/Net/LDAP/Shell/makefile
 %%DOCSDIR%%/COMMANDS
-%%EXAMPLESDIR%%/LdapConfig.pl
+%%EXAMPLESDIR%%/ldapsh_config
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh
 @dirrm %%SITE_PERL%%/Net/LDAP/Shell/Commands
 @dirrm %%SITE_PERL%%/Net/LDAP/Shell
 @dirrm %%DOCSDIR%%