From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 14 13:10:11 2011 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 0BE291065673 for ; Thu, 14 Jul 2011 13:10:11 +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 DE5828FC15 for ; Thu, 14 Jul 2011 13:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6EDAABR072241 for ; Thu, 14 Jul 2011 13:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6EDAARu072240; Thu, 14 Jul 2011 13:10:10 GMT (envelope-from gnats) Resent-Date: Thu, 14 Jul 2011 13:10:10 GMT Resent-Message-Id: <201107141310.p6EDAARu072240@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, John Marino Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07A74106564A for ; Thu, 14 Jul 2011 13:00:22 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C8AAE8FC14 for ; Thu, 14 Jul 2011 13:00:22 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6ED0MuK010332 for ; Thu, 14 Jul 2011 13:00:22 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p6ED0MuU010331; Thu, 14 Jul 2011 13:00:22 GMT (envelope-from nobody) Message-Id: <201107141300.p6ED0MuU010331@red.freebsd.org> Date: Thu, 14 Jul 2011 13:00:22 GMT From: John Marino To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/158896: [MAINTAINER] www/aws: fix doc build and test target 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: Thu, 14 Jul 2011 13:10:11 -0000 >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: