Replace old broken freetype option with new xft one.

qt/qt.spec

@@ -23,6 +23,11 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package options
+%ifndef    with_xft
+%define    with_xft    no
+%endif
+
 #   package information
 Name:         qt
 Summary:      The Qt Toolkit
@@ -33,7 +38,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.0.6
-Release:      20021105
+Release:      20021106
 
 #   list of sources
 Source0:      ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -59,6 +64,9 @@ AutoReqProv:  no
     similar to templates in C++, but with influences from component
     technology.
 
+    Options: 
+    --define 'with_xft %{with_xft}'
+
 %prep
     %setup -q -n qt-x11-free-%{version}
 
@@ -70,6 +78,24 @@ AutoReqProv:  no
         *-solaris* ) oscomp="solaris-g++" ;;
         * ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
     esac
+
+    #   ensure that libXft exists
+%if "%{with_xft}" == "yes"
+    found_xft=""
+    for ext in a so sl; do
+        if [ -f "`%{l_prefix}/etc/rc --query x11_libdir`/libXft.$ext" ]; then
+            found_xft="da"
+            break;
+        fi
+    done
+    if [ ".$found_xft" = . ]; then
+        echo "ERROR! Library libXft could not be found," 2>&1;
+        echo "please consider building without with_xft" 2>&1;
+        exit 1;
+    fi
+%endif
+
+    #   special trolltech configuration
     echo "yes" | ./configure \
         -prefix %{l_prefix} -release \
         -docdir %{l_prefix}/share/qt/doc \
@@ -77,7 +103,12 @@ AutoReqProv:  no
         -static -qt-gif -qt-zlib \
         -platform $oscomp -thread -stl \
         -qt-libpng -qt-libjpeg -qt-libmng \
-        -no-nas-sound -no-tablet -no-xkb -no-xft \
+        -no-nas-sound -no-tablet -no-xkb \
+%if "%{with_xft}" == "yes"
+        -xft \
+%else
+        -no-xft \
+%endif
         -sm -xinerama -xrender \
         -L`%{l_prefix}/etc/rc --query x11_libdir` \
         -R`%{l_prefix}/etc/rc --query x11_libdir`

qt/readme.txt

@@ -27,6 +27,27 @@ Antwort:
   Qt uses $INSTALL_ROOT instead, but isn't recursively passed to subsequent
   make calls so is relatively useless in a spec file.
 
+Files Problem:
+root@dt4# rpm -Uvh
+/u/ms/work/openpkg/pkg/bin/qt-3.0.6-20021105.ix86-freebsd4.7-sw.rpm
+Preparing...                ########################################### [100%]
+package qt-3.0.6-20021105 is already installed
+file /sw/bin/designer from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/linguist from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/lrelease from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/lupdate from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/qtconfig from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/uic from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libeditor.prl from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqnp.prl from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqt-mt.a from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqt-mt.prl from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqui.a from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqui.prl from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/lib/libqxt.prl from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+file /sw/bin/assistant from install of qt-3.0.6-20021105 conflicts with file from package qt-3.0.6-20021105
+root@dt4# rpm -e qt
+
 -------- First problem building with -system-libpng
 
 $ rpm --rebuild qt-3.0.4-20020610.src.rpm