1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Update the texi2html port to version 1.82, largely based on

Pietro Cerutti's patch from the PR, but preserving the support for
a user-specified PROGRAM_PREFIX to keep PR 62607 still fixed :)
- update to 1.82
- support NOPORTDOCS properly
- fix DOCSDIR
- use the Savannah MASTER_SITES now that we're using a stock upstream version

While I'm here, refresh the single patch and add a descriptive comment.

PR:		136303
Submitted by:	gahr
This commit is contained in:
Peter Pentchev 2009-07-14 11:55:44 +00:00
parent 0aeb4509ee
commit be547a7411
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=237773
5 changed files with 106 additions and 131 deletions

View File

@ -6,12 +6,11 @@
#
PORTNAME= texi2html
PORTVERSION= 1.76
PORTREVISION= 1
PORTVERSION= 1.82
PORTEPOCH= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hrs
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roam@FreeBSD.org
COMMENT= Texinfo to HTML converter
@ -39,7 +38,9 @@ pre-everything::
@${ECHO} ""
post-patch:
sleep 2
${TOUCH} ${WRKSRC}/translations.pl
.if defined(NOPORTDOCS)
${REINPLACE_CMD} -e 's| install-texinfohtmlDATA||g' ${WRKSRC}/doc/Makefile.in
.endif
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (texi2html-1.76.tar.gz) = 38d0021c547612dba3543bdb1376569f
SHA256 (texi2html-1.76.tar.gz) = 387392086e591be9bd58879eb1e05908b6b886c871b92ad240b159af2ae6a623
SIZE (texi2html-1.76.tar.gz) = 470207
MD5 (texi2html-1.82.tar.gz) = 7ea537a8c81ffbf5421b39c0333e91df
SHA256 (texi2html-1.82.tar.gz) = 6c7c94a2d88ffe218a33e91118c2b039336cbe3f2f8b4e3a78e4fd1502072936
SIZE (texi2html-1.82.tar.gz) = 7350232

View File

@ -1,12 +1,14 @@
--- doc/Makefile.in.orig Thu Dec 30 00:42:11 2004
+++ doc/Makefile.in Thu Jan 6 18:18:11 2005
@@ -147,8 +147,8 @@
texi2html.ascii
Install into the proper directories.
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -162,8 +162,8 @@
#CLEANFILES = texi2html.ps texi2html.pdf texi2html.html \
# texi2html.ascii
#
-texinfodata = $(datadir)/texinfo
-texinfohtmldir = $(texinfodata)/html
+texinfodata = $(datadir)/doc/texinfo
+texinfodata = $(datadir)/doc/texi2html
+texinfohtmldir = $(texinfodata)
texinfohtml_DATA = texi2html.html

View File

@ -1,41 +0,0 @@
--- texi2html.pl.orig Fri Feb 4 02:16:52 2005
+++ texi2html.pl Sun Feb 13 00:18:09 2005
@@ -2445,20 +2445,24 @@
if ($Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT ne ''))
{
- $Texi2HTML::Config::OUT =~ s|/*$||;
- $docu_rdir = "$Texi2HTML::Config::OUT/";
- unless (-d $Texi2HTML::Config::OUT)
- {
- if ( mkdir($Texi2HTML::Config::OUT, oct(755)))
- {
- print STDERR "# created directory $Texi2HTML::Config::OUT\n" if ($T2H_VERBOSE);
- }
- else
- {
- die "$ERROR can't create directory $Texi2HTML::Config::OUT\n";
- }
- }
- print STDERR "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
+# $Texi2HTML::Config::OUT =~ s|/*$||;
+# $docu_rdir = "$Texi2HTML::Config::OUT/";
+# unless (-d $Texi2HTML::Config::OUT)
+# {
+# if ( mkdir($Texi2HTML::Config::OUT, oct(755)))
+# {
+# print STDERR "# created directory $Texi2HTML::Config::OUT\n" if ($T2H_VERBOSE);
+# }
+# else
+# {
+# die "$ERROR can't create directory $Texi2HTML::Config::OUT\n";
+# }
+# }
+# print STDERR "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
+ # FIXME: handle the case when ::OUT includes a basedir
+ $Texi2HTML::Config::PREFIX = $Texi2HTML::Config::OUT;
+ $docu_rdir = '';
+ $Texi2HTML::Config::OUT = '';
}
elsif (! $Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT ne ''))
{

View File

@ -1,91 +1,104 @@
@comment $FreeBSD$
bin/%%PROGRAM_PREFIX%%texi2html
%%DATADIR%%/i18n/en
%%PORTDOCS%%%%DOCSDIR%%/texi2html.html
%%DATADIR%%/bib-example.texi
%%DATADIR%%/book.init
%%DATADIR%%/chm.init
%%DATADIR%%/docbook.init
%%DATADIR%%/enable_encoding.init
%%DATADIR%%/glossary.texi
%%DATADIR%%/html32.init
%%DATADIR%%/i18n/de
%%DATADIR%%/i18n/en
%%DATADIR%%/i18n/es
%%DATADIR%%/i18n/fr
%%DATADIR%%/i18n/ja
%%DATADIR%%/i18n/nl
%%DATADIR%%/i18n/no
%%DATADIR%%/i18n/pt
%%DATADIR%%/images/a_begin.gif
%%DATADIR%%/images/a_begin_na.gif
%%DATADIR%%/images/a_document.gif
%%DATADIR%%/images/a_document_na.gif
%%DATADIR%%/images/a_empty.gif
%%DATADIR%%/images/a_end.gif
%%DATADIR%%/images/a_end_na.gif
%%DATADIR%%/images/a_help.gif
%%DATADIR%%/images/a_help_na.gif
%%DATADIR%%/images/a_index.gif
%%DATADIR%%/images/a_index_na.gif
%%DATADIR%%/images/a_leftdouble.gif
%%DATADIR%%/images/a_leftdouble_na.gif
%%DATADIR%%/images/a_left.gif
%%DATADIR%%/images/a_left_na.gif
%%DATADIR%%/images/a_page.gif
%%DATADIR%%/images/a_page_na.gif
%%DATADIR%%/images/a_rightdouble.gif
%%DATADIR%%/images/a_rightdouble_na.gif
%%DATADIR%%/images/a_right.gif
%%DATADIR%%/images/bg.jpg
%%DATADIR%%/images/a_right_na.gif
%%DATADIR%%/images/a_searchdoc.gif
%%DATADIR%%/images/a_searchdoc_na.gif
%%DATADIR%%/images/a_search.gif
%%DATADIR%%/images/a_search_na.gif
%%DATADIR%%/images/a_tableofcon.gif
%%DATADIR%%/images/a_tableofcon_na.gif
%%DATADIR%%/images/a_top.gif
%%DATADIR%%/images/a_top_na.gif
%%DATADIR%%/images/a_up.gif
%%DATADIR%%/images/a_up_na.gif
%%DATADIR%%/images/bg_left.gif
%%DATADIR%%/images/bg_right.gif
%%DATADIR%%/images/blue_dir.gif
%%DATADIR%%/images/blue_down.gif
%%DATADIR%%/images/blue_grab.gif
%%DATADIR%%/images/blue_help.gif
%%DATADIR%%/images/blue_next.gif
%%DATADIR%%/images/blue_nnext.gif
%%DATADIR%%/images/blue_pprev.gif
%%DATADIR%%/images/blue_prev.gif
%%DATADIR%%/images/blue_readme.gif
%%DATADIR%%/images/blue_top.gif
%%DATADIR%%/images/blue_up.gif
%%DATADIR%%/images/blue_uup.gif
%%DATADIR%%/images/contents_motif.gif
%%DATADIR%%/i18n/pt_BR
%%DATADIR%%/images/COPYING
%%DATADIR%%/images/index_motif.gif
%%DATADIR%%/images/Mybg.gif
%%DATADIR%%/images/next_motif.gif
%%DATADIR%%/images/next_motif_gr.gif
%%DATADIR%%/images/previous_motif.gif
%%DATADIR%%/images/previous_motif_gr.gif
%%DATADIR%%/images/spacer3.gif
%%DATADIR%%/images/xy_contents.gif
%%DATADIR%%/images/xy_foot.gif
%%DATADIR%%/images/xy_next.gif
%%DATADIR%%/images/xy_next_gr.gif
%%DATADIR%%/images/xy_nextsection.gif
%%DATADIR%%/images/xy_nextsection_gr.gif
%%DATADIR%%/images/xy_previous.gif
%%DATADIR%%/images/xy_previous_gr.gif
%%DATADIR%%/images/xy_previoussection.gif
%%DATADIR%%/images/xy_previoussection_gr.gif
%%DATADIR%%/images/xy_up.gif
%%DATADIR%%/images/xy_up_gr.gif
%%DATADIR%%/images/COPYING.Attribution-ShareAlike
%%DATADIR%%/images/GPL
%%DATADIR%%/images/Mybg.png
%%DATADIR%%/images/README
%%DATADIR%%/images/a_begin.png
%%DATADIR%%/images/a_begin_na.png
%%DATADIR%%/images/a_document.png
%%DATADIR%%/images/a_document_na.png
%%DATADIR%%/images/a_empty.png
%%DATADIR%%/images/a_end.png
%%DATADIR%%/images/a_end_na.png
%%DATADIR%%/images/a_help.png
%%DATADIR%%/images/a_help_na.png
%%DATADIR%%/images/a_index.png
%%DATADIR%%/images/a_index_na.png
%%DATADIR%%/images/a_left.png
%%DATADIR%%/images/a_left_na.png
%%DATADIR%%/images/a_leftdouble.png
%%DATADIR%%/images/a_leftdouble_na.png
%%DATADIR%%/images/a_page.png
%%DATADIR%%/images/a_page_na.png
%%DATADIR%%/images/a_right.png
%%DATADIR%%/images/a_right_na.png
%%DATADIR%%/images/a_rightdouble.png
%%DATADIR%%/images/a_rightdouble_na.png
%%DATADIR%%/images/a_search.png
%%DATADIR%%/images/a_search_na.png
%%DATADIR%%/images/a_searchdoc.png
%%DATADIR%%/images/a_searchdoc_na.png
%%DATADIR%%/images/a_tableofcon.png
%%DATADIR%%/images/a_tableofcon_na.png
%%DATADIR%%/images/a_top.png
%%DATADIR%%/images/a_top_na.png
%%DATADIR%%/images/a_up.png
%%DATADIR%%/images/a_up_na.png
%%DATADIR%%/images/bg.jpg
%%DATADIR%%/images/bg_left.png
%%DATADIR%%/images/bg_right.png
%%DATADIR%%/images/blue_dir.png
%%DATADIR%%/images/blue_down.png
%%DATADIR%%/images/blue_grab.png
%%DATADIR%%/images/blue_help.png
%%DATADIR%%/images/blue_next.png
%%DATADIR%%/images/blue_nnext.png
%%DATADIR%%/images/blue_pprev.png
%%DATADIR%%/images/blue_prev.png
%%DATADIR%%/images/blue_readme.png
%%DATADIR%%/images/blue_top.png
%%DATADIR%%/images/blue_up.png
%%DATADIR%%/images/blue_uup.png
%%DATADIR%%/images/contents_motif.png
%%DATADIR%%/images/index_motif.png
%%DATADIR%%/images/next_motif.png
%%DATADIR%%/images/next_motif_gr.png
%%DATADIR%%/images/previous_motif.png
%%DATADIR%%/images/previous_motif_gr.png
%%DATADIR%%/images/spacer3.png
%%DATADIR%%/images/xy_contents.png
%%DATADIR%%/images/xy_foot.png
%%DATADIR%%/images/xy_next.png
%%DATADIR%%/images/xy_next_gr.png
%%DATADIR%%/images/xy_nextsection.png
%%DATADIR%%/images/xy_nextsection_gr.png
%%DATADIR%%/images/xy_previous.png
%%DATADIR%%/images/xy_previous_gr.png
%%DATADIR%%/images/xy_previoussection.png
%%DATADIR%%/images/xy_previoussection_gr.png
%%DATADIR%%/images/xy_up.png
%%DATADIR%%/images/xy_up_gr.png
%%DATADIR%%/inlinestyle.init
%%DATADIR%%/l2h.init
%%DATADIR%%/makeinfo.init
%%DATADIR%%/xhtml.init
%%DATADIR%%/html32.init
%%DATADIR%%/book.init
%%DATADIR%%/mediawiki.init
%%DATADIR%%/my-bib-macros.texi
%%DATADIR%%/noheaders.init
%%DATADIR%%/inlinestyle.init
%%DATADIR%%/utf8.init
%%DATADIR%%/chm.init
%%DATADIR%%/roff.init
@dirrm %%DATADIR%%/i18n
%%DATADIR%%/tex4ht.init
%%DATADIR%%/utf8.init
%%DATADIR%%/xhtml.init
%%DATADIR%%/xml.init
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%/i18n
@dirrm %%DATADIR%%
share/doc/texinfo/texi2html.html
@dirrm share/doc/texinfo
%%PORTDOCS%%@dirrm %%DOCSDIR%%