From 673d905d70c7e50bd9fe3db06ff60b4bf1949a22 Mon Sep 17 00:00:00 2001 From: nra Date: Tue, 9 Oct 2001 15:49:39 +0000 Subject: Update doc2html to version 3.0. PR 14169 by Eric Schnoebelen. --- converters/doc2html/Makefile | 11 ++++-- converters/doc2html/distinfo | 9 +++-- converters/doc2html/patches/patch-aa | 73 +++++++++++++++--------------------- converters/doc2html/pkg/PLIST | 3 +- 4 files changed, 44 insertions(+), 52 deletions(-) (limited to 'converters/doc2html') diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile index 73834c2a099..797a20521d7 100644 --- a/converters/doc2html/Makefile +++ b/converters/doc2html/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2001/10/04 12:00:45 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/09 15:49:39 nra Exp $ # DISTNAME= doc2html -PKGNAME= doc2html-2.1 +PKGNAME= doc2html-3.0 CATEGORIES= converters MASTER_SITES= http://www.htdig.org/files/contrib/parsers/ @@ -19,13 +19,16 @@ DEPENDS+= catdoc-[0-9]*:../../textproc/catdoc USE_PERL5= YES do-build: +.for CVTR in doc2html pdf2html ${SED} -e "s%@@LOCALBASE@@%${LOCALBASE}%g" \ -e "s%/usr/bin/perl%${PERL5}%g" \ -e "s%/bin/sed%${SED}%g" \ - -e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/doc2html.pl \ - > ${WRKSRC}/doc2html + -e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/${CVTR}.pl \ + > ${WRKSRC}/${CVTR} +.endfor do-install: ${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html + ${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html .include "../../mk/bsd.pkg.mk" diff --git a/converters/doc2html/distinfo b/converters/doc2html/distinfo index d1fb850c8b7..75b17c3191f 100644 --- a/converters/doc2html/distinfo +++ b/converters/doc2html/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/10/09 15:49:39 nra Exp $ -SHA1 (doc2html.tar.gz) = 78f78950a87f9134dc871d68e897857c7fa76dbc -Size (doc2html.tar.gz) = 12444 bytes -SHA1 (patch-aa) = 86ca749c41251845b06bab5fe59cdddcde01ab63 +SHA1 (doc2html.tar.gz) = 8ee934d66a809974b5d1d1b94278626c7f3922ab +Size (doc2html.tar.gz) = 15038 bytes +SHA1 (patch-aa) = 5ada7d696b60272eef591c5407900b9aab2ea047 +SHA1 (patch-ab) = 4fc655ec753713a25a7f98fd9d3933ba5ff1d6ff diff --git a/converters/doc2html/patches/patch-aa b/converters/doc2html/patches/patch-aa index 1bd2b4476b2..45542ee1264 100644 --- a/converters/doc2html/patches/patch-aa +++ b/converters/doc2html/patches/patch-aa @@ -1,65 +1,52 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $ +$NetBSD: patch-aa,v 1.2 2001/10/09 15:49:40 nra Exp $ ---- doc2html.pl.orig Mon Sep 11 05:29:20 2000 +--- doc2html.pl.orig Tue Jun 5 04:12:02 2001 +++ doc2html.pl -@@ -20,48 +20,48 @@ - # If all else fails, attempts to read file without conversion. - - # wp2html binary --$WP2HTML = "/opt/local/wp2html-3.2/bin/wp2html"; -+$WP2HTML = ""; +@@ -51,13 +51,13 @@ # rtf2html converts Rich Text Font documents to HTML - # (get it from: http://www.res.bbsrc.ac.uk/wp2html/): --$RTF2HTML = "/opt/local/rtf2html-1.1/bin/rtf2html"; -+$RTF2HTML = "@@LOCALBASE@@/bin/rtf2html"; + # (get it from http://www.fe.msk.ru/~vitus/catdoc/) +-my $RTF2HTML = ''; ++my $RTF2HTML = '@@LOCALBASE@@/bin/rtf2html'; # Catdoc converts MS Word to plain text - # (get it from: http://www.fe.msk.ru/~vitus/catdoc/): + # (get it from: http://www.fe.msk.ru/~vitus/catdoc/) #version of catdoc for Word6, Word7 & Word97 files: --$CATDOC = "/opt/local/catdoc-0.91.4/bin/catdoc"; -+$CATDOC = "@@LOCALBASE@@/bin/catdoc"; - - #version of catdoc for Word2 files: --$CATDOC2 = "/opt/local/catdoc-0.91.4/bin/catdoc"; -+$CATDOC2 = "@@LOCALBASE@@/bin/catdoc"; +-my $CATDOC = ''; ++my $CATDOC = '@@LOCALBASE@@/bin/catdoc'; - #version of catdoc for Word 5.1 for MAC: --$CATDOCM = "/opt/local/catdoc-0.91.4/bin/catdoc"; -+$CATDOCM = "@@LOCALBASE@@/bin/catdoc"; + #version of catdoc for Word2 files + my $CATDOC2 = $CATDOC; +@@ -67,11 +67,11 @@ # PostScript to text converter - # (get it from the ghostscript 3.33 (or later) package): --$CATPS = "/usr/freeware/bin/ps2ascii"; -+$CATPS = "@@LOCALBASE@@/bin/ps2ascii"; + # (get it from the ghostscript 3.33 (or later) package) +-my $CATPS = ''; ++my $CATPS = '@@LOCALBASE@@/bin/ps2ascii'; - # add to search path the directory which contains gs: + # add to search path the directory which contains gs + # (edit for your environment) -$ENV{PATH} .= ":/usr/freeware/bin"; +# $ENV{PATH} .= ":/usr/freeware/bin"; - # PDF to text converter and pdfinfo tool - # (get them from the xpdf package at http://www.foolabs.com/xpdf/): --$CATPDF = "/opt/local/xpdf-0.9/bin/pdftotext"; --$PDFINFO = "/opt/local/xpdf-0.9/bin/pdfinfo"; -+$CATPDF = "@@X11BASE@@/bin/pdftotext"; -+$PDFINFO = "@@X11BASE@@/bin/pdfinfo"; + # PDF to HTML conversion script + # Full pathname of Perl script pdf2html.pl +@@ -79,7 +79,7 @@ #Microsoft Excel to HTML converter # (get it from www.xlHtml.org) --$XLS2HTML = "/opt/local/xlHtml-0.2.7.2/bin/xlHtml"; -+$XLS2HTML = "@@LOCALBASE@@/bin/xlHtml"; - - #Microsoft Powerpoint to HTML converter - # (get it from www.xlHtml.org) --$PPT2HTML = "/opt/local/xlHtml-0.2.7.2/bin/pptHtml"; -+$PPT2HTML = "@@LOCALBASE@@/bin/pptHtml"; +-my $XLS2HTML = ''; ++my $XLS2HTML = '@@LOCALBASE@@/bin/xlHtml'; #MicroSoft Excel to .CSV converter # (you don't need this if you have xlHtml) - # (get it with catdoc) --$CATXLS = "/opt/local/catdoc-0.91.2/bin/xls2csv"; -+$CATXLS = ""; +@@ -88,7 +88,7 @@ + + #Microsoft Powerpoint to HTML converter + # (get it from www.xlHtml.org) +-my $PPT2HTML = ''; ++my $PPT2HTML = '@@LOCALBASE@@/bin/pptHtml'; - ######################################################################################## - # Written by David Adams . + #Shockwave Flash + # (extracts links from file) diff --git a/converters/doc2html/pkg/PLIST b/converters/doc2html/pkg/PLIST index d2928613c09..781f06694d2 100644 --- a/converters/doc2html/pkg/PLIST +++ b/converters/doc2html/pkg/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/10/09 15:49:40 nra Exp $ bin/doc2html +bin/pdf2html -- cgit v1.2.3