diff options
| author | Frederic Culot <culot@FreeBSD.org> | 2011-07-19 10:58:23 +0000 |
|---|---|---|
| committer | Frederic Culot <culot@FreeBSD.org> | 2011-07-19 10:58:23 +0000 |
| commit | be1cfc221a1cb622ce8623d380e562129fcb025f (patch) | |
| tree | 212c9d70c96679dfb88c4e2e77288829bb1a5566 /www/aws | |
| parent | ea9e42e60a536b7d3fdee1a0c30b203eff5daf00 (diff) | |
| download | ports-be1cfc221a1cb622ce8623d380e562129fcb025f.tar.gz ports-be1cfc221a1cb622ce8623d380e562129fcb025f.zip | |
- Do not hardcode Python version in Makefile test target
- Avoid sed errors during documentation build
PR: ports/158896
Submitted by: John Marino <freebsdml@marino.st> (maintainer)
Notes
Notes:
svn path=/head/; revision=277948
Diffstat (limited to 'www/aws')
| -rw-r--r-- | www/aws/Makefile | 2 | ||||
| -rw-r--r-- | www/aws/files/patch-docs__gentexifile | 27 | ||||
| -rw-r--r-- | www/aws/files/patch-templates_parser__docs__gentexifile | 30 | ||||
| -rw-r--r-- | www/aws/pkg-plist | 3 |
4 files changed, 61 insertions, 1 deletions
diff --git a/www/aws/Makefile b/www/aws/Makefile index d791e6f951f8..6d50515dde20 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -153,7 +153,7 @@ do-build: 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 diff --git a/www/aws/files/patch-docs__gentexifile b/www/aws/files/patch-docs__gentexifile new file mode 100644 index 000000000000..0456c858e81c --- /dev/null +++ b/www/aws/files/patch-docs__gentexifile @@ -0,0 +1,27 @@ +--- docs/gentexifile.orig 2011-01-09 15:48:05.000000000 +0100 ++++ docs/gentexifile 2011-07-17 16:15:21.000000000 +0200 +@@ -32,14 +32,7 @@ + TARGET=`basename ${SOURCE}`.texi + TMPTAR=${TARGET}.tmp + +-awk=`type gawk 2>/dev/null` +-if [ x"$awk" = x ]; then +- awk="awk" +-else +- awk="gawk" +-fi +- +-$awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout ++${AWK} 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout + + rm -f ${TMPTAR} + +@@ -51,7 +44,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} diff --git a/www/aws/files/patch-templates_parser__docs__gentexifile b/www/aws/files/patch-templates_parser__docs__gentexifile new file mode 100644 index 000000000000..6f46832ca970 --- /dev/null +++ b/www/aws/files/patch-templates_parser__docs__gentexifile @@ -0,0 +1,30 @@ +--- templates_parser/docs/gentexifile.orig 2011-01-09 15:48:02.000000000 +0100 ++++ templates_parser/docs/gentexifile 2011-07-17 16:14:44.000000000 +0200 +@@ -32,24 +32,17 @@ + TARGET=`basename ${SOURCE}`.texi + TMPTAR=${TARGET}.tmp + +-awk=`type gawk 2>/dev/null` +-if [ x"$awk" = x ]; then +- awk="awk" +-else +- awk="gawk" +-fi +- +-$awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout ++${AWK} 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout + + rm -f ${TMPTAR} + + 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 + diff --git a/www/aws/pkg-plist b/www/aws/pkg-plist index 94a5fb390232..929ece40cd54 100644 --- a/www/aws/pkg-plist +++ b/www/aws/pkg-plist @@ -774,6 +774,9 @@ share/gps/plug-ins/aws.py share/gps/plug-ins/aws.xml share/gps/plug-ins/aws_api.xml share/gps/plug-ins/wsdl2aws.xml +%%DOCSDIR%%/aws.info-1 +%%DOCSDIR%%/aws.info-2 +%%DOCSDIR%%/aws.info-3 @dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%%/web_elements/icons @dirrm %%EXAMPLESDIR%%/web_elements/javascripts |