mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

- Do not hardcode Python version in Makefile test target

Browse Source 
- Avoid sed errors during documentation build

PR:		ports/158896
Submitted by:	John Marino <freebsdml@marino.st> (maintainer)
This commit is contained in:
Frederic Culot 2011-07-19 10:58:23 +00:00
parent ea9e42e60a
commit be1cfc221a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277948
4 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/aws/Makefile
View File

@ -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

27
www/aws/files/patch-docs__gentexifile Normal file
View File

@ -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}

30
www/aws/files/patch-templates_parser__docs__gentexifile Normal file
View File

@ -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

3
www/aws/pkg-plist
View File

@ -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