4 files changed, 29 insertions, 18 deletions

diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index bc99557dc5f3..fa98012a08ee 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ldapsh
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	2.0.b1
 CATEGORIES=	net
 MASTER_SITES=	http://madstop.com/ldapsh/
+DISTNAME=	ldapsh-2.0b1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	flz@xbsd.org
@@ -18,9 +18,16 @@ COMMENT=	Interactive shell used to administer ldap directories
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${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
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
+		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
+
 USE_PERL5=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
@@ -28,20 +35,19 @@ WRKSRC=		${WRKDIR}/ldapsh
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long
-.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}
+	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/ldapsh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/examples/LdapConfig.pl ${PREFIX}/etc/LdapConfig.pl.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/LdapConfig.pl ${EXAMPLESDIR}/LdapConfig.pl
 	${CP} -r ${WRKSRC}/lib/Net ${SITE_PERL}
 
-post-patch:
-	${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh
-
 post-install:
 	${CAT} ${PKGMESSAGE}
 
diff --git a/net/ldapsh/distinfo b/net/ldapsh/distinfo
index 4f2b9ddc7380..e3d29335ad34 100644
--- a/net/ldapsh/distinfo
+++ b/net/ldapsh/distinfo
@@ -1,2 +1,2 @@
-MD5 (ldapsh-1.2.tgz) = 0c4b8583594ddb5ddf6af960a77d1d30
-SIZE (ldapsh-1.2.tgz) = 27095
+MD5 (ldapsh-2.0b1.tgz) = cd2a8d7ebfbde0a208f2f134439ce8f9
+SIZE (ldapsh-2.0b1.tgz) = 30677
diff --git a/net/ldapsh/pkg-message b/net/ldapsh/pkg-message
index 9eeb00da2152..9d2d33d54f5c 100644
--- a/net/ldapsh/pkg-message
+++ b/net/ldapsh/pkg-message
@@ -1,6 +1,9 @@
-Before you can run the command:
+*************************************************************
+Before using ldapsh, you'll probably want to :
 
 - Create the configuration file (an example is in
-  /usr/local/etc/LdapConfig.pl.sample)
-- See the file COMMANDS in the DOCSDIR (most likely
-  /usr/local/share/doc/ldapsh) for an overview of the commands.
+  %%EXAMPLESDIR%%/LdapConfig.pl, modify it to
+  suit your needs and place it in %%PREFIX%%/etc/)
+- See %%DOCSDIR%%/COMMANDS for an overview of
+  the available commands.
+*************************************************************
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index f8f24c8aa55a..2f0328eefd1f 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -1,5 +1,4 @@
 bin/ldapsh
-etc/LdapConfig.pl.sample
 %%SITE_PERL%%/Net/LDAP/Config.pm
 %%SITE_PERL%%/Net/LDAP/Shell.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Commands/cat.pm
@@ -8,11 +7,14 @@ etc/LdapConfig.pl.sample
 %%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/Config.pm.example
 %%SITE_PERL%%/Net/LDAP/Shell/Desc.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Schema.pm
 %%SITE_PERL%%/Net/LDAP/Shell/Util.pm
 %%DOCSDIR%%/COMMANDS
+%%EXAMPLESDIR%%/LdapConfig.pl
 @dirrm %%SITE_PERL%%/Net/LDAP/Shell/Commands
 @dirrm %%SITE_PERL%%/Net/LDAP/Shell
+@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%