From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 3 22:10:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 734321065679 for ; Fri, 3 Jul 2009 22:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4BDD48FC19 for ; Fri, 3 Jul 2009 22:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n63MA4Xi050639 for ; Fri, 3 Jul 2009 22:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n63MA4Du050638; Fri, 3 Jul 2009 22:10:04 GMT (envelope-from gnats) Resent-Date: Fri, 3 Jul 2009 22:10:04 GMT Resent-Message-Id: <200907032210.n63MA4Du050638@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pietro Cerutti" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2F89106566C for ; Fri, 3 Jul 2009 22:05:00 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from cpanel05.rubas-s05.net (cpanel05.rubas-s05.net [195.182.222.75]) by mx1.freebsd.org (Postfix) with ESMTP id B3AAB8FC1E for ; Fri, 3 Jul 2009 22:04:59 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from 150-8.105-92.cust.bluewin.ch ([92.105.8.150] helo=gahrtop.localhost) by cpanel05.rubas-s05.net with esmtpa (Exim 4.69) (envelope-from ) id 1MMqsM-000329-DP for FreeBSD-gnats-submit@freebsd.org; Sat, 04 Jul 2009 00:04:58 +0200 Received: from gahrtop.gahr.ch (localhost [127.0.0.1]) by gahrtop.localhost (Postfix) with ESMTP id C725C50852 for ; Sat, 4 Jul 2009 00:04:56 +0200 (CEST) Message-Id: <1246658696.78050@gahrtop.gahr.ch> Date: Sat, 4 Jul 2009 00:04:56 +0200 From: "Pietro Cerutti" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/136303: [patch] textproc/texi2html -- update to 1.82 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2009 22:10:04 -0000 >Number: 136303 >Category: ports >Synopsis: [patch] textproc/texi2html -- update to 1.82 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jul 03 22:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: FreeBSD 8.0-CURRENT i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD 8.0-CURRENT #5: Fri Jun 19 09:46:39 CEST 2009 root@:/usr/obj/usr/src/sys/MSI1034 >Description: - update to 1.82 - install docs only if NOPORTDOCS is not set - correct DOCSDIR - correct MASTER_SITES >How-To-Repeat: >Fix: --- texi2html.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/texi2html/Makefile,v retrieving revision 1.22 diff -u -u -r1.22 Makefile --- Makefile 14 Feb 2005 22:05:53 -0000 1.22 +++ Makefile 3 Jul 2009 21:52:25 -0000 @@ -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 @@ @${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 Index: distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/texi2html/distinfo,v retrieving revision 1.8 diff -u -u -r1.8 distinfo --- distinfo 24 Jan 2006 03:10:19 -0000 1.8 +++ distinfo 3 Jul 2009 21:24:45 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/texi2html/pkg-plist,v retrieving revision 1.6 diff -u -u -r1.6 pkg-plist --- pkg-plist 6 Feb 2005 18:42:52 -0000 1.6 +++ pkg-plist 3 Jul 2009 21:55:13 -0000 @@ -1,91 +1,103 @@ -@comment $FreeBSD: ports/textproc/texi2html/pkg-plist,v 1.6 2005/02/06 18:42:52 roam Exp $ -bin/%%PROGRAM_PREFIX%%texi2html -%%DATADIR%%/i18n/en +bin/texi2html +%%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%% Index: files/patch-doc::Makefile.in =================================================================== RCS file: /home/pcvs/ports/textproc/texi2html/files/patch-doc::Makefile.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-doc::Makefile.in --- files/patch-doc::Makefile.in 6 Feb 2005 18:42:52 -0000 1.1 +++ files/patch-doc::Makefile.in 3 Jul 2009 21:35:18 -0000 @@ -6,7 +6,7 @@ # -texinfodata = $(datadir)/texinfo -texinfohtmldir = $(texinfodata)/html -+texinfodata = $(datadir)/doc/texinfo ++texinfodata = $(datadir)/doc/texi2html +texinfohtmldir = $(texinfodata) texinfohtml_DATA = texi2html.html Index: files/patch-texi2html.pl =================================================================== RCS file: files/patch-texi2html.pl diff -N files/patch-texi2html.pl --- files/patch-texi2html.pl 12 Feb 2005 22:40:59 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 '')) - { --- texi2html.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: