the current texinfo from ports does not like aalib's documentation, building aalib fails with: cd . && makeinfo --no-split `echo aalib.texinfo | sed 's,.*/,,'` aalib.texinfo:32: misplaced { aalib.texinfo:32: misplaced } aalib.texinfo:33: misplaced { aalib.texinfo:33: misplaced } aalib.texinfo:34: misplaced { aalib.texinfo:34: misplaced } aalib.texinfo:36: misplaced { aalib.texinfo:36: misplaced } aalib.texinfo:64: warning: @tex should only appear at a line beginning aalib.texinfo:1321: raising the section level of @subsection which is too low *** [aalib.info] Error code 1 Fix: The following patch fixed that problem for me: svn status A files/patch-doc_aalib.texinfo svn diff Regards, Christoph--aihE7LTIBpVyjTBgKthFc3TlyOQ9jhDEtfrrKO9okkdc3fMW Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: files/patch-doc_aalib.texinfo =================================================================== --- files/patch-doc_aalib.texinfo (revision 0) +++ files/patch-doc_aalib.texinfo (working copy) @@ -0,0 +1,37 @@ +--- doc/aalib.texinfo.orig 2014-02-11 19:55:03.000000000 +0100 ++++ doc/aalib.texinfo 2014-02-11 19:56:56.000000000 +0100 +@@ -29,11 +29,11 @@ + + @titlepage + +-@title{AA-lib @value{VERSION}} +-@subtitle{An ascii-art library} +-@subtitle{API-DESCRIPTION} ++@title AA-lib @value{VERSION} ++@subtitle An ascii-art library ++@subtitle API-DESCRIPTION + +-@author{Jan Hubi@v cka & Kamil Toman} ++@author Jan Hubi@v cka & Kamil Toman + @tex + Dukelsk\'ych bojovn\'\i ku 1944 + @end tex +@@ -61,7 +61,8 @@ + @end tex + @vskip 0pt plus 1filll + +-@copyright{} 1997 @tex Jan Hubi\v cka \& Kamil Toman ++@copyright{} 1997 ++@tex Jan Hubi\v cka \& Kamil Toman + @end tex + + Permission is granted to make and distribute verbatim +@@ -1318,7 +1319,7 @@ + functions (like initialization, drawing to screen etc...) and register it in + the driver registry. There is separate drivers for screen, mouse and keyboard. + +-@subsection Display driver ++@section Display driver + Display driver is the most significant driver (of course) so it is recomended + to implement it first. Its structure is as follows: +
Responsible Changed From-To: freebsd-ports-bugs->eadler Over to maintainer (via the GNATS Auto Assign Tool)
Author: eadler Date: Tue Feb 11 22:07:21 2014 New Revision: 343826 URL: http://svnweb.freebsd.org/changeset/ports/343826 QAT: https://qat.redports.org/buildarchive/r343826/ Log: graphics/aalib: fix build with new texinfo PR: ports/186660 Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> Added: head/graphics/aalib/files/patch-doc_aalib.texinfo (contents, props changed) Modified: head/graphics/aalib/Makefile Modified: head/graphics/aalib/Makefile ============================================================================== --- head/graphics/aalib/Makefile Tue Feb 11 22:07:04 2014 (r343825) +++ head/graphics/aalib/Makefile Tue Feb 11 22:07:21 2014 (r343826) @@ -3,7 +3,7 @@ PORTNAME= aalib PORTVERSION= 1.4.r5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/aa-project/aa-lib/1.4rc5 DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} Added: head/graphics/aalib/files/patch-doc_aalib.texinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aalib/files/patch-doc_aalib.texinfo Tue Feb 11 22:07:21 2014 (r343826) @@ -0,0 +1,43 @@ +Index: files/patch-doc_aalib.texinfo +=================================================================== +--- files/patch-doc_aalib.texinfo (revision 0) ++++ files/patch-doc_aalib.texinfo (working copy) +@@ -0,0 +1,37 @@ ++--- doc/aalib.texinfo.orig 2014-02-11 19:55:03.000000000 +0100 +++++ doc/aalib.texinfo 2014-02-11 19:56:56.000000000 +0100 ++@@ -29,11 +29,11 @@ ++ ++ @titlepage ++ ++-@title{AA-lib @value{VERSION}} ++-@subtitle{An ascii-art library} ++-@subtitle{API-DESCRIPTION} +++@title AA-lib @value{VERSION} +++@subtitle An ascii-art library +++@subtitle API-DESCRIPTION ++ ++-@author{Jan Hubi@v cka & Kamil Toman} +++@author Jan Hubi@v cka & Kamil Toman ++ @tex ++ Dukelsk\'ych bojovn\'\i ku 1944 ++ @end tex ++@@ -61,7 +61,8 @@ ++ @end tex ++ @vskip 0pt plus 1filll ++ ++-@copyright{} 1997 @tex Jan Hubi\v cka \& Kamil Toman +++@copyright{} 1997 +++@tex Jan Hubi\v cka \& Kamil Toman ++ @end tex ++ ++ Permission is granted to make and distribute verbatim ++@@ -1318,7 +1319,7 @@ ++ functions (like initialization, drawing to screen etc...) and register it in ++ the driver registry. There is separate drivers for screen, mouse and keyboard. ++ ++-@subsection Display driver +++@section Display driver ++ Display driver is the most significant driver (of course) so it is recomended ++ to implement it first. Its structure is as follows: ++ + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!
Hi, sorry to re-open this, but there's a problem: What I submitted was a patch against the ports tree (to be applied with patch -p1 in graphics/aalib), but as you just dropped that patch into graphics/aalib/files/ all we get is cmt@elch:aalib/work/aalib-1.4.0$ ls -l files/ total 4 -rw-r--r-- 1 root wheel 1071 Feb 12 18:35 patch-doc_aalib.texinfo -rw-r--r-- 1 root wheel 0 Feb 12 18:35 patch-doc_aalib.texinfo.orig wich does not do much in fixing the build. Sorry for being not clear enough in the original PR. Is there any guide how to clearly distinguish between "patches against the ports tree" and "patches to be dropped into files/"? Regards, Christoph -- Spare Space
Author: eadler Date: Thu Feb 13 06:43:09 2014 New Revision: 344042 URL: http://svnweb.freebsd.org/changeset/ports/344042 QAT: https://qat.redports.org/buildarchive/r344042/ Log: Correctly apply the patch I committed. PR: ports/186660 Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> Modified: head/graphics/aalib/Makefile head/graphics/aalib/files/patch-doc_aalib.texinfo Modified: head/graphics/aalib/Makefile ============================================================================== --- head/graphics/aalib/Makefile Thu Feb 13 05:58:22 2014 (r344041) +++ head/graphics/aalib/Makefile Thu Feb 13 06:43:09 2014 (r344042) @@ -3,7 +3,7 @@ PORTNAME= aalib PORTVERSION= 1.4.r5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF/aa-project/aa-lib/1.4rc5 DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} Modified: head/graphics/aalib/files/patch-doc_aalib.texinfo ============================================================================== --- head/graphics/aalib/files/patch-doc_aalib.texinfo Thu Feb 13 05:58:22 2014 (r344041) +++ head/graphics/aalib/files/patch-doc_aalib.texinfo Thu Feb 13 06:43:09 2014 (r344042) @@ -1,43 +1,37 @@ -Index: files/patch-doc_aalib.texinfo -=================================================================== ---- files/patch-doc_aalib.texinfo (revision 0) -+++ files/patch-doc_aalib.texinfo (working copy) -@@ -0,0 +1,37 @@ -+--- doc/aalib.texinfo.orig 2014-02-11 19:55:03.000000000 +0100 -++++ doc/aalib.texinfo 2014-02-11 19:56:56.000000000 +0100 -+@@ -29,11 +29,11 @@ -+ -+ @titlepage -+ -+-@title{AA-lib @value{VERSION}} -+-@subtitle{An ascii-art library} -+-@subtitle{API-DESCRIPTION} -++@title AA-lib @value{VERSION} -++@subtitle An ascii-art library -++@subtitle API-DESCRIPTION -+ -+-@author{Jan Hubi@v cka & Kamil Toman} -++@author Jan Hubi@v cka & Kamil Toman -+ @tex -+ Dukelsk\'ych bojovn\'\i ku 1944 -+ @end tex -+@@ -61,7 +61,8 @@ -+ @end tex -+ @vskip 0pt plus 1filll -+ -+-@copyright{} 1997 @tex Jan Hubi\v cka \& Kamil Toman -++@copyright{} 1997 -++@tex Jan Hubi\v cka \& Kamil Toman -+ @end tex -+ -+ Permission is granted to make and distribute verbatim -+@@ -1318,7 +1319,7 @@ -+ functions (like initialization, drawing to screen etc...) and register it in -+ the driver registry. There is separate drivers for screen, mouse and keyboard. -+ -+-@subsection Display driver -++@section Display driver -+ Display driver is the most significant driver (of course) so it is recomended -+ to implement it first. Its structure is as follows: -+ +--- doc/aalib.texinfo.orig 2014-02-11 19:55:03.000000000 +0100 ++++ doc/aalib.texinfo 2014-02-11 19:56:56.000000000 +0100 +@@ -29,11 +29,11 @@ + + @titlepage + +-@title{AA-lib @value{VERSION}} +-@subtitle{An ascii-art library} +-@subtitle{API-DESCRIPTION} ++@title AA-lib @value{VERSION} ++@subtitle An ascii-art library ++@subtitle API-DESCRIPTION + +-@author{Jan Hubi@v cka & Kamil Toman} ++@author Jan Hubi@v cka & Kamil Toman + @tex + Dukelsk\'ych bojovn\'\i ku 1944 + @end tex +@@ -61,7 +61,8 @@ + @end tex + @vskip 0pt plus 1filll + +-@copyright{} 1997 @tex Jan Hubi\v cka \& Kamil Toman ++@copyright{} 1997 ++@tex Jan Hubi\v cka \& Kamil Toman + @end tex + + Permission is granted to make and distribute verbatim +@@ -1318,7 +1319,7 @@ + functions (like initialization, drawing to screen etc...) and register it in + the driver registry. There is separate drivers for screen, mouse and keyboard. + +-@subsection Display driver ++@section Display driver + Display driver is the most significant driver (of course) so it is recomended + to implement it first. Its structure is as follows: _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
On Wed, Feb 12, 2014 at 12:54 PM, Christoph Moench-Tegeder <cmt@burggraben.net> wrote: > Hi, > sorry to re-open this, but there's a problem: > What I submitted was a patch against the ports tree (to be applied > with patch -p1 in graphics/aalib), but as you just dropped that > patch into graphics/aalib/files/ all we get is > > cmt@elch:aalib/work/aalib-1.4.0$ ls -l files/ > total 4 > -rw-r--r-- 1 root wheel 1071 Feb 12 18:35 patch-doc_aalib.texinfo > -rw-r--r-- 1 root wheel 0 Feb 12 18:35 patch-doc_aalib.texinfo.orig > > wich does not do much in fixing the build. > Sorry for being not clear enough in the original PR. Is there any > guide how to clearly distinguish between "patches against the ports tree" > and "patches to be dropped into files/"? In short: my fault. I think I fixed it. I can't actually replicate the error so its a bit hard for me to test beyond making sure the source is actually patched). -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams