diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-05-25 15:16:36 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-05-25 15:16:36 +0000 |
| commit | 8af4059e32506cc8c3da792879ae0cd40129af03 (patch) | |
| tree | 9ef2ef3690f63004a91d67acea00fa94bb1dec23 /x11-toolkits/qt33 | |
| parent | 07c9d84ed6db2952f33594807774bb26ed8fcad7 (diff) | |
| download | ports-8af4059e32506cc8c3da792879ae0cd40129af03.tar.gz ports-8af4059e32506cc8c3da792879ae0cd40129af03.zip | |
Patch configure instead of piping echo output to the configure script -
the latter isn't make -s - safe.
Noticed by: Jon Noack <noackjr@alumni.rice.edu>
Notes
Notes:
svn path=/head/; revision=109983
Diffstat (limited to 'x11-toolkits/qt33')
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-configure | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index ca86638795c4..7316713e3a0b 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= -system-libpng -system-libjpeg -system-libmng \ -verbose -docdir ${DOCSDIR} -tablet -ipv6 \ -plugindir ${PREFIX}/lib/plugins -CONFIGURE_ENV?= ${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} \ LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH diff --git a/x11-toolkits/qt33/files/patch-configure b/x11-toolkits/qt33/files/patch-configure index 75386f4b379c..8c5938d8db68 100644 --- a/x11-toolkits/qt33/files/patch-configure +++ b/x11-toolkits/qt33/files/patch-configure @@ -46,4 +46,15 @@ - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=$I_FLAGS\"" + QMAKE_VARS="$QMAKE_VARS \"INCPATH+=`echo $I_FLAGS | sed s,-I,,g`\"" fi - + +--- configure.orig Tue May 25 17:07:32 2004 ++++ configure Tue May 25 17:12:24 2004 +@@ -2305,7 +2305,7 @@ + else + echo "Do you accept the terms of $affix license? \c" + fi +- read acceptance ++ acceptance=yes + echo + if [ "$acceptance" = "yes" ]; then + break |