NetBSD Problem Report #14169
Received: (qmail 29438 invoked from network); 6 Oct 2001 02:43:42 -0000
Message-Id: <200110060243.f962hfZ05618@egsner.cirr.com>
Date: Fri, 5 Oct 2001 21:43:41 -0500 (CDT)
From: eric@cirr.com
Reply-To: eric@cirr.com
To: gnats-bugs@gnats.netbsd.org
Subject: package converters/doc2html updated to 3.0
X-Send-Pr-Version: 3.95
>Number: 14169
>Category: pkg
>Synopsis: converters/doc2html is out of date
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Oct 06 02:44:00 +0000 2001
>Closed-Date: Tue Oct 09 16:17:41 +0000 2001
>Last-Modified: Tue Oct 09 16:17:41 +0000 2001
>Originator: Eric Schnoebelen
>Release: NetBSD 1.5.1
>Organization:
Eric Schnoebelen eric@cirr.com http://www.cirr.com
The Internet interprets censorship as damage and routes around it.
-- Old net.parable
>Environment:
System: NetBSD egsner 1.5.1 NetBSD 1.5.1 (GENERIC) #56: Mon Jul 2 15:54:23 CEST 2001 he@nsa.uninett.no:/usr/src/sys/arch/i386/compile/GENERIC i386
>Description:
converters/doc2html as included in pkgsrc, dated 2001-10-05
will not build, as the author as updated the (unnumbered) source
tarball.
>How-To-Repeat:
cd $PKGSRCDIR/converters/doc2html; make update
>Fix:
Below is a patch to update the package to doc2html 3.0.
The patch also installs the pdf2html converter included in the doc2html
package. It does not install the swf2html converter, as the pkgsrc tree
doesn't appear to have the needed supporting program.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# pkg-mods.patch
#
echo x - pkg-mods.patch
sed 's/^X//' >pkg-mods.patch << 'END-of-pkg-mods.patch'
XIndex: Makefile
X===================================================================
XRCS file: /cvsroot/pkgsrc/converters/doc2html/Makefile,v
Xretrieving revision 1.3
Xdiff -b -u -w -r1.3 Makefile
X--- Makefile 2001/10/04 12:00:45 1.3
X+++ Makefile 2001/10/06 02:38:26
X@@ -2,7 +2,7 @@
X #
X
X DISTNAME= doc2html
X-PKGNAME= doc2html-2.1
X+PKGNAME= doc2html-3.0
X CATEGORIES= converters
X MASTER_SITES= http://www.htdig.org/files/contrib/parsers/
X
X@@ -19,13 +19,16 @@
X USE_PERL5= YES
X
X do-build:
X+.for CVTR in doc2html pdf2html
X ${SED} -e "s%@@LOCALBASE@@%${LOCALBASE}%g" \
X -e "s%/usr/bin/perl%${PERL5}%g" \
X -e "s%/bin/sed%${SED}%g" \
X- -e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/doc2html.pl \
X- > ${WRKSRC}/doc2html
X+ -e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/${CVTR}.pl \
X+ > ${WRKSRC}/${CVTR}
X+.endfor
X
X do-install:
X ${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html
X+ ${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html
X
X .include "../../mk/bsd.pkg.mk"
XIndex: distinfo
X===================================================================
XRCS file: /cvsroot/pkgsrc/converters/doc2html/distinfo,v
Xretrieving revision 1.1.1.1
Xdiff -b -u -w -r1.1.1.1 distinfo
X--- distinfo 2001/05/14 14:03:20 1.1.1.1
X+++ distinfo 2001/10/06 02:38:26
X@@ -1,5 +1,6 @@
X $NetBSD: distinfo,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $
X
X-SHA1 (doc2html.tar.gz) = 78f78950a87f9134dc871d68e897857c7fa76dbc
X-Size (doc2html.tar.gz) = 12444 bytes
X-SHA1 (patch-aa) = 86ca749c41251845b06bab5fe59cdddcde01ab63
X+SHA1 (doc2html.tar.gz) = 8ee934d66a809974b5d1d1b94278626c7f3922ab
X+Size (doc2html.tar.gz) = 15038 bytes
X+SHA1 (patch-aa) = 5ada7d696b60272eef591c5407900b9aab2ea047
X+SHA1 (patch-ab) = 4fc655ec753713a25a7f98fd9d3933ba5ff1d6ff
XIndex: patches/patch-aa
X===================================================================
XRCS file: /cvsroot/pkgsrc/converters/doc2html/patches/patch-aa,v
Xretrieving revision 1.1.1.1
Xdiff -b -u -w -r1.1.1.1 patch-aa
X--- patch-aa 2001/05/14 14:03:20 1.1.1.1
X+++ patch-aa 2001/10/06 02:38:26
X@@ -1,65 +1,52 @@
X-$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $
X+$NetBSD$
X
X---- doc2html.pl.orig Mon Sep 11 05:29:20 2000
X+--- doc2html.pl.orig Tue Jun 5 04:12:02 2001
X +++ doc2html.pl
X-@@ -20,48 +20,48 @@
X- # If all else fails, attempts to read file without conversion.
X+@@ -51,13 +51,13 @@
X
X- # wp2html binary
X--$WP2HTML = "/opt/local/wp2html-3.2/bin/wp2html";
X-+$WP2HTML = "";
X-
X # rtf2html converts Rich Text Font documents to HTML
X- # (get it from: http://www.res.bbsrc.ac.uk/wp2html/):
X--$RTF2HTML = "/opt/local/rtf2html-1.1/bin/rtf2html";
X-+$RTF2HTML = "@@LOCALBASE@@/bin/rtf2html";
X+ # (get it from http://www.fe.msk.ru/~vitus/catdoc/)
X+-my $RTF2HTML = '';
X++my $RTF2HTML = '@@LOCALBASE@@/bin/rtf2html';
X
X # Catdoc converts MS Word to plain text
X- # (get it from: http://www.fe.msk.ru/~vitus/catdoc/):
X+ # (get it from: http://www.fe.msk.ru/~vitus/catdoc/)
X
X #version of catdoc for Word6, Word7 & Word97 files:
X--$CATDOC = "/opt/local/catdoc-0.91.4/bin/catdoc";
X-+$CATDOC = "@@LOCALBASE@@/bin/catdoc";
X+-my $CATDOC = '';
X++my $CATDOC = '@@LOCALBASE@@/bin/catdoc';
X
X- #version of catdoc for Word2 files:
X--$CATDOC2 = "/opt/local/catdoc-0.91.4/bin/catdoc";
X-+$CATDOC2 = "@@LOCALBASE@@/bin/catdoc";
X-
X- #version of catdoc for Word 5.1 for MAC:
X--$CATDOCM = "/opt/local/catdoc-0.91.4/bin/catdoc";
X-+$CATDOCM = "@@LOCALBASE@@/bin/catdoc";
X+ #version of catdoc for Word2 files
X+ my $CATDOC2 = $CATDOC;
X+@@ -67,11 +67,11 @@
X
X # PostScript to text converter
X- # (get it from the ghostscript 3.33 (or later) package):
X--$CATPS = "/usr/freeware/bin/ps2ascii";
X-+$CATPS = "@@LOCALBASE@@/bin/ps2ascii";
X+ # (get it from the ghostscript 3.33 (or later) package)
X+-my $CATPS = '';
X++my $CATPS = '@@LOCALBASE@@/bin/ps2ascii';
X
X- # add to search path the directory which contains gs:
X+ # add to search path the directory which contains gs
X+ # (edit for your environment)
X -$ENV{PATH} .= ":/usr/freeware/bin";
X +# $ENV{PATH} .= ":/usr/freeware/bin";
X
X- # PDF to text converter and pdfinfo tool
X- # (get them from the xpdf package at http://www.foolabs.com/xpdf/):
X--$CATPDF = "/opt/local/xpdf-0.9/bin/pdftotext";
X--$PDFINFO = "/opt/local/xpdf-0.9/bin/pdfinfo";
X-+$CATPDF = "@@X11BASE@@/bin/pdftotext";
X-+$PDFINFO = "@@X11BASE@@/bin/pdfinfo";
X+ # PDF to HTML conversion script
X+ # Full pathname of Perl script pdf2html.pl
X+@@ -79,7 +79,7 @@
X
X #Microsoft Excel to HTML converter
X- # (get it from www.xlHtml.org)
X--$XLS2HTML = "/opt/local/xlHtml-0.2.7.2/bin/xlHtml";
X-+$XLS2HTML = "@@LOCALBASE@@/bin/xlHtml";
X-
X- #Microsoft Powerpoint to HTML converter
X # (get it from www.xlHtml.org)
X--$PPT2HTML = "/opt/local/xlHtml-0.2.7.2/bin/pptHtml";
X-+$PPT2HTML = "@@LOCALBASE@@/bin/pptHtml";
X+-my $XLS2HTML = '';
X++my $XLS2HTML = '@@LOCALBASE@@/bin/xlHtml';
X
X #MicroSoft Excel to .CSV converter
X # (you don't need this if you have xlHtml)
X- # (get it with catdoc)
X--$CATXLS = "/opt/local/catdoc-0.91.2/bin/xls2csv";
X-+$CATXLS = "";
X+@@ -88,7 +88,7 @@
X+
X+ #Microsoft Powerpoint to HTML converter
X+ # (get it from www.xlHtml.org)
X+-my $PPT2HTML = '';
X++my $PPT2HTML = '@@LOCALBASE@@/bin/pptHtml';
X
X- ########################################################################################
X- # Written by David Adams <d.j.adams@soton.ac.uk>.
X+ #Shockwave Flash
X+ # (extracts links from file)
X--- /dev/null Fri Oct 5 21:35:00 2001
X+++ patches/patch-ab Fri Oct 5 19:41:54 2001
X@@ -0,0 +1,15 @@
X+$NetBSD$
X+
X+--- pdf2html.pl.orig Fri May 25 06:57:02 2001
X++++ pdf2html.pl
X+@@ -17,8 +17,8 @@
X+
X+ #### YOU MUST SET THESE ####
X+
X+-my $PDFTOTEXT = "/... .../pdftotext";
X+-my $PDFINFO = "/... .../pdfinfo";
X++my $PDFTOTEXT = "@@X11BASE@@/bin/pdftotext";
X++my $PDFINFO = "@@X11BASE@@/bin/pdfinfo";
X+ #
X+ # De-hyphenation option (only affects end-of-line hyphens):
X+ my $Dehyphenate = 1;
END-of-pkg-mods.patch
exit
>Release-Note:
>Audit-Trail:
From: eric@cirr.com (Eric Schnoebelen)
To: tobi@themaster.de
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/14169: package converters/doc2html updated to 3.0
Date: Sun, 07 Oct 2001 10:28:56 -0500
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <22423.1002468528.1@cirr.com>
Eric Schnoebelen writes:
-
- Tobias Seiler writes:
- - I'm trying to apply the patch file to the directory, but I dont hav any
- - success with it. The Makefile is rejected and also the patch-aa and the
- - patch-ab doesn't get generated but a file devnull instead.
- -
- - Do you have an idea of what is going wrong here ?
-
- However, I did just test the patch, and while it appears
- to generate the patches/patch-ab correct, it pretty badly
- mangles the Makefile and the patch to patches/patch-aa.
I've regenerated the patch set. Apply with `patch -p1'.
I've attached it to this message.
--
Eric Schnoebelen eric@cirr.com http://www.cirr.com
"The reasonable man adapts himself to the world; the unreasonable one
persists in trying to adapt the world to himself. Therefore, all
progress depends on the unreasonable man." - George Bernard Shaw
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <22423.1002468528.2@cirr.com>
Content-Description: Revised patch to converters/doc2html
diff -Pur doc2html/Makefile doc2html+/Makefile
--- doc2html/Makefile Thu Oct 4 07:00:45 2001
+++ doc2html+/Makefile Fri Oct 5 19:46:11 2001
@@ -2,7 +2,7 @@
#
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 @@
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 -Pur doc2html/distinfo doc2html+/distinfo
--- doc2html/distinfo Mon May 14 09:03:20 2001
+++ doc2html+/distinfo Fri Oct 5 19:46:16 2001
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.1.1.1 2001/05/14 14:03:20 agc 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 -Pur doc2html/patches/patch-aa doc2html+/patches/patch-aa
--- doc2html/patches/patch-aa Mon May 14 09:03:20 2001
+++ doc2html+/patches/patch-aa Fri Oct 5 19:42:16 2001
@@ -1,65 +1,52 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $
+$NetBSD$
---- 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";
+-my $CATDOC = '';
++my $CATDOC = '@@LOCALBASE@@/bin/catdoc';
- #version of catdoc for Word2 files:
--$CATDOC2 = "/opt/local/catdoc-0.91.4/bin/catdoc";
-+$CATDOC2 = "@@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 <d.j.adams@soton.ac.uk>.
+ #Shockwave Flash
+ # (extracts links from file)
diff -Pur doc2html/patches/patch-ab doc2html+/patches/patch-ab
--- doc2html/patches/patch-ab Wed Dec 31 18:00:00 1969
+++ doc2html+/patches/patch-ab Fri Oct 5 19:41:54 2001
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- pdf2html.pl.orig Fri May 25 06:57:02 2001
++++ pdf2html.pl
+@@ -17,8 +17,8 @@
+
+ #### YOU MUST SET THESE ####
+
+-my $PDFTOTEXT = "/... .../pdftotext";
+-my $PDFINFO = "/... .../pdfinfo";
++my $PDFTOTEXT = "@@X11BASE@@/bin/pdftotext";
++my $PDFINFO = "@@X11BASE@@/bin/pdfinfo";
+ #
+ # De-hyphenation option (only affects end-of-line hyphens):
+ my $Dehyphenate = 1;
------- =_aaaaaaaaaa0--
State-Changed-From-To: open->closed
State-Changed-By: nra
State-Changed-When: Tue Oct 9 09:17:17 PDT 2001
State-Changed-Why:
Commited, with slight change to the PLIST. Thanks!
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.