فهرست منبع

Eliminate config.cache and improve description, but mostly get scribus building again on FreeBSD

Michael Schloh von Bennewitz 23 سال پیش
والد
کامیت
604ab22665
1فایلهای تغییر یافته به همراه11 افزوده شده و 13 حذف شده
  1. 11 13
      scribus/scribus.spec

+ 11 - 13
scribus/scribus.spec

@@ -40,7 +40,7 @@ Distribution: OpenPKG [JUNK]
 Group:        Misc
 License:      GPL
 Version:      %{V_opkg}
-Release:      20030730
+Release:      20030731
 
 #   list of sources
 Source0:      http://scribus.planetmirror.com/scribus-%{V_dist}.tar.gz
@@ -55,16 +55,14 @@ AutoReq:      no
 AutoReqProv:  no
 
 %description
-    Scribus is a Layout program similar to Adobe® PageMaker, QuarkXPress,
+    Scribus is a Layout program similar to QuarkXPress, Adobe® PageMaker,
     or Adobe® InDesign. It has the ability to layout newsletters, create
     corporate stationery, small posters and other documents which need
     flexible layout and/or the ability to output to professional quality
     imagesetting equipment. Graphic formats which can be placed include
-    Ecapsulated Post Script (eps), Joint Photographic Experts Group
-    (jpeg), Portable Network Graphics (png), and XPixMap(xpm). Scribus
-    also offers more advanced professional publishing features, such as
-    CMYK color, easy PDF creation, Encapsulated Postscript import/export
-    and creation of color separations.
+    EPS, JPEG, PNG, and XPM. Scribus also offers more advanced professional
+    publishing features, such as CMYK color, easy PDF creation, Encapsulated
+    Postscript import/export and creation of color separations.
 
 %prep
     %setup -q -n scribus-%{V_dist}
@@ -76,28 +74,28 @@ AutoReqProv:  no
 %build
     case "%{l_target}" in
         *-freebsd*)
-            echo "X_PRE_LIBS=-lGL" >config.cache
-            LIBS="$LIBS -lGL"
+            LIBS="$LIBS -lX11 -lXext -lGL"
             ;;
         *-solaris* )
             LIBS="$LIBS -lrt"
             ;;
     esac
+    X11INC=`%{l_prefix}/etc/rc --query x11_incdir`
+    X11LIB=`%{l_prefix}/etc/rc --query x11_libdir`
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O}" \
     CPPFLAGS="%{l_cppflags tiff qt freetype2}" \
-    LDFLAGS="%{l_ldflags}" \
+    LDFLAGS="%{l_ldflags} -L$X11LIB" \
     LIBS="$LIBS" \
     ./configure \
-        --cache-file=./config.cache \
         --prefix=%{l_prefix} \
         --disable-shared \
         --enable-static \
         --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-qt-dir=%{l_prefix} \
         --with-qt-includes=%{l_prefix}/include/qt/ \
         --with-qt-libraries=%{l_prefix}/lib/