From ab0c92ec35e2821bce62256076d0bf50ee330319 Mon Sep 17 00:00:00 2001 From: wennmach Date: Thu, 15 Mar 2007 23:00:22 +0000 Subject: Update txt2html to version 2.44. The old version of txt2html was so outdated that it makes little sense to list the changes. Most importantly, the new version now has major revision number 2, which is due to the fact that HTML::TextToHTML and the official txt2html were merged. Lots of subsequent added features and bug fixes. The updated package was prepared by Aleksey Cheusov in wip. Closes PR pkg/35469. --- converters/txt2html/DESCR | 12 +++++++++-- converters/txt2html/Makefile | 39 ++++++++++++++++-------------------- converters/txt2html/PLIST | 8 +------- converters/txt2html/distinfo | 9 ++++----- converters/txt2html/patches/patch-aa | 15 -------------- 5 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 converters/txt2html/patches/patch-aa (limited to 'converters') diff --git a/converters/txt2html/DESCR b/converters/txt2html/DESCR index c8170c685b4..9a3ec8a764c 100644 --- a/converters/txt2html/DESCR +++ b/converters/txt2html/DESCR @@ -1,2 +1,10 @@ -txt2html is a text to HTML converter written in Perl by -Seth Golub . +HTML::TextToHTML converts plain text files to HTML. The txt2html +script uses this module to do the same from the command-line. + +It supports headings, tables, lists, simple character markup, and +hyperlinking, and is highly customizable. It recognizes some of the +apparent structure of the source document (mostly whitespace and +typographic layout), and attempts to mark that structure explicitly +using HTML. The purpose for this tool is to provide an easier way of +converting existing text documents to HTML format, giving something +nicer than just whapping the text into a big PRE block. diff --git a/converters/txt2html/Makefile b/converters/txt2html/Makefile index d671d2b500f..e3d6dc5732e 100644 --- a/converters/txt2html/Makefile +++ b/converters/txt2html/Makefile @@ -1,29 +1,24 @@ -# $NetBSD: Makefile,v 1.13 2006/10/14 08:00:47 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/03/15 23:00:25 wennmach Exp $ +# -DISTNAME= txt2html-1.28 -CATEGORIES= converters www -MASTER_SITES= http://www.sethoscope.net/txt2html/ +DISTNAME= txt2html-2.44 +CATEGORIES= converters www +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=txt2html/} -MAINTAINER= wennmach@NetBSD.org -HOMEPAGE= http://www.sethoscope.net/txt2html/ -COMMENT= Text to HTML converter +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://txt2html.sourceforge.net/ +COMMENT= Plain text to HTML convertor -NO_BUILD= YES -USE_TOOLS+= perl:run -REPLACE_PERL= txt2html.pl +PKG_INSTALLATION_TYPES= overwrite pkgviews +REPLACE_PERL= scripts/txt2html -INSTALLATION_DIRS= bin +PERL5_CONFIGURE= yes +PERL5_MODULE_TYPE= Module::Build +PERL5_PACKLIST= auto/HTML/TextToHTML/.packlist -do-configure: - ${SED} -e "s:@PREFIX@:${PREFIX}:g" \ - ${WRKSRC}/txt2html.pl > ${WRKSRC}/txt2html - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/txt2html ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/txt2html - ${INSTALL_DATA} ${WRKSRC}/txt2html.dict ${PREFIX}/share/txt2html - ${INSTALL_DATA} ${WRKSRC}/sample.foot ${PREFIX}/share/txt2html - ${INSTALL_DATA} ${WRKSRC}/sample.html ${PREFIX}/share/txt2html - ${INSTALL_DATA} ${WRKSRC}/sample.txt ${PREFIX}/share/txt2html +DEPENDS+= p5-Getopt-Long-[0-9]*:../../devel/p5-Getopt-Long +DEPENDS+= p5-Getopt-ArgvFile-[0-9]*:../../devel/p5-Getopt-ArgvFile +DEPENDS+= p5-AppConfig-Std-[0-9]*:../../devel/p5-AppConfig-Std +.include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/txt2html/PLIST b/converters/txt2html/PLIST index 77feb245a2f..a0b61b7a64d 100644 --- a/converters/txt2html/PLIST +++ b/converters/txt2html/PLIST @@ -1,7 +1 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:51:10 zuntum Exp $ -bin/txt2html -share/txt2html/txt2html.dict -share/txt2html/sample.foot -share/txt2html/sample.html -share/txt2html/sample.txt -@dirrm share/txt2html +@comment $NetBSD: PLIST,v 1.2 2007/03/15 23:00:25 wennmach Exp $ diff --git a/converters/txt2html/distinfo b/converters/txt2html/distinfo index c5756ecf27d..ae612ea9863 100644 --- a/converters/txt2html/distinfo +++ b/converters/txt2html/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 16:12:35 agc Exp $ +$NetBSD: distinfo,v 1.5 2007/03/15 23:00:25 wennmach Exp $ -SHA1 (txt2html-1.28.tar.gz) = 1f6ce65f00e5f3c416d0a0303061439a4f181f26 -RMD160 (txt2html-1.28.tar.gz) = 9c438ed54a3a36860b03f8f5bdc5b0e2536f5f2f -Size (txt2html-1.28.tar.gz) = 23222 bytes -SHA1 (patch-aa) = 48e83356edf4e205e28331d930aaf16d1b37ae07 +SHA1 (txt2html-2.44.tar.gz) = 3104761d274d3a46fdb1d9c4b4ebe0a083f4a4cb +RMD160 (txt2html-2.44.tar.gz) = d34fdacd9939560e852a47afe996d54f9e41181c +Size (txt2html-2.44.tar.gz) = 117583 bytes diff --git a/converters/txt2html/patches/patch-aa b/converters/txt2html/patches/patch-aa deleted file mode 100644 index fa258222916..00000000000 --- a/converters/txt2html/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2001/11/30 17:29:26 jlam Exp $ - -Adopt to pkgsrc path conventions. - ---- txt2html.pl.orig Fri Oct 20 15:28:58 2000 -+++ txt2html.pl Fri Oct 20 15:32:10 2000 -@@ -222,7 +222,7 @@ - # 2: The code that will make the links - # 4: When each rule matches something - --$system_link_dict = "/usr/local/lib/txt2html.dict"; # after options -+$system_link_dict = "@PREFIX@/share/txt2html/txt2html.dict"; # after options - $default_link_dict = "$ENV{'HOME'}/.txt2html.dict"; # before options - - # [-pm/+pm ] | [--preformat-marker / --nopreformat-marker ] -- cgit v1.2.3