add dependencies to freetype and expat

fontconfig/fontconfig.spec

@@ -23,19 +23,17 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME mlelstv - junk because no config, no test
-
 #   package information
 Name:         fontconfig
 Summary:      A library for configuring and customizing font access
 URL:          http://fontconfig.org/
 Vendor:       Keith Packard
 Packager:     The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
 Group:        X11
 License:      GPL
 Version:      2.2.0
-Release:      20030509
+Release:      20030520
 
 #   list of sources
 Source0:      http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -59,6 +57,21 @@ AutoReqProv:  no
     %setup -q
 
 %build
+    x11inc=`%{l_prefix}/etc/rc --query x11_incdir`
+    x11lib=`%{l_prefix}/etc/rc --query x11_libdir`
+
+    #   make configure look only in our path
+    %{l_shtool} subst \
+        -e "s;/usr/X11R6/lib/X11;$x11lib/X11;"g \
+        -e 's;/usr/X11/lib/X11;;g' \
+        -e 's;/usr/lib/X11;;g' \
+        configure
+
+    #   add freetype and expat dependencies
+    %{l_shtool} subst \
+        -e '/^Libs:/s;$; -lfreetype -lexpat;' \
+        fontconfig.pc.in
+
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
@@ -66,13 +79,14 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --with-x \
-        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
-        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+        --x-includes=$x11inc \
+        --x-libraries=$x11lib \
         --with-glib-prefix=%{l_prefix} \
         --with-freetype-config=%{l_prefix}/bin/freetype-config \
         --with-expat=%{l_prefix} \
         --with-confdir=%{l_prefix}/etc/fontconfig \
         --with-docdir=%{l_prefix}/share/fontconfig \
+        --with-default-fonts=$x11lib/X11/fonts/TTF \
         --disable-nls \
         --disable-shared
     %{l_make} %{l_mflags -O}