Changes 1.3.3.12:

* Bug fixes and improvements

3 files changed, 77 insertions, 66 deletions

diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 398fb358be3..cbbef3eaa99 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2008/04/25 20:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2008/10/09 10:33:40 adam Exp $
 
-DISTNAME=		scribus-1.3.3.11
+DISTNAME=		scribus-1.3.3.12
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scribus/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,29 +11,29 @@ COMMENT=		Publishing layout with graphical interface
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake perl
-USE_LANGUAGES=		c c++
-PTHREAD_OPTS+=		require
-
 USE_DIRS+=		xdg-1.4
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
+USE_TOOLS+=		gmake perl
+PTHREAD_OPTS+=		require
 SHLIBTOOL_OVERRIDE=	# empty
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR:Q} \
-			--with-extra-libs=${LOCALBASE}/lib \
-			--with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--enable-cairo
+CONFIGURE_ARGS+=	--with-extra-includes=${PREFIX}/include
+CONFIGURE_ARGS+=	--with-extra-libs=${PREFIX}/lib
+CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
 # XXX should work with other Python versions, but there are
 # stupid assumptions in the configure script
 PYTHON_VERSIONS_ACCEPTED=	25 24
-CONFIGURE_ARGS+=	--with-pythondir=${LOCALBASE:Q}
+CONFIGURE_ARGS+=	--with-pythondir=${PREFIX}
 # avoid CUPS libs to be pulled in
 CONFIGURE_ENV+=		ac_cv_prog_hacups=no
 
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
 .include "../../graphics/libart/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/print/scribus/PLIST b/print/scribus/PLIST
index c5cea66c604..187d6ee72f1 100644
--- a/print/scribus/PLIST
+++ b/print/scribus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/01/14 12:54:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/10/09 10:33:40 adam Exp $
 bin/scribus
 include/scribus/about.h
 include/scribus/actionmanager.h
@@ -149,6 +149,7 @@ include/scribus/scribusstructs.h
 include/scribus/scribusview.h
 include/scribus/scribuswin.h
 include/scribus/scrpalettebase.h
+include/scribus/scslainforeader.h
 include/scribus/search.h
 include/scribus/seiten.h
 include/scribus/selection.h
@@ -179,54 +180,6 @@ include/scribus/unzip.h
 include/scribus/vgradient.h
 include/scribus/vruler.h
 include/scribus/werktoolb.h
-lib/scribus/dicts/README_ca_ES.txt
-lib/scribus/dicts/README_cs_CZ.txt
-lib/scribus/dicts/README_cy_GB.txt
-lib/scribus/dicts/README_de_DE.txt
-lib/scribus/dicts/README_en_EN.txt
-lib/scribus/dicts/README_en_GB.txt
-lib/scribus/dicts/README_es_ES.txt
-lib/scribus/dicts/README_fi_FI.txt
-lib/scribus/dicts/README_hu_HU.txt
-lib/scribus/dicts/README_hyph_da_DK.txt
-lib/scribus/dicts/README_hyph_is_IS.txt
-lib/scribus/dicts/README_hyph_pl_PL.txt
-lib/scribus/dicts/README_lt_LT.txt
-lib/scribus/dicts/README_no_NO.txt
-lib/scribus/dicts/README_pt_BR.txt
-lib/scribus/dicts/README_pt_PT.txt
-lib/scribus/dicts/README_ru_RU_0.txt
-lib/scribus/dicts/README_sk_SK.txt
-lib/scribus/dicts/README_sl_SI.txt
-lib/scribus/dicts/README_sv_SE.txt
-lib/scribus/dicts/README_uk_UA.txt
-lib/scribus/dicts/hyph_af.dic
-lib/scribus/dicts/hyph_ca.dic
-lib/scribus/dicts/hyph_cs.dic
-lib/scribus/dicts/hyph_da.dic
-lib/scribus/dicts/hyph_de.dic
-lib/scribus/dicts/hyph_el.dic
-lib/scribus/dicts/hyph_en.dic
-lib/scribus/dicts/hyph_es.dic
-lib/scribus/dicts/hyph_fi.dic
-lib/scribus/dicts/hyph_fr.dic
-lib/scribus/dicts/hyph_ga.dic
-lib/scribus/dicts/hyph_hr.dic
-lib/scribus/dicts/hyph_hu.dic
-lib/scribus/dicts/hyph_id.dic
-lib/scribus/dicts/hyph_is.dic
-lib/scribus/dicts/hyph_it.dic
-lib/scribus/dicts/hyph_lt.dic
-lib/scribus/dicts/hyph_nl.dic
-lib/scribus/dicts/hyph_nn.dic
-lib/scribus/dicts/hyph_pl.dic
-lib/scribus/dicts/hyph_pt.dic
-lib/scribus/dicts/hyph_pt_BR.dic
-lib/scribus/dicts/hyph_ru.dic
-lib/scribus/dicts/hyph_sk.dic
-lib/scribus/dicts/hyph_sl.dic
-lib/scribus/dicts/hyph_sv.dic
-lib/scribus/dicts/hyph_uk.dic
 lib/scribus/import.prolog
 lib/scribus/keysets/scribus13.ksxml
 lib/scribus/plugins/gettext/libcsvim.la
@@ -263,6 +216,7 @@ lib/scribus/swatches/Scribus_X11Grey.txt
 man/man1/scribus.1
 man/man1/scribus.1.de
 man/pl/man1/scribus.1
+share/applications/vnd.scribus.desktop
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/BUILDING
 share/doc/${PKGNAME}/COPYING
@@ -544,6 +498,7 @@ share/doc/${PKGNAME}/en/layers.html
 share/doc/${PKGNAME}/en/lipsum.html
 share/doc/${PKGNAME}/en/machints1.html
 share/doc/${PKGNAME}/en/machints2.html
+share/doc/${PKGNAME}/en/mailing_lists.html
 share/doc/${PKGNAME}/en/menu.xml
 share/doc/${PKGNAME}/en/moncal.html
 share/doc/${PKGNAME}/en/mouse.html
@@ -730,6 +685,54 @@ share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/menu.xml
 share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/short-words-manual.html
 share/mime/packages/scribus.xml
 share/pixmaps/scribusicon.png
+share/scribus/dicts/README_ca_ES.txt
+share/scribus/dicts/README_cs_CZ.txt
+share/scribus/dicts/README_cy_GB.txt
+share/scribus/dicts/README_de_DE.txt
+share/scribus/dicts/README_en_EN.txt
+share/scribus/dicts/README_en_GB.txt
+share/scribus/dicts/README_es_ES.txt
+share/scribus/dicts/README_fi_FI.txt
+share/scribus/dicts/README_hu_HU.txt
+share/scribus/dicts/README_hyph_da_DK.txt
+share/scribus/dicts/README_hyph_is_IS.txt
+share/scribus/dicts/README_hyph_pl_PL.txt
+share/scribus/dicts/README_lt_LT.txt
+share/scribus/dicts/README_no_NO.txt
+share/scribus/dicts/README_pt_BR.txt
+share/scribus/dicts/README_pt_PT.txt
+share/scribus/dicts/README_ru_RU_0.txt
+share/scribus/dicts/README_sk_SK.txt
+share/scribus/dicts/README_sl_SI.txt
+share/scribus/dicts/README_sv_SE.txt
+share/scribus/dicts/README_uk_UA.txt
+share/scribus/dicts/hyph_af.dic
+share/scribus/dicts/hyph_ca.dic
+share/scribus/dicts/hyph_cs.dic
+share/scribus/dicts/hyph_da.dic
+share/scribus/dicts/hyph_de.dic
+share/scribus/dicts/hyph_el.dic
+share/scribus/dicts/hyph_en.dic
+share/scribus/dicts/hyph_es.dic
+share/scribus/dicts/hyph_fi.dic
+share/scribus/dicts/hyph_fr.dic
+share/scribus/dicts/hyph_ga.dic
+share/scribus/dicts/hyph_hr.dic
+share/scribus/dicts/hyph_hu.dic
+share/scribus/dicts/hyph_id.dic
+share/scribus/dicts/hyph_is.dic
+share/scribus/dicts/hyph_it.dic
+share/scribus/dicts/hyph_lt.dic
+share/scribus/dicts/hyph_nl.dic
+share/scribus/dicts/hyph_nn.dic
+share/scribus/dicts/hyph_pl.dic
+share/scribus/dicts/hyph_pt.dic
+share/scribus/dicts/hyph_pt_BR.dic
+share/scribus/dicts/hyph_ru.dic
+share/scribus/dicts/hyph_sk.dic
+share/scribus/dicts/hyph_sl.dic
+share/scribus/dicts/hyph_sv.dic
+share/scribus/dicts/hyph_uk.dic
 share/scribus/dtd/scribuspdfoptions.dtd
 share/scribus/icons/AddNode.png
 share/scribus/icons/AddPoint.png
@@ -1028,9 +1031,11 @@ share/scribus/loremipsum/dutch.xml
 share/scribus/loremipsum/english.xml
 share/scribus/loremipsum/eo.xml
 share/scribus/loremipsum/finnish.xml
+share/scribus/loremipsum/fr.xml
 share/scribus/loremipsum/german.xml
 share/scribus/loremipsum/greek.xml
 share/scribus/loremipsum/hebrew.xml
+share/scribus/loremipsum/hu.xml
 share/scribus/loremipsum/italian.xml
 share/scribus/loremipsum/loremipsum.xml
 share/scribus/loremipsum/russian.xml
@@ -1053,12 +1058,18 @@ share/scribus/samples/quote.py
 share/scribus/samples/sample_db_usage.py
 share/scribus/samples/trait_de_coupe.py
 share/scribus/samples/wordcount.py
+share/scribus/scripts/BleedAndPrintMarks.py
 share/scribus/scripts/CalendarWizard.py
 share/scribus/scripts/ChangeLog
+share/scribus/scripts/DirectImageImport.py
+share/scribus/scripts/DrawGrid.py
+share/scribus/scripts/ExtractText.py
 share/scribus/scripts/FontSample.py
+share/scribus/scripts/InfoBox.py
 share/scribus/scripts/NEWS
 share/scribus/scripts/ReadMe
 share/scribus/scripts/TODO
+share/scribus/scripts/UnflipContent.py
 share/scribus/templates/br1/br1.png
 share/scribus/templates/br1/br1.sla.gz
 share/scribus/templates/br1/br1tn.png
@@ -1138,6 +1149,7 @@ share/scribus/translations/scribus.zh_TW.qm
 @dirrm share/scribus/loremipsum
 @dirrm share/scribus/icons
 @dirrm share/scribus/dtd
+@dirrm share/scribus/dicts
 @dirrm share/scribus
 @comment in xdg-dirs: @dirrm share/pixmaps
 @comment in shared-mime-info: @dirrm share/mime/packages
@@ -1161,6 +1173,5 @@ share/scribus/translations/scribus.zh_TW.qm
 @dirrm lib/scribus/plugins/gettext
 @dirrm lib/scribus/plugins
 @dirrm lib/scribus/keysets
-@dirrm lib/scribus/dicts
 @dirrm lib/scribus
 @dirrm include/scribus
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index 19a8ae19c2e..ef98a3cc736 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2008/01/14 12:54:12 drochner Exp $
+$NetBSD: distinfo,v 1.19 2008/10/09 10:33:40 adam Exp $
 
-SHA1 (scribus-1.3.3.11.tar.bz2) = f9242b5b77cf0644ff5d8277425852c7e9df4a55
-RMD160 (scribus-1.3.3.11.tar.bz2) = 88fcc880c93756b0ea5d373228e8c2cee5602e31
-Size (scribus-1.3.3.11.tar.bz2) = 13302366 bytes
+SHA1 (scribus-1.3.3.12.tar.bz2) = 292166ec31325b9f2bae31aaa392e86aeff2ccf6
+RMD160 (scribus-1.3.3.12.tar.bz2) = 870477695073aaf02d498a51fb6419f945d16a3b
+Size (scribus-1.3.3.12.tar.bz2) = 13346822 bytes
 SHA1 (patch-aa) = ac5abdefb79c2f37e6a50350a5b324ab92a03aec
 SHA1 (patch-ab) = 275027632360bb5458b1f4b2fda8d3741c74d5e9
 SHA1 (patch-ad) = 03a4edef89cf4f8d78b20c5a4b7809036ba8d694