Date: Thu, 14 Jul 2011 13:00:22 GMT From: John Marino <freebsdml@marino.st> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158896: [MAINTAINER] www/aws: fix doc build and test target Message-ID: <201107141300.p6ED0MuU010331@red.freebsd.org> Resent-Message-ID: <201107141310.p6EDAARu072240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158896 >Category: ports >Synopsis: [MAINTAINER] www/aws: fix doc build and test target >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: Thu Jul 14 13:10:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: John Marino >Release: >Organization: >Environment: >Description: Problem 1: python2.6 is hardcoded for the Makefile test target Problem 2: During the documentation build, sed throws many errors. The attached patch fixes both of these issues >How-To-Repeat: > make test This installs aws first, and the sed errors will scroll by. If python2.7 installed, the test will file. >Fix: Patch attached with submission follows: --- Makefile.orig 2011-07-14 16:10:58.000000000 +0200 +++ Makefile 2011-07-14 16:20:11.000000000 +0200 @@ -7,6 +7,7 @@ PORTNAME= aws PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ \ http://dragonlace.mirrors.ada.cx/src/ @@ -153,7 +154,7 @@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc test: install - cd ${WRKSRC}/regtests && python2.6 testsuite.py + cd ${WRKSRC}/regtests && python${PYTHON_VER} testsuite.py do-install: cd ${WRKSRC} && ${GMAKE} install --- /dev/null 2011-07-14 16:44:00.000000000 +0200 +++ files/patch-docs__gentexifile 2011-07-14 16:13:50.000000000 +0200 @@ -0,0 +1,11 @@ +--- docs/gentexifile.orig 2011-07-14 16:12:20.000000000 +0200 ++++ docs/gentexifile 2011-07-14 16:12:45.000000000 +0200 +@@ -51,7 +51,7 @@ + echo "@group" >>${TMPTAR} + fi + echo "" >>${TMPTAR} +-sed -f ada.sed genout >>${TMPTAR} ++sed -E -f ada.sed genout >>${TMPTAR} + echo "" >>${TMPTAR} + if [ $# = 1 ]; then + echo "@end group" >>${TMPTAR} --- /dev/null 2011-07-14 16:44:00.000000000 +0200 +++ files/patch-templates_parser__docs__gentexifile 2011-07-14 16:15:38.000000000 +0200 @@ -0,0 +1,16 @@ +--- templates_parser/docs/gentexifile.orig 2011-07-14 16:14:34.000000000 +0200 ++++ templates_parser/docs/gentexifile 2011-07-14 16:14:53.000000000 +0200 +@@ -45,11 +45,11 @@ + + if [ $# = 1 ]; then + echo "@TPEXP{" >>${TMPTAR} +-sed -f ada.sed genout >>${TMPTAR} ++sed -E -f ada.sed genout >>${TMPTAR} + echo "}" >>${TMPTAR} + else + echo "@smallexample" >>${TMPTAR} +-sed -f ada.sed genout >>${TMPTAR} ++sed -E -f ada.sed genout >>${TMPTAR} + echo "@end smallexample" >>${TMPTAR} + fi + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107141300.p6ED0MuU010331>