Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 May 2013 21:44:33 +0200 (CEST)
From:      Christoph Moench-Tegeder <cmt@burggraben.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/178646: ftp/wget : fix build with texinfo-5 installed
Message-ID:  <20130514194433.EE6C031016@elch.exwg.net>
Resent-Message-ID: <201305141950.r4EJo2XB024139@freefall.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help

>Number:         178646
>Category:       ports
>Synopsis:       ftp/wget : fix build with texinfo-5 installed
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 19:50:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Moench-Tegeder
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD elch.exwg.net 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #2 r250106: Tue Apr 30 18:06:16 CEST 2013 cmt@elch.exwg.net:/usr/obj/usr/src/sys/ELCH amd64

	ftp/wget      wget-1.14_2
	print/texinfo texinfo-5.1.20130419

>Description:
	ftp/wget fails to build when the texinfo port (print/texinfo) is
	installed, as texinfo 5 is way more strict with it's input than the
	texinfo 4.8 we have in base. In particular, the build fails on wrongly
	nested @itemx/@item constructs in doc/wget.text
>How-To-Repeat:
	
>Fix:
	The problem has already been fixed in upstream git, but not yet
	released. I took the verbatim patch from
	http://git.savannah.gnu.org/cgit/wget.git/patch/doc/wget.texi?id=9e8d899a356d95be34737488bb8fd59d4c6b3dbd
	(thus leaving copyright info on the patch itself intact) and have
	it patched onto the wget source via the post-patch target.
	Ports-Patch via HTTP: http://burggraben.net/hacks/wget_texinfo5.patch.gz

svn status

M       Makefile
A       files/001-fix-texinfo.diff


Index: Makefile
===================================================================
--- Makefile	(revision 318192)
+++ Makefile	(working copy)
@@ -85,5 +85,7 @@
 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
 			 -e 's,@file{},@file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
+	pwd
+	${PATCH} -d ${WRKSRC} -p1 < ${FILESDIR}/001-fix-texinfo.diff
 
 .include <bsd.port.mk>
Index: files/001-fix-texinfo.diff
===================================================================
--- files/001-fix-texinfo.diff	(revision 0)
+++ files/001-fix-texinfo.diff	(working copy)
@@ -0,0 +1,59 @@
+From 9e8d899a356d95be34737488bb8fd59d4c6b3dbd Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini@gmail.com>
+Date: Thu, 08 Nov 2012 11:15:41 +0000
+Subject: docs: fix errors and warnings with Texinfo 5
+
+Or rather, with the development version 4.13.90, which will eventually
+become Texinfo 5.0.
+
+* doc/wget.texi: Use '@item' instead of '@itemx' in several places,
+as Texinfo 5 refuses to process an '@itemx' that is not preceded by an
+'@item'.
+
+Copyright-paperwork-exempt: yes
+Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
+---
+(limited to 'doc/wget.texi')
+
+diff --git a/doc/wget.texi b/doc/wget.texi
+index 400debe..8fd6801 100644
+--- a/doc/wget.texi
++++ b/doc/wget.texi
+@@ -875,7 +875,7 @@ recommendation to block many unrelated users from a web site due to the
+ actions of one.
+ 
+ @cindex proxy
+-@itemx --no-proxy
++@item --no-proxy
+ Don't use proxies, even if the appropriate @code{*_proxy} environment
+ variable is defined.
+ 
+@@ -976,7 +976,7 @@ are outside the range of @sc{ascii} characters (that is, greater than
+ whose encoding does not match the one used locally.
+ 
+ @cindex IPv6
+-@itemx -4
++@item -4
+ @itemx --inet4-only
+ @itemx -6
+ @itemx --inet6-only
+@@ -3093,7 +3093,7 @@ display properly---the same as @samp{-p}.
+ Change setting of passive @sc{ftp}, equivalent to the
+ @samp{--passive-ftp} option.
+ 
+-@itemx password = @var{string}
++@item password = @var{string}
+ Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
+ This command can be overridden using the @samp{ftp_password} and 
+ @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
+@@ -3604,7 +3604,7 @@ In addition to the environment variables, proxy location and settings
+ may be specified from within Wget itself.
+ 
+ @table @samp
+-@itemx --no-proxy
++@item --no-proxy
+ @itemx proxy = on/off
+ This option and the corresponding command may be used to suppress the
+ use of proxy, even if the appropriate environment variables are set.
+--
+cgit v0.9.0.2


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?20130514194433.EE6C031016>