5 files changed, 23 insertions, 18 deletions

diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile
index 3938055030bc..bb4ef90df316 100644
--- a/www/bkmrkconv/Makefile
+++ b/www/bkmrkconv/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	bkmrkconv
-PORTVERSION=	1.08
+PORTVERSION=	1.09
 CATEGORIES=	www
-MASTER_SITES=	http://www.dcs.warwick.ac.uk/~csube/bkmrkconv/
-DISTFILES=	${PORTNAME}.tar.gz
+MASTER_SITES=	http://www.bleb.org/software/bkmrkconv/
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-pre-install:
-	@${PERL} -pi -e "s:/usr/local/bin/perl:${PERL}:g ; \
-		s:/usr/local/share:${PREFIX}/share:g" ${WRKSRC}/*.pl
+post-patch:
+	@find ${WRKSRC} -name '*.pl' | xargs ${PERL} -pi -e \
+		's|/usr/bin/perl|${PERL}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g'
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bkmrkconv.pl ${PREFIX}/bin/bkmrkconv
 	@${MKDIR} ${PREFIX}/share/bkmrkconv/src
-	@${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/bkmrkconv/
-	@${INSTALL_DATA} ${WRKSRC}/src.example/* ${PREFIX}/share/bkmrkconv/src/
-	@${INSTALL_SCRIPT} ${WRKSRC}/random.pl ${PREFIX}/share/bkmrkconv/
-	@${INSTALL_SCRIPT} ${WRKSRC}/bkmrkconv.pl ${PREFIX}/bin/bkmrkconv
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/* ${PREFIX}/share/bkmrkconv
+	${INSTALL_DATA} ${WRKSRC}/src.example/* ${PREFIX}/share/bkmrkconv/src
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/bkmrkconv
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/bkmrkconv
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/bkmrkconv/distinfo b/www/bkmrkconv/distinfo
index 62c75bea4ea5..901629f20cc0 100644
--- a/www/bkmrkconv/distinfo
+++ b/www/bkmrkconv/distinfo
@@ -1 +1 @@
-MD5 (bkmrkconv.tar.gz) = 2e9a32ef9e1f027772342ea2f4c14e69
+MD5 (bkmrkconv-1.09.tar.gz) = 47048ed3d096cb703f3bdbf5f5a321a1
diff --git a/www/bkmrkconv/files/patch-aa b/www/bkmrkconv/files/patch-aa
index 66cde5978b48..a87eb493af14 100644
--- a/www/bkmrkconv/files/patch-aa
+++ b/www/bkmrkconv/files/patch-aa
@@ -1,5 +1,5 @@
---- bkmrkconv.pl	Thu Mar 23 09:22:20 2000
-+++ bkmrkconv.pl.new	Thu Mar 23 09:25:54 2000
+--- bkmrkconv.pl.orig	Thu Sep 21 00:21:54 2000
++++ bkmrkconv.pl	Wed Mar  7 05:37:20 2001
 @@ -70,9 +70,10 @@
  
  chomp(my $oldcwd = `pwd`);
@@ -7,7 +7,7 @@
 -my $rootpage     = &readFile("src/rootpage.html");
 -my $linkspage    = &readFile("src/linkspage.html");
 -my $contentspage = &readFile("src/contentspage.html") if ($doContents);
-+my $shareDir	= '/usr/local/share/bkmrkconv';
++my $shareDir     = '%%PREFIX%%/share/bkmrkconv';
 +my $rootpage     = &readFile("$shareDir/src/rootpage.html");
 +my $linkspage    = &readFile("$shareDir/src/linkspage.html");
 +my $contentspage = &readFile("$shareDir/src/contentspage.html") if ($doContents);
diff --git a/www/bkmrkconv/pkg-descr b/www/bkmrkconv/pkg-descr
index c9de356cd340..77459438e06c 100644
--- a/www/bkmrkconv/pkg-descr
+++ b/www/bkmrkconv/pkg-descr
@@ -2,7 +2,7 @@ bkmrkconv converts Netscape-generated bookmarks.html
 into a nice tree of files that you can navigate using
 your favorite browser.
 
-WWW: http://www.dcs.warwick.ac.uk/~csube/bkmrkconv/
-Author: Andrew Flegg <jaffa@eh.org>
+WWW: http://www.bleb.org/software/bkmrkconv/
+Author: Andrew Flegg <andrew@bleb.org>
 
 --Will <andrews@technologist.com>
diff --git a/www/bkmrkconv/pkg-plist b/www/bkmrkconv/pkg-plist
index d342633aa6c4..cc8c17c5a356 100644
--- a/www/bkmrkconv/pkg-plist
+++ b/www/bkmrkconv/pkg-plist
@@ -1,8 +1,10 @@
 bin/bkmrkconv
+%%PORTDOCS%%share/doc/bkmrkconv/README.txt
+share/bkmrkconv/dilbert.pl
 share/bkmrkconv/random.pl
-share/bkmrkconv/README.txt
 share/bkmrkconv/src/contentspage.html
 share/bkmrkconv/src/linkspage.html
 share/bkmrkconv/src/rootpage.html
 @dirrm share/bkmrkconv/src
-@dirrm share/bkmrkconv/
+@dirrm share/bkmrkconv
+%%PORTDOCS%%@dirrm share/doc/bkmrkconv