Finally updated scribus to 0.8 + official patches. It's kind of a shame

that a missing / on an open block comment prevents scribus.cpp from com-
piling.

12 files changed, 828 insertions, 472 deletions

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 2eede24dc051..6b6064c406ec 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,18 +7,26 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	0.6
-CATEGORIES=	print
+PORTVERSION=	0.8
+PORTREVISION=	0
+CATEGORIES=	print editors
 MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/
+DIST_SUBDIR=	${PORTNAME}
+PATCH_SITES=		${MASTER_SITES}
+PATCHFILES=		Fonts.diff Palette.diff
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@geeksrus.net
 
-RUN_DEPENDS=    gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
+#LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms # needs 1.0.9
 
-USE_QT_VER=	2
-USE_XLIB=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_QT_VER=		3
+USE_REINPLACE=		yes
+REINPLACE_ARGS=		-i
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+#USE_AUTOMAKE_VER=	14
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/share/scribus/libs \
@@ -30,7 +38,7 @@ post-patch:
 		${WRKSRC}/scribus/Makefile.in
 .endif
 	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} \
+		${XARGS} ${REINPLACE_CMD} \
 		-e 's|share/scribus/doc|share/doc/scribus|'
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index b8bc48039d66..e03c435a2fa3 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (scribus-0.6.tar.gz) = 565b166b977e82ad124c99a34cb2a603
-MD5 (kde-admindir-3.0.1.tar.gz) = 2b9efbf9905b326080d2dd5bbdcff8db
+MD5 (scribus/scribus-0.8.tar.gz) = 9a5ee8056b27d54ddba64f4c7deecce1
+MD5 (scribus/Fonts.diff) = 418671b40c4b08e6ce65a757c0999753
+MD5 (scribus/Palette.diff) = 34060ad84b63c66cd7a8e223e2c3efd6
diff --git a/print/scribus-devel/files/patch-scribus-scribus.cpp b/print/scribus-devel/files/patch-scribus-scribus.cpp
new file mode 100644
index 000000000000..2ebaa73fa1c0
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-scribus.cpp
@@ -0,0 +1,65 @@
+--- scribus/scribus.cpp.orig	Wed Oct 30 14:03:20 2002
++++ scribus/scribus.cpp	Wed Oct 30 16:08:14 2002
+@@ -2357,7 +2357,7 @@
+ void ScribusApp::slotHelpAbout()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef About* (*sdem)(QWidget *d);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -3836,7 +3836,7 @@
+ void ScribusApp::slotPrefsOrg()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4246,7 +4246,7 @@
+ 
+ PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
+ {
+-	char *error;
++	const char *error;
+ 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4276,7 +4276,7 @@
+ 
+ PDFlib* ScribusApp::getPDFDriver()
+ {
+-	char *error;
++	const char *error;
+ 	typedef PDFlib* (*sdem)();
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4646,7 +4646,7 @@
+ 
+ void ScribusApp::FinalizePlugs()
+ {
+-	char *error;
++	const char *error;
+ 	QMap<QString, PlugData>::Iterator it;
+ 	struct PlugData pda;
+ 	typedef void (*sdem2)();
+@@ -4711,7 +4711,7 @@
+ void ScribusApp::CallDLL(QString name)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	struct PlugData pda;
+ 	pda = PluginMap[name];
+ 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
+@@ -4745,7 +4745,7 @@
+ bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef QString (*sdem0)();
+ 	typedef int (*sdem1)();
+ 	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
diff --git a/print/scribus-devel/pkg-comment b/print/scribus-devel/pkg-comment
index 3b62bf3a5af5..f291d962cd9f 100644
--- a/print/scribus-devel/pkg-comment
+++ b/print/scribus-devel/pkg-comment
@@ -1 +1 @@
-A Layout program
+A comprehensive desktop publishing program
diff --git a/print/scribus-devel/pkg-descr b/print/scribus-devel/pkg-descr
index b960aa8bb2aa..95b942c9a72d 100644
--- a/print/scribus-devel/pkg-descr
+++ b/print/scribus-devel/pkg-descr
@@ -1,4 +1,4 @@
-Scribus is a Layout program, similar to Adobe PageMaker(TM),
+Scribus is a desktop publishing program, similar to Adobe PageMaker(TM),
 QuarkXPress(TM) or Adobe InDesign(TM).
 
 Scribus offers support for professional publishing features, such
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index dd22ff766b41..74b187d71642 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -1,17 +1,21 @@
 bin/scribus
+include/scribus/bookmwin.h
 include/scribus/cmykcolor.h
 include/scribus/colorm.h
 include/scribus/cpalette.h
-include/scribus/fpalettev.h
+include/scribus/customfdialog.h
+include/scribus/fpoint.h
+include/scribus/fpointarray.h
 include/scribus/frameedit.h
+include/scribus/helpbrowser.h
 include/scribus/hruler.h
-include/scribus/iconmenubutton.h
-include/scribus/icontbutton.h
+include/scribus/layers.h
+include/scribus/libpdf/pdflib.h
 include/scribus/libpostscript/pslib.h
 include/scribus/linecombo.h
 include/scribus/linkbutton.h
 include/scribus/modify.h
-include/scribus/mpal.h
+include/scribus/mpalette.h
 include/scribus/mspinbox.h
 include/scribus/page.h
 include/scribus/pageitem.h
@@ -22,217 +26,273 @@ include/scribus/scrap.h
 include/scribus/scribus.h
 include/scribus/scribusdoc.h
 include/scribus/scribusview.h
+include/scribus/seiten.h
 include/scribus/spalette.h
 include/scribus/tree.h
 include/scribus/vruler.h
-%%PORTDOCS%%share/doc/scribus/de/chapter11.html
-%%PORTDOCS%%share/doc/scribus/de/chapter12.html
-%%PORTDOCS%%share/doc/scribus/de/chapter13.html
-%%PORTDOCS%%share/doc/scribus/de/chapter14.html
-%%PORTDOCS%%share/doc/scribus/de/chapter21.html
-%%PORTDOCS%%share/doc/scribus/de/chapter22.html
-%%PORTDOCS%%share/doc/scribus/de/chapter23.html
-%%PORTDOCS%%share/doc/scribus/de/chapter24.html
-%%PORTDOCS%%share/doc/scribus/de/chapter25.html
-%%PORTDOCS%%share/doc/scribus/de/chapter31.html
-%%PORTDOCS%%share/doc/scribus/de/chapter32.html
-%%PORTDOCS%%share/doc/scribus/de/chapter33.html
-%%PORTDOCS%%share/doc/scribus/de/chapter34.html
-%%PORTDOCS%%share/doc/scribus/de/chapter41.html
-%%PORTDOCS%%share/doc/scribus/de/chapter412.html
-%%PORTDOCS%%share/doc/scribus/de/chapter42.html
-%%PORTDOCS%%share/doc/scribus/de/chapter43.html
-%%PORTDOCS%%share/doc/scribus/de/chapter51.html
-%%PORTDOCS%%share/doc/scribus/de/chapter52.html
-%%PORTDOCS%%share/doc/scribus/de/images/1.png
-%%PORTDOCS%%share/doc/scribus/de/images/color_edit.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_contur.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_fill.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_shade.png
-%%PORTDOCS%%share/doc/scribus/de/images/d_n_d_1.png
-%%PORTDOCS%%share/doc/scribus/de/images/d_n_d_2.png
-%%PORTDOCS%%share/doc/scribus/de/images/doc_setup.png
-%%PORTDOCS%%share/doc/scribus/de/images/edit_frame.png
-%%PORTDOCS%%share/doc/scribus/de/images/edit_pictureframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_frame.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_image.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_polygon.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_text.png
-%%PORTDOCS%%share/doc/scribus/de/images/modify_textframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/new_doc.png
-%%PORTDOCS%%share/doc/scribus/de/images/outline.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/general.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tool_picture.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_lines.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_oval.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_rectangular.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_text.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_zoom.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/typographics.png
-%%PORTDOCS%%share/doc/scribus/de/images/print.png
-%%PORTDOCS%%share/doc/scribus/de/images/save_as_pdf_compression.png
-%%PORTDOCS%%share/doc/scribus/de/images/save_as_pdf_general.png
-%%PORTDOCS%%share/doc/scribus/de/images/scrapbook.png
-%%PORTDOCS%%share/doc/scribus/de/images/scribus_logo.jpg
-%%PORTDOCS%%share/doc/scribus/de/images/snap_not_to_guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/snap_to_guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/style1.png
-%%PORTDOCS%%share/doc/scribus/de/images/style2.png
-%%PORTDOCS%%share/doc/scribus/de/images/style3.png
-%%PORTDOCS%%share/doc/scribus/de/images/style4.png
-%%PORTDOCS%%share/doc/scribus/de/images/text_too_long.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/chain_textframes.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/edit.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/imageframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/lines.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/move.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/oval.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/rectangular.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/rotate.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/textframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/unchain_textframes.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/zoom.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/kafka1.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/kafka_transparent.jpg
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/new_file.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/rotate.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/texte1.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/yellow_rect.png
-%%PORTDOCS%%share/doc/scribus/de/images/zoom.png
-%%PORTDOCS%%share/doc/scribus/de/index.html
-%%PORTDOCS%%share/doc/scribus/de/tutorial/book_cover.doc
-%%PORTDOCS%%share/doc/scribus/de/tutorial/book_cover.pdf
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka.jpg
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka.txt
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka_transparent.jpg
-%%PORTDOCS%%share/doc/scribus/de/tutorial/sign.gif
-%%PORTDOCS%%share/doc/scribus/en/cmsintro.html
-%%PORTDOCS%%share/doc/scribus/en/colormgmtscreen.png
-%%PORTDOCS%%share/doc/scribus/en/index-1.html
-%%PORTDOCS%%share/doc/scribus/en/index-2.html
-%%PORTDOCS%%share/doc/scribus/en/index-3.html
-%%PORTDOCS%%share/doc/scribus/en/index-4.html
-%%PORTDOCS%%share/doc/scribus/en/index-5.html
-%%PORTDOCS%%share/doc/scribus/en/index.html
-%%PORTDOCS%%share/doc/scribus/en/links.html
-%%PORTDOCS%%share/doc/scribus/en/modify1.png
-%%PORTDOCS%%share/doc/scribus/en/scribus_logonew.jpg
-%%PORTDOCS%%share/doc/scribus/fr/images/couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/deplac_pg.png
-%%PORTDOCS%%share/doc/scribus/fr/images/dupli.png
-%%PORTDOCS%%share/doc/scribus/fr/images/ed_couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/ed_new_couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/fh.gif
-%%PORTDOCS%%share/doc/scribus/fr/images/inser_page.png
-%%PORTDOCS%%share/doc/scribus/fr/images/logo_scribus.jpg
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_filet.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_img.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_nodes.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_txt.png
-%%PORTDOCS%%share/doc/scribus/fr/images/nav.png
-%%PORTDOCS%%share/doc/scribus/fr/images/new.png
-%%PORTDOCS%%share/doc/scribus/fr/images/outils.png
-%%PORTDOCS%%share/doc/scribus/fr/images/outils_h.png
-%%PORTDOCS%%share/doc/scribus/fr/images/print.png
-%%PORTDOCS%%share/doc/scribus/fr/images/prop_doc.png
-%%PORTDOCS%%share/doc/scribus/fr/images/select_g-fonts.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_01.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_02.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_03.png
-%%PORTDOCS%%share/doc/scribus/fr/images/styles.png
-%%PORTDOCS%%share/doc/scribus/fr/images/svgd_pdf.png
-%%PORTDOCS%%share/doc/scribus/fr/images/zoom.png
-%%PORTDOCS%%share/doc/scribus/fr/index.html
-%%PORTDOCS%%share/doc/scribus/fr/page10.html
-%%PORTDOCS%%share/doc/scribus/fr/page11.html
-%%PORTDOCS%%share/doc/scribus/fr/page12.html
-%%PORTDOCS%%share/doc/scribus/fr/page13.html
-%%PORTDOCS%%share/doc/scribus/fr/page2.html
-%%PORTDOCS%%share/doc/scribus/fr/page3.html
-%%PORTDOCS%%share/doc/scribus/fr/page4.html
-%%PORTDOCS%%share/doc/scribus/fr/page5.html
-%%PORTDOCS%%share/doc/scribus/fr/page6.html
-%%PORTDOCS%%share/doc/scribus/fr/page7.html
-%%PORTDOCS%%share/doc/scribus/fr/page8.html
-%%PORTDOCS%%share/doc/scribus/fr/page9.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/4eme.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/4eme_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/90.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/90d.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/album.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_carre.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_circ.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_img.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_txt.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_05.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_06.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_07.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_08.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/carre-texte.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/chaine.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/couleur_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/couv.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/croix.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/dupli_deplac.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fh.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fl.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fl_v.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/gnu_100.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/gnu_55.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_05.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_06.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_07.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_08.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/inserer.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/jaune_or.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/jaune_s.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/logo_scribus.jpg
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/main.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/pages_choix.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/plan.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/plan_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/rotation.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_bloc_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_cribus.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_100.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_55.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_55_chaine.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_s.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/styles-02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/styles.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/trait.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/index.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page1.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page2.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page3.html
+include/scribus/werktoolb.h
+share/doc/scribus/de/chapter11.html
+share/doc/scribus/de/chapter12.html
+share/doc/scribus/de/chapter13.html
+share/doc/scribus/de/chapter14.html
+share/doc/scribus/de/chapter21.html
+share/doc/scribus/de/chapter22.html
+share/doc/scribus/de/chapter23.html
+share/doc/scribus/de/chapter24.html
+share/doc/scribus/de/chapter25.html
+share/doc/scribus/de/chapter31.html
+share/doc/scribus/de/chapter32.html
+share/doc/scribus/de/chapter33.html
+share/doc/scribus/de/chapter34.html
+share/doc/scribus/de/chapter41.html
+share/doc/scribus/de/chapter412.html
+share/doc/scribus/de/chapter42.html
+share/doc/scribus/de/chapter43.html
+share/doc/scribus/de/chapter51.html
+share/doc/scribus/de/chapter52.html
+share/doc/scribus/de/images/1.png
+share/doc/scribus/de/images/color_edit.png
+share/doc/scribus/de/images/colors.png
+share/doc/scribus/de/images/colors_contur.png
+share/doc/scribus/de/images/colors_fill.png
+share/doc/scribus/de/images/colors_shade.png
+share/doc/scribus/de/images/d_n_d_1.png
+share/doc/scribus/de/images/d_n_d_2.png
+share/doc/scribus/de/images/doc_setup.png
+share/doc/scribus/de/images/edit_frame.png
+share/doc/scribus/de/images/edit_pictureframe.png
+share/doc/scribus/de/images/measurement_frame.png
+share/doc/scribus/de/images/measurement_image.png
+share/doc/scribus/de/images/measurement_polygon.png
+share/doc/scribus/de/images/measurement_text.png
+share/doc/scribus/de/images/modify_textframe.png
+share/doc/scribus/de/images/new_doc.png
+share/doc/scribus/de/images/outline.png
+share/doc/scribus/de/images/preferences/general.png
+share/doc/scribus/de/images/preferences/guides.png
+share/doc/scribus/de/images/preferences/tool_picture.png
+share/doc/scribus/de/images/preferences/tools.png
+share/doc/scribus/de/images/preferences/tools_lines.png
+share/doc/scribus/de/images/preferences/tools_oval.png
+share/doc/scribus/de/images/preferences/tools_rectangular.png
+share/doc/scribus/de/images/preferences/tools_text.png
+share/doc/scribus/de/images/preferences/tools_zoom.png
+share/doc/scribus/de/images/preferences/typographics.png
+share/doc/scribus/de/images/print.png
+share/doc/scribus/de/images/save_as_pdf_compression.png
+share/doc/scribus/de/images/save_as_pdf_general.png
+share/doc/scribus/de/images/scrapbook.png
+share/doc/scribus/de/images/scribus_logo.jpg
+share/doc/scribus/de/images/snap_not_to_guides.png
+share/doc/scribus/de/images/snap_to_guides.png
+share/doc/scribus/de/images/style1.png
+share/doc/scribus/de/images/style2.png
+share/doc/scribus/de/images/style3.png
+share/doc/scribus/de/images/style4.png
+share/doc/scribus/de/images/text_too_long.png
+share/doc/scribus/de/images/tools/chain_textframes.png
+share/doc/scribus/de/images/tools/edit.png
+share/doc/scribus/de/images/tools/imageframe.png
+share/doc/scribus/de/images/tools/lines.png
+share/doc/scribus/de/images/tools/move.png
+share/doc/scribus/de/images/tools/oval.png
+share/doc/scribus/de/images/tools/rectangular.png
+share/doc/scribus/de/images/tools/rotate.png
+share/doc/scribus/de/images/tools/textframe.png
+share/doc/scribus/de/images/tools/unchain_textframes.png
+share/doc/scribus/de/images/tools/zoom.png
+share/doc/scribus/de/images/tutorial/kafka1.png
+share/doc/scribus/de/images/tutorial/kafka_transparent.jpg
+share/doc/scribus/de/images/tutorial/new_file.png
+share/doc/scribus/de/images/tutorial/rotate.png
+share/doc/scribus/de/images/tutorial/texte1.png
+share/doc/scribus/de/images/tutorial/yellow_rect.png
+share/doc/scribus/de/images/zoom.png
+share/doc/scribus/de/index.html
+share/doc/scribus/de/tutorial/book_cover.doc
+share/doc/scribus/de/tutorial/book_cover.pdf
+share/doc/scribus/de/tutorial/kafka.jpg
+share/doc/scribus/de/tutorial/kafka.txt
+share/doc/scribus/de/tutorial/kafka_transparent.jpg
+share/doc/scribus/de/tutorial/sign.gif
+share/doc/scribus/en/bookmark1.png
+share/doc/scribus/en/changelog.html
+share/doc/scribus/en/cms.html
+share/doc/scribus/en/colormgmtscreen.png
+share/doc/scribus/en/compile.html
+share/doc/scribus/en/context1.png
+share/doc/scribus/en/corel1.png
+share/doc/scribus/en/corel2a.png
+share/doc/scribus/en/corel2c.png
+share/doc/scribus/en/corelphoto.html
+share/doc/scribus/en/embed2.png
+share/doc/scribus/en/embed3.png
+share/doc/scribus/en/embedcolor.png
+share/doc/scribus/en/favicon.ico
+share/doc/scribus/en/gamut3.png
+share/doc/scribus/en/index-1.html
+share/doc/scribus/en/index-2.html
+share/doc/scribus/en/index-3.html
+share/doc/scribus/en/index-4.html
+share/doc/scribus/en/index-9.html
+share/doc/scribus/en/index.html
+share/doc/scribus/en/keys.png
+share/doc/scribus/en/keys2.png
+share/doc/scribus/en/layers1.png
+share/doc/scribus/en/layers2.png
+share/doc/scribus/en/layers3.png
+share/doc/scribus/en/modify1.png
+share/doc/scribus/en/modify2.png
+share/doc/scribus/en/modify3.png
+share/doc/scribus/en/modifyimage.png
+share/doc/scribus/en/modifytext.png
+share/doc/scribus/en/newdoc.png
+share/doc/scribus/en/optimizelinuxdtp.html
+share/doc/scribus/en/pagepalette1.png
+share/doc/scribus/en/pagepalette2.png
+share/doc/scribus/en/pagepalette3.png
+share/doc/scribus/en/pdf1.png
+share/doc/scribus/en/pdf2.png
+share/doc/scribus/en/pdf4.png
+share/doc/scribus/en/pdf5.png
+share/doc/scribus/en/pdfexport.html
+share/doc/scribus/en/pdfshow2.png
+share/doc/scribus/en/pdftool1.png
+share/doc/scribus/en/pdftool2.png
+share/doc/scribus/en/pdftool3.png
+share/doc/scribus/en/pdftool4.png
+share/doc/scribus/en/polylinepref.png
+share/doc/scribus/en/polypref.png
+share/doc/scribus/en/pref4.png
+share/doc/scribus/en/preferences.html
+share/doc/scribus/en/prefs1.png
+share/doc/scribus/en/prefs2.png
+share/doc/scribus/en/prefs3.png
+share/doc/scribus/en/ruler.png
+share/doc/scribus/en/sclinks.html
+share/doc/scribus/en/scrapbook.png
+share/doc/scribus/en/scribus_head.png
+share/doc/scribus/en/scribus_logonew.jpg
+share/doc/scribus/en/scribusnib.png
+share/doc/scribus/en/scrkeys.png
+share/doc/scribus/en/toolshide.png
+share/doc/scribus/fr/images/couleur.png
+share/doc/scribus/fr/images/deplac_pg.png
+share/doc/scribus/fr/images/dupli.png
+share/doc/scribus/fr/images/ed_couleur.png
+share/doc/scribus/fr/images/ed_new_couleur.png
+share/doc/scribus/fr/images/fh.gif
+share/doc/scribus/fr/images/inser_page.png
+share/doc/scribus/fr/images/logo_scribus.jpg
+share/doc/scribus/fr/images/modif_filet.png
+share/doc/scribus/fr/images/modif_img.png
+share/doc/scribus/fr/images/modif_nodes.png
+share/doc/scribus/fr/images/modif_txt.png
+share/doc/scribus/fr/images/nav.png
+share/doc/scribus/fr/images/new.png
+share/doc/scribus/fr/images/outils.png
+share/doc/scribus/fr/images/outils_h.png
+share/doc/scribus/fr/images/print.png
+share/doc/scribus/fr/images/prop_doc.png
+share/doc/scribus/fr/images/select_g-fonts.png
+share/doc/scribus/fr/images/spec_01.png
+share/doc/scribus/fr/images/spec_02.png
+share/doc/scribus/fr/images/spec_03.png
+share/doc/scribus/fr/images/styles.png
+share/doc/scribus/fr/images/svgd_pdf.png
+share/doc/scribus/fr/images/zoom.png
+share/doc/scribus/fr/index.html
+share/doc/scribus/fr/page10.html
+share/doc/scribus/fr/page11.html
+share/doc/scribus/fr/page12.html
+share/doc/scribus/fr/page13.html
+share/doc/scribus/fr/page2.html
+share/doc/scribus/fr/page3.html
+share/doc/scribus/fr/page4.html
+share/doc/scribus/fr/page5.html
+share/doc/scribus/fr/page6.html
+share/doc/scribus/fr/page7.html
+share/doc/scribus/fr/page8.html
+share/doc/scribus/fr/page9.html
+share/doc/scribus/fr/tutorial/images/4eme.png
+share/doc/scribus/fr/tutorial/images/4eme_01.png
+share/doc/scribus/fr/tutorial/images/90.png
+share/doc/scribus/fr/tutorial/images/90d.png
+share/doc/scribus/fr/tutorial/images/album.png
+share/doc/scribus/fr/tutorial/images/bloc_carre.png
+share/doc/scribus/fr/tutorial/images/bloc_circ.png
+share/doc/scribus/fr/tutorial/images/bloc_img.png
+share/doc/scribus/fr/tutorial/images/bloc_txt.png
+share/doc/scribus/fr/tutorial/images/capt_01.png
+share/doc/scribus/fr/tutorial/images/capt_02.png
+share/doc/scribus/fr/tutorial/images/capt_03.png
+share/doc/scribus/fr/tutorial/images/capt_04.png
+share/doc/scribus/fr/tutorial/images/capt_05.png
+share/doc/scribus/fr/tutorial/images/capt_06.png
+share/doc/scribus/fr/tutorial/images/capt_07.png
+share/doc/scribus/fr/tutorial/images/capt_08.png
+share/doc/scribus/fr/tutorial/images/carre-texte.png
+share/doc/scribus/fr/tutorial/images/chaine.png
+share/doc/scribus/fr/tutorial/images/couleur_01.png
+share/doc/scribus/fr/tutorial/images/couv.png
+share/doc/scribus/fr/tutorial/images/croix.png
+share/doc/scribus/fr/tutorial/images/dupli_deplac.png
+share/doc/scribus/fr/tutorial/images/esp_align.png
+share/doc/scribus/fr/tutorial/images/esp_align_01.png
+share/doc/scribus/fr/tutorial/images/esp_align_02.png
+share/doc/scribus/fr/tutorial/images/fh.gif
+share/doc/scribus/fr/tutorial/images/fl.gif
+share/doc/scribus/fr/tutorial/images/fl_v.gif
+share/doc/scribus/fr/tutorial/images/gnu_100.png
+share/doc/scribus/fr/tutorial/images/gnu_55.png
+share/doc/scribus/fr/tutorial/images/habill_01.png
+share/doc/scribus/fr/tutorial/images/habill_02.png
+share/doc/scribus/fr/tutorial/images/habill_03.png
+share/doc/scribus/fr/tutorial/images/habill_04.png
+share/doc/scribus/fr/tutorial/images/habill_05.png
+share/doc/scribus/fr/tutorial/images/habill_06.png
+share/doc/scribus/fr/tutorial/images/habill_07.png
+share/doc/scribus/fr/tutorial/images/habill_08.png
+share/doc/scribus/fr/tutorial/images/inserer.png
+share/doc/scribus/fr/tutorial/images/jaune_or.png
+share/doc/scribus/fr/tutorial/images/jaune_s.png
+share/doc/scribus/fr/tutorial/images/logo_scribus.jpg
+share/doc/scribus/fr/tutorial/images/main.png
+share/doc/scribus/fr/tutorial/images/maqu_01.png
+share/doc/scribus/fr/tutorial/images/maqu_02.png
+share/doc/scribus/fr/tutorial/images/maqu_03.png
+share/doc/scribus/fr/tutorial/images/maqu_04.png
+share/doc/scribus/fr/tutorial/images/pages_choix.png
+share/doc/scribus/fr/tutorial/images/plan.png
+share/doc/scribus/fr/tutorial/images/plan_01.png
+share/doc/scribus/fr/tutorial/images/rotation.png
+share/doc/scribus/fr/tutorial/images/s_01.png
+share/doc/scribus/fr/tutorial/images/s_02.png
+share/doc/scribus/fr/tutorial/images/s_03.png
+share/doc/scribus/fr/tutorial/images/s_04.png
+share/doc/scribus/fr/tutorial/images/spec_bloc_01.png
+share/doc/scribus/fr/tutorial/images/spec_cribus.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_100.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_55.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_55_chaine.png
+share/doc/scribus/fr/tutorial/images/spec_s.png
+share/doc/scribus/fr/tutorial/images/styles-02.png
+share/doc/scribus/fr/tutorial/images/styles.png
+share/doc/scribus/fr/tutorial/images/trait.png
+share/doc/scribus/fr/tutorial/index.html
+share/doc/scribus/fr/tutorial/page1.html
+share/doc/scribus/fr/tutorial/page2.html
+share/doc/scribus/fr/tutorial/page3.html
 share/scribus/ISOenc.txt
 share/scribus/Stdenc.txt
 share/scribus/TTFenc.txt
-share/scribus/icons/AddNode.xpm
+share/scribus/icons/AddNode.png
+share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.xpm
+share/scribus/icons/BevelJoin.png
+share/scribus/icons/BezierClose.png
 share/scribus/icons/Bild.xpm
+share/scribus/icons/ButtCap.png
 share/scribus/icons/Corner.xpm
 share/scribus/icons/DateiClos.xpm
 share/scribus/icons/DateiClos16.png
@@ -244,7 +304,9 @@ share/scribus/icons/DateiPrint.xpm
 share/scribus/icons/DateiPrint16.png
 share/scribus/icons/DateiSave.xpm
 share/scribus/icons/DateiSave16.png
-share/scribus/icons/DelNode.xpm
+share/scribus/icons/DelPoint.png
+share/scribus/icons/DeleteNode.png
+share/scribus/icons/Deletelayer.png
 share/scribus/icons/DragPix.xpm
 share/scribus/icons/Editm.xpm
 share/scribus/icons/Fett.xpm
@@ -259,38 +321,68 @@ share/scribus/icons/Kern.xpm
 share/scribus/icons/Klein.xpm
 share/scribus/icons/Kreise.xpm
 share/scribus/icons/Kreuz.xpm
+share/scribus/icons/Layervisible.xpm
 share/scribus/icons/Lock.xpm
+share/scribus/icons/Lowerlayer.png
 share/scribus/icons/Lupe.xpm
 share/scribus/icons/LupeZ.xpm
-share/scribus/icons/MoveNode.xpm
+share/scribus/icons/MiterJoin.png
+share/scribus/icons/MoveAsym.png
+share/scribus/icons/MoveKontrol.png
+share/scribus/icons/MoveNode.png
+share/scribus/icons/MoveSym.png
+share/scribus/icons/Newlayer.png
+share/scribus/icons/PolyCut.png
+share/scribus/icons/Raiselayer.png
 share/scribus/icons/Rechtecke.xpm
+share/scribus/icons/Reset1Node.png
+share/scribus/icons/ResetNode.png
 share/scribus/icons/Rotieren.xpm
 share/scribus/icons/Rotieren2.xpm
+share/scribus/icons/RoundCap.png
+share/scribus/icons/RoundJoin.png
 share/scribus/icons/Spacing.xpm
+share/scribus/icons/Split.png
+share/scribus/icons/SquareCap.png
 share/scribus/icons/Stift.xpm
+share/scribus/icons/Stiftalt.xpm
 share/scribus/icons/Strike.xpm
 share/scribus/icons/Text.xpm
+share/scribus/icons/Text2.xpm
 share/scribus/icons/Tief.xpm
 share/scribus/icons/Unlock.xpm
 share/scribus/icons/Unter.xpm
 share/scribus/icons/Winkel.xpm
 share/scribus/icons/Zeichen.xpm
 share/scribus/icons/acrobat.png
+share/scribus/icons/beziertool.png
+share/scribus/icons/charset.png
+share/scribus/icons/checkbox.png
+share/scribus/icons/combobox.png
 share/scribus/icons/doc.png
+share/scribus/icons/document2.png
 share/scribus/icons/editcopy.png
 share/scribus/icons/editcut.png
 share/scribus/icons/editdelete.png
 share/scribus/icons/editpaste.png
 share/scribus/icons/exit.png
+share/scribus/icons/goto.png
 share/scribus/icons/image.png
+share/scribus/icons/listbox.png
 share/scribus/icons/pdf.png
 share/scribus/icons/postscript.png
+share/scribus/icons/pushbutton.png
 share/scribus/icons/scribus_logo.jpg
 share/scribus/icons/scribusicon.png
+share/scribus/icons/spline.png
 share/scribus/icons/text_block.png
 share/scribus/icons/text_center.png
 share/scribus/icons/text_left.png
 share/scribus/icons/text_right.png
+share/scribus/icons/textview.png
+share/scribus/icons/trashcan.png
+share/scribus/icons/trashcan2.png
+share/scribus/icons/triangle.png
 share/scribus/icons/txt.png
 share/scribus/iso8859-15.enc
 share/scribus/iso8859-2.enc
@@ -307,10 +399,18 @@ share/scribus/libs/libpostscript.so.0
 share/scribus/libs/libpreferences.la
 share/scribus/libs/libpreferences.so
 share/scribus/libs/libpreferences.so.0
+share/scribus/plugins/charselect.de.qm
+share/scribus/plugins/charselect.sk.qm
 share/scribus/plugins/libcharselect.la
 share/scribus/plugins/libcharselect.so
 share/scribus/plugins/libcharselect.so.0
 share/scribus/profiles/ReadMe
+share/scribus/samples/Demo1.pdf
+share/scribus/samples/Demo1.scd
+share/scribus/samples/Fields.pdf
+share/scribus/samples/Fields.scd
+share/scribus/samples/scribusformsdoc.pdf
+share/scribus/samples/survey.pdf
 share/scribus/scribus.bg.qm
 share/scribus/scribus.ca.qm
 share/scribus/scribus.de.qm
@@ -319,24 +419,28 @@ share/scribus/scribus.fr.qm
 share/scribus/scribus.gl.qm
 share/scribus/scribus.hu.qm
 share/scribus/scribus.it.qm
+share/scribus/scribus.lt.qm
 share/scribus/scribus.sk.qm
+share/scribus/scribus.tr.qm
 share/scribus/scribus.uk.qm
-@dirrm share/scribus/icons
-@dirrm share/scribus/libs
-@dirrm share/scribus/plugins
+@dirrm share/scribus/samples
 @dirrm share/scribus/profiles
+@dirrm share/scribus/plugins
+@dirrm share/scribus/libs
+@dirrm share/scribus/icons
 @dirrm share/scribus
-%%PORTDOCS%%@dirrm share/doc/scribus/en
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/tools
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/preferences
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images
-%%PORTDOCS%%@dirrm share/doc/scribus/de/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/de
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/tutorial/images
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/images
-%%PORTDOCS%%@dirrm share/doc/scribus/fr
-%%PORTDOCS%%@dirrm share/doc/scribus
+@dirrm share/doc/scribus/fr/tutorial/images
+@dirrm share/doc/scribus/fr/tutorial
+@dirrm share/doc/scribus/fr/images
+@dirrm share/doc/scribus/fr
+@dirrm share/doc/scribus/en
+@dirrm share/doc/scribus/de/tutorial
+@dirrm share/doc/scribus/de/images/tutorial
+@dirrm share/doc/scribus/de/images/tools
+@dirrm share/doc/scribus/de/images/preferences
+@dirrm share/doc/scribus/de/images
+@dirrm share/doc/scribus/de
+@dirrm share/doc/scribus
 @dirrm include/scribus/libpostscript
+@dirrm include/scribus/libpdf
 @dirrm include/scribus
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 2eede24dc051..6b6064c406ec 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -7,18 +7,26 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	0.6
-CATEGORIES=	print
+PORTVERSION=	0.8
+PORTREVISION=	0
+CATEGORIES=	print editors
 MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/
+DIST_SUBDIR=	${PORTNAME}
+PATCH_SITES=		${MASTER_SITES}
+PATCHFILES=		Fonts.diff Palette.diff
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@geeksrus.net
 
-RUN_DEPENDS=    gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
+#LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms # needs 1.0.9
 
-USE_QT_VER=	2
-USE_XLIB=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_QT_VER=		3
+USE_REINPLACE=		yes
+REINPLACE_ARGS=		-i
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+#USE_AUTOMAKE_VER=	14
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/share/scribus/libs \
@@ -30,7 +38,7 @@ post-patch:
 		${WRKSRC}/scribus/Makefile.in
 .endif
 	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} \
+		${XARGS} ${REINPLACE_CMD} \
 		-e 's|share/scribus/doc|share/doc/scribus|'
 
 .include <bsd.port.mk>
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index b8bc48039d66..e03c435a2fa3 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,2 +1,3 @@
-MD5 (scribus-0.6.tar.gz) = 565b166b977e82ad124c99a34cb2a603
-MD5 (kde-admindir-3.0.1.tar.gz) = 2b9efbf9905b326080d2dd5bbdcff8db
+MD5 (scribus/scribus-0.8.tar.gz) = 9a5ee8056b27d54ddba64f4c7deecce1
+MD5 (scribus/Fonts.diff) = 418671b40c4b08e6ce65a757c0999753
+MD5 (scribus/Palette.diff) = 34060ad84b63c66cd7a8e223e2c3efd6
diff --git a/print/scribus/files/patch-scribus-scribus.cpp b/print/scribus/files/patch-scribus-scribus.cpp
new file mode 100644
index 000000000000..2ebaa73fa1c0
--- /dev/null
+++ b/print/scribus/files/patch-scribus-scribus.cpp
@@ -0,0 +1,65 @@
+--- scribus/scribus.cpp.orig	Wed Oct 30 14:03:20 2002
++++ scribus/scribus.cpp	Wed Oct 30 16:08:14 2002
+@@ -2357,7 +2357,7 @@
+ void ScribusApp::slotHelpAbout()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef About* (*sdem)(QWidget *d);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -3836,7 +3836,7 @@
+ void ScribusApp::slotPrefsOrg()
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4246,7 +4246,7 @@
+ 
+ PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
+ {
+-	char *error;
++	const char *error;
+ 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4276,7 +4276,7 @@
+ 
+ PDFlib* ScribusApp::getPDFDriver()
+ {
+-	char *error;
++	const char *error;
+ 	typedef PDFlib* (*sdem)();
+ 	sdem demo;
+ 	QString pfad = PREL;
+@@ -4646,7 +4646,7 @@
+ 
+ void ScribusApp::FinalizePlugs()
+ {
+-	char *error;
++	const char *error;
+ 	QMap<QString, PlugData>::Iterator it;
+ 	struct PlugData pda;
+ 	typedef void (*sdem2)();
+@@ -4711,7 +4711,7 @@
+ void ScribusApp::CallDLL(QString name)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	struct PlugData pda;
+ 	pda = PluginMap[name];
+ 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
+@@ -4745,7 +4745,7 @@
+ bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
+ {
+ 	void *mo;
+-	char *error;
++	const char *error;
+ 	typedef QString (*sdem0)();
+ 	typedef int (*sdem1)();
+ 	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
diff --git a/print/scribus/pkg-comment b/print/scribus/pkg-comment
index 3b62bf3a5af5..f291d962cd9f 100644
--- a/print/scribus/pkg-comment
+++ b/print/scribus/pkg-comment
@@ -1 +1 @@
-A Layout program
+A comprehensive desktop publishing program
diff --git a/print/scribus/pkg-descr b/print/scribus/pkg-descr
index b960aa8bb2aa..95b942c9a72d 100644
--- a/print/scribus/pkg-descr
+++ b/print/scribus/pkg-descr
@@ -1,4 +1,4 @@
-Scribus is a Layout program, similar to Adobe PageMaker(TM),
+Scribus is a desktop publishing program, similar to Adobe PageMaker(TM),
 QuarkXPress(TM) or Adobe InDesign(TM).
 
 Scribus offers support for professional publishing features, such
diff --git a/print/scribus/pkg-plist b/print/scribus/pkg-plist
index dd22ff766b41..74b187d71642 100644
--- a/print/scribus/pkg-plist
+++ b/print/scribus/pkg-plist
@@ -1,17 +1,21 @@
 bin/scribus
+include/scribus/bookmwin.h
 include/scribus/cmykcolor.h
 include/scribus/colorm.h
 include/scribus/cpalette.h
-include/scribus/fpalettev.h
+include/scribus/customfdialog.h
+include/scribus/fpoint.h
+include/scribus/fpointarray.h
 include/scribus/frameedit.h
+include/scribus/helpbrowser.h
 include/scribus/hruler.h
-include/scribus/iconmenubutton.h
-include/scribus/icontbutton.h
+include/scribus/layers.h
+include/scribus/libpdf/pdflib.h
 include/scribus/libpostscript/pslib.h
 include/scribus/linecombo.h
 include/scribus/linkbutton.h
 include/scribus/modify.h
-include/scribus/mpal.h
+include/scribus/mpalette.h
 include/scribus/mspinbox.h
 include/scribus/page.h
 include/scribus/pageitem.h
@@ -22,217 +26,273 @@ include/scribus/scrap.h
 include/scribus/scribus.h
 include/scribus/scribusdoc.h
 include/scribus/scribusview.h
+include/scribus/seiten.h
 include/scribus/spalette.h
 include/scribus/tree.h
 include/scribus/vruler.h
-%%PORTDOCS%%share/doc/scribus/de/chapter11.html
-%%PORTDOCS%%share/doc/scribus/de/chapter12.html
-%%PORTDOCS%%share/doc/scribus/de/chapter13.html
-%%PORTDOCS%%share/doc/scribus/de/chapter14.html
-%%PORTDOCS%%share/doc/scribus/de/chapter21.html
-%%PORTDOCS%%share/doc/scribus/de/chapter22.html
-%%PORTDOCS%%share/doc/scribus/de/chapter23.html
-%%PORTDOCS%%share/doc/scribus/de/chapter24.html
-%%PORTDOCS%%share/doc/scribus/de/chapter25.html
-%%PORTDOCS%%share/doc/scribus/de/chapter31.html
-%%PORTDOCS%%share/doc/scribus/de/chapter32.html
-%%PORTDOCS%%share/doc/scribus/de/chapter33.html
-%%PORTDOCS%%share/doc/scribus/de/chapter34.html
-%%PORTDOCS%%share/doc/scribus/de/chapter41.html
-%%PORTDOCS%%share/doc/scribus/de/chapter412.html
-%%PORTDOCS%%share/doc/scribus/de/chapter42.html
-%%PORTDOCS%%share/doc/scribus/de/chapter43.html
-%%PORTDOCS%%share/doc/scribus/de/chapter51.html
-%%PORTDOCS%%share/doc/scribus/de/chapter52.html
-%%PORTDOCS%%share/doc/scribus/de/images/1.png
-%%PORTDOCS%%share/doc/scribus/de/images/color_edit.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_contur.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_fill.png
-%%PORTDOCS%%share/doc/scribus/de/images/colors_shade.png
-%%PORTDOCS%%share/doc/scribus/de/images/d_n_d_1.png
-%%PORTDOCS%%share/doc/scribus/de/images/d_n_d_2.png
-%%PORTDOCS%%share/doc/scribus/de/images/doc_setup.png
-%%PORTDOCS%%share/doc/scribus/de/images/edit_frame.png
-%%PORTDOCS%%share/doc/scribus/de/images/edit_pictureframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_frame.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_image.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_polygon.png
-%%PORTDOCS%%share/doc/scribus/de/images/measurement_text.png
-%%PORTDOCS%%share/doc/scribus/de/images/modify_textframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/new_doc.png
-%%PORTDOCS%%share/doc/scribus/de/images/outline.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/general.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tool_picture.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_lines.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_oval.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_rectangular.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_text.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/tools_zoom.png
-%%PORTDOCS%%share/doc/scribus/de/images/preferences/typographics.png
-%%PORTDOCS%%share/doc/scribus/de/images/print.png
-%%PORTDOCS%%share/doc/scribus/de/images/save_as_pdf_compression.png
-%%PORTDOCS%%share/doc/scribus/de/images/save_as_pdf_general.png
-%%PORTDOCS%%share/doc/scribus/de/images/scrapbook.png
-%%PORTDOCS%%share/doc/scribus/de/images/scribus_logo.jpg
-%%PORTDOCS%%share/doc/scribus/de/images/snap_not_to_guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/snap_to_guides.png
-%%PORTDOCS%%share/doc/scribus/de/images/style1.png
-%%PORTDOCS%%share/doc/scribus/de/images/style2.png
-%%PORTDOCS%%share/doc/scribus/de/images/style3.png
-%%PORTDOCS%%share/doc/scribus/de/images/style4.png
-%%PORTDOCS%%share/doc/scribus/de/images/text_too_long.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/chain_textframes.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/edit.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/imageframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/lines.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/move.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/oval.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/rectangular.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/rotate.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/textframe.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/unchain_textframes.png
-%%PORTDOCS%%share/doc/scribus/de/images/tools/zoom.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/kafka1.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/kafka_transparent.jpg
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/new_file.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/rotate.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/texte1.png
-%%PORTDOCS%%share/doc/scribus/de/images/tutorial/yellow_rect.png
-%%PORTDOCS%%share/doc/scribus/de/images/zoom.png
-%%PORTDOCS%%share/doc/scribus/de/index.html
-%%PORTDOCS%%share/doc/scribus/de/tutorial/book_cover.doc
-%%PORTDOCS%%share/doc/scribus/de/tutorial/book_cover.pdf
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka.jpg
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka.txt
-%%PORTDOCS%%share/doc/scribus/de/tutorial/kafka_transparent.jpg
-%%PORTDOCS%%share/doc/scribus/de/tutorial/sign.gif
-%%PORTDOCS%%share/doc/scribus/en/cmsintro.html
-%%PORTDOCS%%share/doc/scribus/en/colormgmtscreen.png
-%%PORTDOCS%%share/doc/scribus/en/index-1.html
-%%PORTDOCS%%share/doc/scribus/en/index-2.html
-%%PORTDOCS%%share/doc/scribus/en/index-3.html
-%%PORTDOCS%%share/doc/scribus/en/index-4.html
-%%PORTDOCS%%share/doc/scribus/en/index-5.html
-%%PORTDOCS%%share/doc/scribus/en/index.html
-%%PORTDOCS%%share/doc/scribus/en/links.html
-%%PORTDOCS%%share/doc/scribus/en/modify1.png
-%%PORTDOCS%%share/doc/scribus/en/scribus_logonew.jpg
-%%PORTDOCS%%share/doc/scribus/fr/images/couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/deplac_pg.png
-%%PORTDOCS%%share/doc/scribus/fr/images/dupli.png
-%%PORTDOCS%%share/doc/scribus/fr/images/ed_couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/ed_new_couleur.png
-%%PORTDOCS%%share/doc/scribus/fr/images/fh.gif
-%%PORTDOCS%%share/doc/scribus/fr/images/inser_page.png
-%%PORTDOCS%%share/doc/scribus/fr/images/logo_scribus.jpg
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_filet.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_img.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_nodes.png
-%%PORTDOCS%%share/doc/scribus/fr/images/modif_txt.png
-%%PORTDOCS%%share/doc/scribus/fr/images/nav.png
-%%PORTDOCS%%share/doc/scribus/fr/images/new.png
-%%PORTDOCS%%share/doc/scribus/fr/images/outils.png
-%%PORTDOCS%%share/doc/scribus/fr/images/outils_h.png
-%%PORTDOCS%%share/doc/scribus/fr/images/print.png
-%%PORTDOCS%%share/doc/scribus/fr/images/prop_doc.png
-%%PORTDOCS%%share/doc/scribus/fr/images/select_g-fonts.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_01.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_02.png
-%%PORTDOCS%%share/doc/scribus/fr/images/spec_03.png
-%%PORTDOCS%%share/doc/scribus/fr/images/styles.png
-%%PORTDOCS%%share/doc/scribus/fr/images/svgd_pdf.png
-%%PORTDOCS%%share/doc/scribus/fr/images/zoom.png
-%%PORTDOCS%%share/doc/scribus/fr/index.html
-%%PORTDOCS%%share/doc/scribus/fr/page10.html
-%%PORTDOCS%%share/doc/scribus/fr/page11.html
-%%PORTDOCS%%share/doc/scribus/fr/page12.html
-%%PORTDOCS%%share/doc/scribus/fr/page13.html
-%%PORTDOCS%%share/doc/scribus/fr/page2.html
-%%PORTDOCS%%share/doc/scribus/fr/page3.html
-%%PORTDOCS%%share/doc/scribus/fr/page4.html
-%%PORTDOCS%%share/doc/scribus/fr/page5.html
-%%PORTDOCS%%share/doc/scribus/fr/page6.html
-%%PORTDOCS%%share/doc/scribus/fr/page7.html
-%%PORTDOCS%%share/doc/scribus/fr/page8.html
-%%PORTDOCS%%share/doc/scribus/fr/page9.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/4eme.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/4eme_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/90.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/90d.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/album.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_carre.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_circ.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_img.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/bloc_txt.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_05.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_06.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_07.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/capt_08.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/carre-texte.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/chaine.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/couleur_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/couv.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/croix.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/dupli_deplac.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/esp_align_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fh.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fl.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/fl_v.gif
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/gnu_100.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/gnu_55.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_05.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_06.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_07.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/habill_08.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/inserer.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/jaune_or.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/jaune_s.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/logo_scribus.jpg
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/main.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/maqu_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/pages_choix.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/plan.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/plan_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/rotation.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_03.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/s_04.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_bloc_01.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_cribus.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_100.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_55.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_gnu_55_chaine.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/spec_s.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/styles-02.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/styles.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/images/trait.png
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/index.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page1.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page2.html
-%%PORTDOCS%%share/doc/scribus/fr/tutorial/page3.html
+include/scribus/werktoolb.h
+share/doc/scribus/de/chapter11.html
+share/doc/scribus/de/chapter12.html
+share/doc/scribus/de/chapter13.html
+share/doc/scribus/de/chapter14.html
+share/doc/scribus/de/chapter21.html
+share/doc/scribus/de/chapter22.html
+share/doc/scribus/de/chapter23.html
+share/doc/scribus/de/chapter24.html
+share/doc/scribus/de/chapter25.html
+share/doc/scribus/de/chapter31.html
+share/doc/scribus/de/chapter32.html
+share/doc/scribus/de/chapter33.html
+share/doc/scribus/de/chapter34.html
+share/doc/scribus/de/chapter41.html
+share/doc/scribus/de/chapter412.html
+share/doc/scribus/de/chapter42.html
+share/doc/scribus/de/chapter43.html
+share/doc/scribus/de/chapter51.html
+share/doc/scribus/de/chapter52.html
+share/doc/scribus/de/images/1.png
+share/doc/scribus/de/images/color_edit.png
+share/doc/scribus/de/images/colors.png
+share/doc/scribus/de/images/colors_contur.png
+share/doc/scribus/de/images/colors_fill.png
+share/doc/scribus/de/images/colors_shade.png
+share/doc/scribus/de/images/d_n_d_1.png
+share/doc/scribus/de/images/d_n_d_2.png
+share/doc/scribus/de/images/doc_setup.png
+share/doc/scribus/de/images/edit_frame.png
+share/doc/scribus/de/images/edit_pictureframe.png
+share/doc/scribus/de/images/measurement_frame.png
+share/doc/scribus/de/images/measurement_image.png
+share/doc/scribus/de/images/measurement_polygon.png
+share/doc/scribus/de/images/measurement_text.png
+share/doc/scribus/de/images/modify_textframe.png
+share/doc/scribus/de/images/new_doc.png
+share/doc/scribus/de/images/outline.png
+share/doc/scribus/de/images/preferences/general.png
+share/doc/scribus/de/images/preferences/guides.png
+share/doc/scribus/de/images/preferences/tool_picture.png
+share/doc/scribus/de/images/preferences/tools.png
+share/doc/scribus/de/images/preferences/tools_lines.png
+share/doc/scribus/de/images/preferences/tools_oval.png
+share/doc/scribus/de/images/preferences/tools_rectangular.png
+share/doc/scribus/de/images/preferences/tools_text.png
+share/doc/scribus/de/images/preferences/tools_zoom.png
+share/doc/scribus/de/images/preferences/typographics.png
+share/doc/scribus/de/images/print.png
+share/doc/scribus/de/images/save_as_pdf_compression.png
+share/doc/scribus/de/images/save_as_pdf_general.png
+share/doc/scribus/de/images/scrapbook.png
+share/doc/scribus/de/images/scribus_logo.jpg
+share/doc/scribus/de/images/snap_not_to_guides.png
+share/doc/scribus/de/images/snap_to_guides.png
+share/doc/scribus/de/images/style1.png
+share/doc/scribus/de/images/style2.png
+share/doc/scribus/de/images/style3.png
+share/doc/scribus/de/images/style4.png
+share/doc/scribus/de/images/text_too_long.png
+share/doc/scribus/de/images/tools/chain_textframes.png
+share/doc/scribus/de/images/tools/edit.png
+share/doc/scribus/de/images/tools/imageframe.png
+share/doc/scribus/de/images/tools/lines.png
+share/doc/scribus/de/images/tools/move.png
+share/doc/scribus/de/images/tools/oval.png
+share/doc/scribus/de/images/tools/rectangular.png
+share/doc/scribus/de/images/tools/rotate.png
+share/doc/scribus/de/images/tools/textframe.png
+share/doc/scribus/de/images/tools/unchain_textframes.png
+share/doc/scribus/de/images/tools/zoom.png
+share/doc/scribus/de/images/tutorial/kafka1.png
+share/doc/scribus/de/images/tutorial/kafka_transparent.jpg
+share/doc/scribus/de/images/tutorial/new_file.png
+share/doc/scribus/de/images/tutorial/rotate.png
+share/doc/scribus/de/images/tutorial/texte1.png
+share/doc/scribus/de/images/tutorial/yellow_rect.png
+share/doc/scribus/de/images/zoom.png
+share/doc/scribus/de/index.html
+share/doc/scribus/de/tutorial/book_cover.doc
+share/doc/scribus/de/tutorial/book_cover.pdf
+share/doc/scribus/de/tutorial/kafka.jpg
+share/doc/scribus/de/tutorial/kafka.txt
+share/doc/scribus/de/tutorial/kafka_transparent.jpg
+share/doc/scribus/de/tutorial/sign.gif
+share/doc/scribus/en/bookmark1.png
+share/doc/scribus/en/changelog.html
+share/doc/scribus/en/cms.html
+share/doc/scribus/en/colormgmtscreen.png
+share/doc/scribus/en/compile.html
+share/doc/scribus/en/context1.png
+share/doc/scribus/en/corel1.png
+share/doc/scribus/en/corel2a.png
+share/doc/scribus/en/corel2c.png
+share/doc/scribus/en/corelphoto.html
+share/doc/scribus/en/embed2.png
+share/doc/scribus/en/embed3.png
+share/doc/scribus/en/embedcolor.png
+share/doc/scribus/en/favicon.ico
+share/doc/scribus/en/gamut3.png
+share/doc/scribus/en/index-1.html
+share/doc/scribus/en/index-2.html
+share/doc/scribus/en/index-3.html
+share/doc/scribus/en/index-4.html
+share/doc/scribus/en/index-9.html
+share/doc/scribus/en/index.html
+share/doc/scribus/en/keys.png
+share/doc/scribus/en/keys2.png
+share/doc/scribus/en/layers1.png
+share/doc/scribus/en/layers2.png
+share/doc/scribus/en/layers3.png
+share/doc/scribus/en/modify1.png
+share/doc/scribus/en/modify2.png
+share/doc/scribus/en/modify3.png
+share/doc/scribus/en/modifyimage.png
+share/doc/scribus/en/modifytext.png
+share/doc/scribus/en/newdoc.png
+share/doc/scribus/en/optimizelinuxdtp.html
+share/doc/scribus/en/pagepalette1.png
+share/doc/scribus/en/pagepalette2.png
+share/doc/scribus/en/pagepalette3.png
+share/doc/scribus/en/pdf1.png
+share/doc/scribus/en/pdf2.png
+share/doc/scribus/en/pdf4.png
+share/doc/scribus/en/pdf5.png
+share/doc/scribus/en/pdfexport.html
+share/doc/scribus/en/pdfshow2.png
+share/doc/scribus/en/pdftool1.png
+share/doc/scribus/en/pdftool2.png
+share/doc/scribus/en/pdftool3.png
+share/doc/scribus/en/pdftool4.png
+share/doc/scribus/en/polylinepref.png
+share/doc/scribus/en/polypref.png
+share/doc/scribus/en/pref4.png
+share/doc/scribus/en/preferences.html
+share/doc/scribus/en/prefs1.png
+share/doc/scribus/en/prefs2.png
+share/doc/scribus/en/prefs3.png
+share/doc/scribus/en/ruler.png
+share/doc/scribus/en/sclinks.html
+share/doc/scribus/en/scrapbook.png
+share/doc/scribus/en/scribus_head.png
+share/doc/scribus/en/scribus_logonew.jpg
+share/doc/scribus/en/scribusnib.png
+share/doc/scribus/en/scrkeys.png
+share/doc/scribus/en/toolshide.png
+share/doc/scribus/fr/images/couleur.png
+share/doc/scribus/fr/images/deplac_pg.png
+share/doc/scribus/fr/images/dupli.png
+share/doc/scribus/fr/images/ed_couleur.png
+share/doc/scribus/fr/images/ed_new_couleur.png
+share/doc/scribus/fr/images/fh.gif
+share/doc/scribus/fr/images/inser_page.png
+share/doc/scribus/fr/images/logo_scribus.jpg
+share/doc/scribus/fr/images/modif_filet.png
+share/doc/scribus/fr/images/modif_img.png
+share/doc/scribus/fr/images/modif_nodes.png
+share/doc/scribus/fr/images/modif_txt.png
+share/doc/scribus/fr/images/nav.png
+share/doc/scribus/fr/images/new.png
+share/doc/scribus/fr/images/outils.png
+share/doc/scribus/fr/images/outils_h.png
+share/doc/scribus/fr/images/print.png
+share/doc/scribus/fr/images/prop_doc.png
+share/doc/scribus/fr/images/select_g-fonts.png
+share/doc/scribus/fr/images/spec_01.png
+share/doc/scribus/fr/images/spec_02.png
+share/doc/scribus/fr/images/spec_03.png
+share/doc/scribus/fr/images/styles.png
+share/doc/scribus/fr/images/svgd_pdf.png
+share/doc/scribus/fr/images/zoom.png
+share/doc/scribus/fr/index.html
+share/doc/scribus/fr/page10.html
+share/doc/scribus/fr/page11.html
+share/doc/scribus/fr/page12.html
+share/doc/scribus/fr/page13.html
+share/doc/scribus/fr/page2.html
+share/doc/scribus/fr/page3.html
+share/doc/scribus/fr/page4.html
+share/doc/scribus/fr/page5.html
+share/doc/scribus/fr/page6.html
+share/doc/scribus/fr/page7.html
+share/doc/scribus/fr/page8.html
+share/doc/scribus/fr/page9.html
+share/doc/scribus/fr/tutorial/images/4eme.png
+share/doc/scribus/fr/tutorial/images/4eme_01.png
+share/doc/scribus/fr/tutorial/images/90.png
+share/doc/scribus/fr/tutorial/images/90d.png
+share/doc/scribus/fr/tutorial/images/album.png
+share/doc/scribus/fr/tutorial/images/bloc_carre.png
+share/doc/scribus/fr/tutorial/images/bloc_circ.png
+share/doc/scribus/fr/tutorial/images/bloc_img.png
+share/doc/scribus/fr/tutorial/images/bloc_txt.png
+share/doc/scribus/fr/tutorial/images/capt_01.png
+share/doc/scribus/fr/tutorial/images/capt_02.png
+share/doc/scribus/fr/tutorial/images/capt_03.png
+share/doc/scribus/fr/tutorial/images/capt_04.png
+share/doc/scribus/fr/tutorial/images/capt_05.png
+share/doc/scribus/fr/tutorial/images/capt_06.png
+share/doc/scribus/fr/tutorial/images/capt_07.png
+share/doc/scribus/fr/tutorial/images/capt_08.png
+share/doc/scribus/fr/tutorial/images/carre-texte.png
+share/doc/scribus/fr/tutorial/images/chaine.png
+share/doc/scribus/fr/tutorial/images/couleur_01.png
+share/doc/scribus/fr/tutorial/images/couv.png
+share/doc/scribus/fr/tutorial/images/croix.png
+share/doc/scribus/fr/tutorial/images/dupli_deplac.png
+share/doc/scribus/fr/tutorial/images/esp_align.png
+share/doc/scribus/fr/tutorial/images/esp_align_01.png
+share/doc/scribus/fr/tutorial/images/esp_align_02.png
+share/doc/scribus/fr/tutorial/images/fh.gif
+share/doc/scribus/fr/tutorial/images/fl.gif
+share/doc/scribus/fr/tutorial/images/fl_v.gif
+share/doc/scribus/fr/tutorial/images/gnu_100.png
+share/doc/scribus/fr/tutorial/images/gnu_55.png
+share/doc/scribus/fr/tutorial/images/habill_01.png
+share/doc/scribus/fr/tutorial/images/habill_02.png
+share/doc/scribus/fr/tutorial/images/habill_03.png
+share/doc/scribus/fr/tutorial/images/habill_04.png
+share/doc/scribus/fr/tutorial/images/habill_05.png
+share/doc/scribus/fr/tutorial/images/habill_06.png
+share/doc/scribus/fr/tutorial/images/habill_07.png
+share/doc/scribus/fr/tutorial/images/habill_08.png
+share/doc/scribus/fr/tutorial/images/inserer.png
+share/doc/scribus/fr/tutorial/images/jaune_or.png
+share/doc/scribus/fr/tutorial/images/jaune_s.png
+share/doc/scribus/fr/tutorial/images/logo_scribus.jpg
+share/doc/scribus/fr/tutorial/images/main.png
+share/doc/scribus/fr/tutorial/images/maqu_01.png
+share/doc/scribus/fr/tutorial/images/maqu_02.png
+share/doc/scribus/fr/tutorial/images/maqu_03.png
+share/doc/scribus/fr/tutorial/images/maqu_04.png
+share/doc/scribus/fr/tutorial/images/pages_choix.png
+share/doc/scribus/fr/tutorial/images/plan.png
+share/doc/scribus/fr/tutorial/images/plan_01.png
+share/doc/scribus/fr/tutorial/images/rotation.png
+share/doc/scribus/fr/tutorial/images/s_01.png
+share/doc/scribus/fr/tutorial/images/s_02.png
+share/doc/scribus/fr/tutorial/images/s_03.png
+share/doc/scribus/fr/tutorial/images/s_04.png
+share/doc/scribus/fr/tutorial/images/spec_bloc_01.png
+share/doc/scribus/fr/tutorial/images/spec_cribus.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_100.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_55.png
+share/doc/scribus/fr/tutorial/images/spec_gnu_55_chaine.png
+share/doc/scribus/fr/tutorial/images/spec_s.png
+share/doc/scribus/fr/tutorial/images/styles-02.png
+share/doc/scribus/fr/tutorial/images/styles.png
+share/doc/scribus/fr/tutorial/images/trait.png
+share/doc/scribus/fr/tutorial/index.html
+share/doc/scribus/fr/tutorial/page1.html
+share/doc/scribus/fr/tutorial/page2.html
+share/doc/scribus/fr/tutorial/page3.html
 share/scribus/ISOenc.txt
 share/scribus/Stdenc.txt
 share/scribus/TTFenc.txt
-share/scribus/icons/AddNode.xpm
+share/scribus/icons/AddNode.png
+share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.xpm
+share/scribus/icons/BevelJoin.png
+share/scribus/icons/BezierClose.png
 share/scribus/icons/Bild.xpm
+share/scribus/icons/ButtCap.png
 share/scribus/icons/Corner.xpm
 share/scribus/icons/DateiClos.xpm
 share/scribus/icons/DateiClos16.png
@@ -244,7 +304,9 @@ share/scribus/icons/DateiPrint.xpm
 share/scribus/icons/DateiPrint16.png
 share/scribus/icons/DateiSave.xpm
 share/scribus/icons/DateiSave16.png
-share/scribus/icons/DelNode.xpm
+share/scribus/icons/DelPoint.png
+share/scribus/icons/DeleteNode.png
+share/scribus/icons/Deletelayer.png
 share/scribus/icons/DragPix.xpm
 share/scribus/icons/Editm.xpm
 share/scribus/icons/Fett.xpm
@@ -259,38 +321,68 @@ share/scribus/icons/Kern.xpm
 share/scribus/icons/Klein.xpm
 share/scribus/icons/Kreise.xpm
 share/scribus/icons/Kreuz.xpm
+share/scribus/icons/Layervisible.xpm
 share/scribus/icons/Lock.xpm
+share/scribus/icons/Lowerlayer.png
 share/scribus/icons/Lupe.xpm
 share/scribus/icons/LupeZ.xpm
-share/scribus/icons/MoveNode.xpm
+share/scribus/icons/MiterJoin.png
+share/scribus/icons/MoveAsym.png
+share/scribus/icons/MoveKontrol.png
+share/scribus/icons/MoveNode.png
+share/scribus/icons/MoveSym.png
+share/scribus/icons/Newlayer.png
+share/scribus/icons/PolyCut.png
+share/scribus/icons/Raiselayer.png
 share/scribus/icons/Rechtecke.xpm
+share/scribus/icons/Reset1Node.png
+share/scribus/icons/ResetNode.png
 share/scribus/icons/Rotieren.xpm
 share/scribus/icons/Rotieren2.xpm
+share/scribus/icons/RoundCap.png
+share/scribus/icons/RoundJoin.png
 share/scribus/icons/Spacing.xpm
+share/scribus/icons/Split.png
+share/scribus/icons/SquareCap.png
 share/scribus/icons/Stift.xpm
+share/scribus/icons/Stiftalt.xpm
 share/scribus/icons/Strike.xpm
 share/scribus/icons/Text.xpm
+share/scribus/icons/Text2.xpm
 share/scribus/icons/Tief.xpm
 share/scribus/icons/Unlock.xpm
 share/scribus/icons/Unter.xpm
 share/scribus/icons/Winkel.xpm
 share/scribus/icons/Zeichen.xpm
 share/scribus/icons/acrobat.png
+share/scribus/icons/beziertool.png
+share/scribus/icons/charset.png
+share/scribus/icons/checkbox.png
+share/scribus/icons/combobox.png
 share/scribus/icons/doc.png
+share/scribus/icons/document2.png
 share/scribus/icons/editcopy.png
 share/scribus/icons/editcut.png
 share/scribus/icons/editdelete.png
 share/scribus/icons/editpaste.png
 share/scribus/icons/exit.png
+share/scribus/icons/goto.png
 share/scribus/icons/image.png
+share/scribus/icons/listbox.png
 share/scribus/icons/pdf.png
 share/scribus/icons/postscript.png
+share/scribus/icons/pushbutton.png
 share/scribus/icons/scribus_logo.jpg
 share/scribus/icons/scribusicon.png
+share/scribus/icons/spline.png
 share/scribus/icons/text_block.png
 share/scribus/icons/text_center.png
 share/scribus/icons/text_left.png
 share/scribus/icons/text_right.png
+share/scribus/icons/textview.png
+share/scribus/icons/trashcan.png
+share/scribus/icons/trashcan2.png
+share/scribus/icons/triangle.png
 share/scribus/icons/txt.png
 share/scribus/iso8859-15.enc
 share/scribus/iso8859-2.enc
@@ -307,10 +399,18 @@ share/scribus/libs/libpostscript.so.0
 share/scribus/libs/libpreferences.la
 share/scribus/libs/libpreferences.so
 share/scribus/libs/libpreferences.so.0
+share/scribus/plugins/charselect.de.qm
+share/scribus/plugins/charselect.sk.qm
 share/scribus/plugins/libcharselect.la
 share/scribus/plugins/libcharselect.so
 share/scribus/plugins/libcharselect.so.0
 share/scribus/profiles/ReadMe
+share/scribus/samples/Demo1.pdf
+share/scribus/samples/Demo1.scd
+share/scribus/samples/Fields.pdf
+share/scribus/samples/Fields.scd
+share/scribus/samples/scribusformsdoc.pdf
+share/scribus/samples/survey.pdf
 share/scribus/scribus.bg.qm
 share/scribus/scribus.ca.qm
 share/scribus/scribus.de.qm
@@ -319,24 +419,28 @@ share/scribus/scribus.fr.qm
 share/scribus/scribus.gl.qm
 share/scribus/scribus.hu.qm
 share/scribus/scribus.it.qm
+share/scribus/scribus.lt.qm
 share/scribus/scribus.sk.qm
+share/scribus/scribus.tr.qm
 share/scribus/scribus.uk.qm
-@dirrm share/scribus/icons
-@dirrm share/scribus/libs
-@dirrm share/scribus/plugins
+@dirrm share/scribus/samples
 @dirrm share/scribus/profiles
+@dirrm share/scribus/plugins
+@dirrm share/scribus/libs
+@dirrm share/scribus/icons
 @dirrm share/scribus
-%%PORTDOCS%%@dirrm share/doc/scribus/en
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/tools
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images/preferences
-%%PORTDOCS%%@dirrm share/doc/scribus/de/images
-%%PORTDOCS%%@dirrm share/doc/scribus/de/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/de
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/tutorial/images
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/tutorial
-%%PORTDOCS%%@dirrm share/doc/scribus/fr/images
-%%PORTDOCS%%@dirrm share/doc/scribus/fr
-%%PORTDOCS%%@dirrm share/doc/scribus
+@dirrm share/doc/scribus/fr/tutorial/images
+@dirrm share/doc/scribus/fr/tutorial
+@dirrm share/doc/scribus/fr/images
+@dirrm share/doc/scribus/fr
+@dirrm share/doc/scribus/en
+@dirrm share/doc/scribus/de/tutorial
+@dirrm share/doc/scribus/de/images/tutorial
+@dirrm share/doc/scribus/de/images/tools
+@dirrm share/doc/scribus/de/images/preferences
+@dirrm share/doc/scribus/de/images
+@dirrm share/doc/scribus/de
+@dirrm share/doc/scribus
 @dirrm include/scribus/libpostscript
+@dirrm include/scribus/libpdf
 @dirrm include/scribus