diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-06-11 18:53:13 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-06-11 18:53:13 +0000 |
commit | e7d4ffb1f004300693e9daef9e1a46c7b50f1512 (patch) | |
tree | 0e05184eb23b6d8d899d6ea5f08f05b0fae9e203 /net-im/psi/files/patch-configure | |
parent | Keep sources directly in the tree. (diff) |
- Update to version 0.9.2
PR: ports/67840
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=111296
Diffstat (limited to 'net-im/psi/files/patch-configure')
-rw-r--r-- | net-im/psi/files/patch-configure | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/net-im/psi/files/patch-configure b/net-im/psi/files/patch-configure index 2c7345835f8e..96858299ad19 100644 --- a/net-im/psi/files/patch-configure +++ b/net-im/psi/files/patch-configure @@ -1,50 +1,11 @@ $FreeBSD$ -Hack configure to eat autogenerated qt options, to fix a bashism (type -p), -to avoid using expr, and to do the main Makefile make(1) compatible. +Hack configure to eat autogenerated qt options +and to do the main Makefile make(1) compatible. ---- configure.orig Wed Dec 10 01:10:03 2003 -+++ configure Sat Jan 10 15:52:00 2004 -@@ -27,32 +27,32 @@ - while [ $# -gt 0 ]; do - case "$1" in - --prefix=*) -- PREFIX=`expr "${1}" : "--prefix=\(.*\)"` -+ PREFIX="${1#--prefix=}" - shift - ;; - - --bindir=*) -- BINDIR=`expr "${1}" : "--bindir=\(.*\)"` -+ BINDIR="${1#--bindir=}" - shift - ;; - - --libdir=*) -- LIBDIR=`expr "${1}" : "--libdir=\(.*\)"` -+ LIBDIR="${1#--libdir=}" - shift - ;; - - --qtdir=*) -- QTDIR=`expr "${1}" : "--qtdir=\(.*\)"` -+ QTDIR="${1#--qtdir=}" - shift - ;; - - --with-zlib-inc=*) -- QC_WITH_ZLIB_INC=`expr "${1}" : "--with-zlib-inc=\(.*\)"` -+ QC_WITH_ZLIB_INC="${1#--with-zlib-inc=}" - shift - ;; - - --with-zlib-lib=*) -- QC_WITH_ZLIB_LIB=`expr "${1}" : "--with-zlib-lib=\(.*\)"` -+ QC_WITH_ZLIB_LIB="${1#--with-zlib-lib=}" - shift - ;; - -@@ -81,6 +81,8 @@ +--- configure.orig Fri Jun 11 13:49:06 2004 ++++ configure Fri Jun 11 14:25:01 2004 +@@ -82,6 +82,8 @@ shift ;; --help) show_usage; exit ;; @@ -53,21 +14,13 @@ to avoid using expr, and to do the main Makefile make(1) compatible. *) show_usage; exit ;; esac done -@@ -136,7 +138,7 @@ - echo Warning: qmake not in \$QTDIR/bin/qmake - echo trying to find it in \$PATH - fi -- qm=`type -p qmake` -+ qm=`which qmake` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then - echo qmake found in $qm -@@ -917,13 +919,6 @@ +@@ -1035,14 +1037,6 @@ echo exit 1; fi -cat >Makefile.tmp <<EOT -export QTDIR = $QTDIR +-export PATH = $QTDIR/bin:$PATH -EOT -cat Makefile >> Makefile.tmp -rm -f Makefile |