OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Jul-2003 18:01:37
Branch: HEAD Handle: 2003073117013600
Modified files:
openpkg-src/scribus scribus.spec
Log:
Eliminate config.cache and improve description, but mostly get scribus
building again on FreeBSD
Summary:
Revision Changes Path
1.13 +11 -13 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 scribus.spec
--- openpkg-src/scribus/scribus.spec 30 Jul 2003 19:29:25 -0000 1.12
+++ openpkg-src/scribus/scribus.spec 31 Jul 2003 16:01:36 -0000 1.13
@@ -40,7 +40,7 @@
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 @@
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 @@
%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/
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
