4 files changed, 63 insertions, 26 deletions

diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile
index 3ab830fe5c37..919e34516364 100644
--- a/textproc/bib2html/Makefile
+++ b/textproc/bib2html/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bib2html
-PORTVERSION=	1.1
+PORTVERSION=	3.3
 CATEGORIES=	textproc print
 MASTER_SITES=	http://galland.stephane.free.fr/arakhne.org/bib2html/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
@@ -15,23 +15,21 @@ MASTER_SITES=	http://galland.stephane.free.fr/arakhne.org/bib2html/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The BibTeX to HTML Translator
 
-USE_REINPLACE=	yes
-USE_PERL5_RUN=	yes
-NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-PLIST_FILES=	bin/bib2html
+USE_PERL5_RUN=	yes
+NO_BUILD=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%SITE_PERL%%|${SITE_PERL}|" ${WRKSRC}/bib2html.pl
+	@${SED} -e 's:= "$$0";:= "${SITE_PERL}/Bib2HTML";:g' \
+		< ${WRKSRC}/bib2html.pl > ${WRKSRC}/bib2html
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bib2html.pl ${PREFIX}/bin/bib2html
-	@${MKDIR} ${SITE_PERL}
-	${CP} -R ${WRKSRC}/Bib2HTML ${SITE_PERL}
-	@${FIND} ${SITE_PERL}/Bib2HTML -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${SITE_PERL}/Bib2HTML -type d | ${SORT} -r |  \
-		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${PREFIX}/bin
+	@${MKDIR} ${SITE_PERL}/Bib2HTML
+	@cd ${WRKSRC}/Bib2HTML && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${SITE_PERL}/Bib2HTML
+	${FIND} ${SITE_PERL}/Bib2HTML -type f | ${XARGS} ${CHMOD} ${LIBMODE}
+	${FIND} ${SITE_PERL}/Bib2HTML -type d | ${XARGS} ${CHMOD} a+rx
 
 .include <bsd.port.mk>
diff --git a/textproc/bib2html/distinfo b/textproc/bib2html/distinfo
index 0a38c85587a4..43f9012ef411 100644
--- a/textproc/bib2html/distinfo
+++ b/textproc/bib2html/distinfo
@@ -1,2 +1,2 @@
-MD5 (bib2html-1.1.tar.gz) = 6ae4bc825e555d3f35c2dd182a803800
-SIZE (bib2html-1.1.tar.gz) = 92630
+MD5 (bib2html-3.3.tar.gz) = ec9ea5d6f2bfb8e0d7b8d51c2f64b5c2
+SIZE (bib2html-3.3.tar.gz) = 547210
diff --git a/textproc/bib2html/files/patch-bib2html.pl b/textproc/bib2html/files/patch-bib2html.pl
deleted file mode 100644
index 6d8bf5aecdbf..000000000000
--- a/textproc/bib2html/files/patch-bib2html.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- bib2html.pl.orig	Tue Jan 13 09:00:38 2004
-+++ bib2html.pl	Tue Jan 13 09:01:05 2004
-@@ -33,7 +33,7 @@
- my $PERLSCRIPTDIR ;
- BEGIN{
-   # Where is this script?
--  $PERLSCRIPTDIR = "$0";
-+  $PERLSCRIPTDIR = "%%SITE_PERL%%/Bib2HTML";
-   my $scriptdir = dirname( $PERLSCRIPTDIR );
-   while ( -e $PERLSCRIPTDIR && -l $PERLSCRIPTDIR ) {
-     $PERLSCRIPTDIR = readlink($PERLSCRIPTDIR);
diff --git a/textproc/bib2html/pkg-plist b/textproc/bib2html/pkg-plist
new file mode 100644
index 000000000000..5475c20089f3
--- /dev/null
+++ b/textproc/bib2html/pkg-plist
@@ -0,0 +1,50 @@
+bin/bib2html
+%%SITE_PERL%%/Bib2HTML/Checker/Names.pm
+%%SITE_PERL%%/Bib2HTML/General/Error.pm
+%%SITE_PERL%%/Bib2HTML/General/HTML.pm
+%%SITE_PERL%%/Bib2HTML/General/Misc.pm
+%%SITE_PERL%%/Bib2HTML/General/Title.pm
+%%SITE_PERL%%/Bib2HTML/General/Verbose.pm
+%%SITE_PERL%%/Bib2HTML/Generator/AbstractGenerator.pm
+%%SITE_PERL%%/Bib2HTML/Generator/DomainGen.pm
+%%SITE_PERL%%/Bib2HTML/Generator/ExtendedGen.pm
+%%SITE_PERL%%/Bib2HTML/Generator/HTMLGen.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Lang/English.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Lang/French.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Lang/Portuguese.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Lang/Spanish.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Lang.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/child.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/emptychild.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/lastchild.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/minus.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/plus.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/samechild.gif
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna/stylesheet.css
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Theme/Simple.pm
+%%SITE_PERL%%/Bib2HTML/Generator/Theme.pm
+%%SITE_PERL%%/Bib2HTML/Generator/XMLGen.pm
+%%SITE_PERL%%/Bib2HTML/Generator/bibteXML-ext.dtd
+%%SITE_PERL%%/Bib2HTML/Generator/bibteXML.dtd
+%%SITE_PERL%%/Bib2HTML/Generator/drive.png
+%%SITE_PERL%%/Bib2HTML/Generator/loupe.gif
+%%SITE_PERL%%/Bib2HTML/Generator/valid-css.gif
+%%SITE_PERL%%/Bib2HTML/Generator/valid-html401.gif
+%%SITE_PERL%%/Bib2HTML/Parser/BibScanner.pm
+%%SITE_PERL%%/Bib2HTML/Parser/Parser.pm
+%%SITE_PERL%%/Bib2HTML/Parser/Scanner.pm
+%%SITE_PERL%%/Bib2HTML/Parser/StateMachine.pm
+%%SITE_PERL%%/Bib2HTML/Release.pm
+%%SITE_PERL%%/Bib2HTML/Translator/BibTeXEntry.pm
+%%SITE_PERL%%/Bib2HTML/Translator/BibTeXName.pm
+%%SITE_PERL%%/Bib2HTML/Translator/TeX.pm
+@dirrm %%SITE_PERL%%/Bib2HTML/Translator
+@dirrm %%SITE_PERL%%/Bib2HTML/Parser
+@dirrm %%SITE_PERL%%/Bib2HTML/Generator/Theme/Dyna
+@dirrm %%SITE_PERL%%/Bib2HTML/Generator/Theme
+@dirrm %%SITE_PERL%%/Bib2HTML/Generator/Lang
+@dirrm %%SITE_PERL%%/Bib2HTML/Generator
+@dirrm %%SITE_PERL%%/Bib2HTML/General
+@dirrm %%SITE_PERL%%/Bib2HTML/Checker
+@dirrm %%SITE_PERL%%/Bib2HTML