diff options
| author | pat <pat@FreeBSD.org> | 2002-01-09 03:06:22 +0000 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-01-09 03:06:22 +0000 |
| commit | 0d1cac779cad709d0b9877d6eb805990f8a7a2c7 (patch) | |
| tree | 1d9b4badcaf1f917987ba9d3cb8c4aa285a2dc0f | |
| parent | 197280d2e1b74adbb4a99e17d48b1be8179dbb29 (diff) | |
| download | FreeBSD-ports-0d1cac779cad709d0b9877d6eb805990f8a7a2c7.zip FreeBSD-ports-0d1cac779cad709d0b9877d6eb805990f8a7a2c7.tar.gz | |
Look only for qt version 2. People who have qt v1 and 2 installed at
the same time will have a problem and this patch fixes that.
Pointed out by: Robert Huff <roberthuff@rcn.com>
| -rw-r--r-- | security/qtfw/Makefile | 4 | ||||
| -rw-r--r-- | security/qtfw/files/patch-configure | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile index 5122aee..817183e 100644 --- a/security/qtfw/Makefile +++ b/security/qtfw/Makefile @@ -13,10 +13,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pat@FreeBSD.org -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 2 -CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" X11BASE="${X11BASE}" pre-patch: @${PERL} -pi.orig -e 's|^\ *CXXFLAGS=.*||' \ diff --git a/security/qtfw/files/patch-configure b/security/qtfw/files/patch-configure new file mode 100644 index 0000000..11bf6ed --- /dev/null +++ b/security/qtfw/files/patch-configure @@ -0,0 +1,23 @@ +--- configure.orig Tue Jan 8 21:54:19 2002 ++++ configure Tue Jan 8 21:56:06 2002 +@@ -790,7 +790,7 @@ + QT_LIB_DIR=NO + + i_dir=NO +-for i in /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/local/qt2/include /usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/X11R6/include/qt2; ++for i in ${X11BASE}/include/qt2; + do + for j in qapplication.h; + do +@@ -803,9 +803,9 @@ + + + l_dir=NO +-for i in /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/local/qt2/lib; ++for i in ${X11BASE}/lib; + do +- for j in libqt.so libqt2.so; ++ for j in libqt2.so; + do + if test -r "$i/$j"; then + l_dir=$i |
