14 files changed, 146 insertions, 428 deletions

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index d380cfb2a9d3..32fcf257e57e 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,28 +7,31 @@
 #
 
 PORTNAME=		scribus
-PORTVERSION=		0.8
-PORTREVISION=		1
+PORTVERSION=		0.9.1
+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
+#PATCH_SITES=		${MASTER_SITES}
+#PATCHFILES=		
+#PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=		alane@freebsd.org
+MAINTAINER=		freebsd-ports@freebsd.org
 
 RUN_DEPENDS+=		gs:${PORTSDIR}/print/ghostscript-gnu
 
+BROKEN=			"crashes on startup"
+
 USE_QT_VER=		3
 USE_REINPLACE=		yes
 GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/share/scribus/libs \
 		%%PREFIX%%/share/scribus/plugins
 
-BROKEN=	"This program terminates with a SIGBUS or simply hangs"
+QTCFGLIBS+=	-lm
 
 post-patch::
 	${FIND} ${WRKSRC} -type f			\
@@ -42,8 +45,8 @@ post-patch::
 		${WRKSRC}/scribus/Makefile.in
 .endif # defined(NOPORTDOCS)
 
-post-configure::
-	${FIND} ${WRKSRC} -name Makefile	\
-		|${XARGS} -n 1 ${REINPLACE_CMD} -e 's|-O2||g'
+#post-configure::
+#	${FIND} ${WRKSRC} -name Makefile	\
+#		|${XARGS} -n 1 ${REINPLACE_CMD} -e 's|-O2||g'
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index e03c435a2fa3..86a24ee74891 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,3 +1 @@
-MD5 (scribus/scribus-0.8.tar.gz) = 9a5ee8056b27d54ddba64f4c7deecce1
-MD5 (scribus/Fonts.diff) = 418671b40c4b08e6ce65a757c0999753
-MD5 (scribus/Palette.diff) = 34060ad84b63c66cd7a8e223e2c3efd6
+MD5 (scribus/scribus-0.9.1.tar.gz) = 10c4ac8dc30de245200d58977ec3f30f
diff --git a/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in b/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in
new file mode 100644
index 000000000000..a2bc0dab72b4
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libpdf/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libpdf/Makefile.in	Wed Nov 13 17:32:16 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpdf.la
+ 
diff --git a/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in b/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in
new file mode 100644
index 000000000000..b02759ebf776
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libpostscript/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libpostscript/Makefile.in	Wed Nov 13 17:32:03 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpostscript.la
+ 
diff --git a/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in b/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in
new file mode 100644
index 000000000000..547703dc01e3
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libprefs/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libprefs/Makefile.in	Wed Nov 13 17:31:38 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpreferences.la
+ 
diff --git a/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in b/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in
new file mode 100644
index 000000000000..3dab0f97e1c7
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/plugins/libchar/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/plugins/libchar/Makefile.in	Wed Nov 13 17:31:52 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/plugins
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libcharselect.la
+ 
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index 74b187d71642..fabe8e1cb1d6 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -9,6 +9,8 @@ include/scribus/fpointarray.h
 include/scribus/frameedit.h
 include/scribus/helpbrowser.h
 include/scribus/hruler.h
+include/scribus/hyphen.h
+include/scribus/hyphenator.h
 include/scribus/layers.h
 include/scribus/libpdf/pdflib.h
 include/scribus/libpostscript/pslib.h
@@ -17,6 +19,7 @@ include/scribus/linkbutton.h
 include/scribus/modify.h
 include/scribus/mpalette.h
 include/scribus/mspinbox.h
+include/scribus/muster.h
 include/scribus/page.h
 include/scribus/pageitem.h
 include/scribus/query.h
@@ -26,95 +29,12 @@ include/scribus/scrap.h
 include/scribus/scribus.h
 include/scribus/scribusdoc.h
 include/scribus/scribusview.h
+include/scribus/scribuswin.h
 include/scribus/seiten.h
 include/scribus/spalette.h
 include/scribus/tree.h
 include/scribus/vruler.h
 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
@@ -130,6 +50,10 @@ 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/hyphen1.png
+share/doc/scribus/en/hyphen2.png
+share/doc/scribus/en/hyphen3.png
+share/doc/scribus/en/hyphenator.html
 share/doc/scribus/en/index-1.html
 share/doc/scribus/en/index-2.html
 share/doc/scribus/en/index-3.html
@@ -171,121 +95,20 @@ 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.css
 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/dicts/hyph_de.dic
+share/scribus/dicts/hyph_en.dic
+share/scribus/dicts/hyph_es.dic
+share/scribus/dicts/hyph_fr.dic
+share/scribus/dicts/hyph_it.dic
 share/scribus/icons/AddNode.png
 share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.xpm
@@ -428,18 +251,9 @@ share/scribus/scribus.uk.qm
 @dirrm share/scribus/plugins
 @dirrm share/scribus/libs
 @dirrm share/scribus/icons
+@dirrm share/scribus/dicts
 @dirrm share/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
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index d380cfb2a9d3..32fcf257e57e 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -7,28 +7,31 @@
 #
 
 PORTNAME=		scribus
-PORTVERSION=		0.8
-PORTREVISION=		1
+PORTVERSION=		0.9.1
+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
+#PATCH_SITES=		${MASTER_SITES}
+#PATCHFILES=		
+#PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=		alane@freebsd.org
+MAINTAINER=		freebsd-ports@freebsd.org
 
 RUN_DEPENDS+=		gs:${PORTSDIR}/print/ghostscript-gnu
 
+BROKEN=			"crashes on startup"
+
 USE_QT_VER=		3
 USE_REINPLACE=		yes
 GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/share/scribus/libs \
 		%%PREFIX%%/share/scribus/plugins
 
-BROKEN=	"This program terminates with a SIGBUS or simply hangs"
+QTCFGLIBS+=	-lm
 
 post-patch::
 	${FIND} ${WRKSRC} -type f			\
@@ -42,8 +45,8 @@ post-patch::
 		${WRKSRC}/scribus/Makefile.in
 .endif # defined(NOPORTDOCS)
 
-post-configure::
-	${FIND} ${WRKSRC} -name Makefile	\
-		|${XARGS} -n 1 ${REINPLACE_CMD} -e 's|-O2||g'
+#post-configure::
+#	${FIND} ${WRKSRC} -name Makefile	\
+#		|${XARGS} -n 1 ${REINPLACE_CMD} -e 's|-O2||g'
 
 .include <bsd.port.mk>
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index e03c435a2fa3..86a24ee74891 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,3 +1 @@
-MD5 (scribus/scribus-0.8.tar.gz) = 9a5ee8056b27d54ddba64f4c7deecce1
-MD5 (scribus/Fonts.diff) = 418671b40c4b08e6ce65a757c0999753
-MD5 (scribus/Palette.diff) = 34060ad84b63c66cd7a8e223e2c3efd6
+MD5 (scribus/scribus-0.9.1.tar.gz) = 10c4ac8dc30de245200d58977ec3f30f
diff --git a/print/scribus/files/patch-scribus-libpdf-Makefile.in b/print/scribus/files/patch-scribus-libpdf-Makefile.in
new file mode 100644
index 000000000000..a2bc0dab72b4
--- /dev/null
+++ b/print/scribus/files/patch-scribus-libpdf-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libpdf/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libpdf/Makefile.in	Wed Nov 13 17:32:16 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpdf.la
+ 
diff --git a/print/scribus/files/patch-scribus-libpostscript-Makefile.in b/print/scribus/files/patch-scribus-libpostscript-Makefile.in
new file mode 100644
index 000000000000..b02759ebf776
--- /dev/null
+++ b/print/scribus/files/patch-scribus-libpostscript-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libpostscript/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libpostscript/Makefile.in	Wed Nov 13 17:32:03 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpostscript.la
+ 
diff --git a/print/scribus/files/patch-scribus-libprefs-Makefile.in b/print/scribus/files/patch-scribus-libprefs-Makefile.in
new file mode 100644
index 000000000000..547703dc01e3
--- /dev/null
+++ b/print/scribus/files/patch-scribus-libprefs-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/libprefs/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/libprefs/Makefile.in	Wed Nov 13 17:31:38 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/libs
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libpreferences.la
+ 
diff --git a/print/scribus/files/patch-scribus-plugins-libchar-Makefile.in b/print/scribus/files/patch-scribus-plugins-libchar-Makefile.in
new file mode 100644
index 000000000000..3dab0f97e1c7
--- /dev/null
+++ b/print/scribus/files/patch-scribus-plugins-libchar-Makefile.in
@@ -0,0 +1,11 @@
+--- scribus/plugins/libchar/Makefile.in.orig	Sun Nov 10 06:26:45 2002
++++ scribus/plugins/libchar/Makefile.in	Wed Nov 13 17:31:52 2002
+@@ -226,7 +226,7 @@
+ x_libraries = @x_libraries@
+ 
+ libdir = $(prefix)/share/scribus/plugins
+-CPPFLAGS = -I$(top_builddir)/scribus
++CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ lib_LTLIBRARIES = libcharselect.la
+ 
diff --git a/print/scribus/pkg-plist b/print/scribus/pkg-plist
index 74b187d71642..fabe8e1cb1d6 100644
--- a/print/scribus/pkg-plist
+++ b/print/scribus/pkg-plist
@@ -9,6 +9,8 @@ include/scribus/fpointarray.h
 include/scribus/frameedit.h
 include/scribus/helpbrowser.h
 include/scribus/hruler.h
+include/scribus/hyphen.h
+include/scribus/hyphenator.h
 include/scribus/layers.h
 include/scribus/libpdf/pdflib.h
 include/scribus/libpostscript/pslib.h
@@ -17,6 +19,7 @@ include/scribus/linkbutton.h
 include/scribus/modify.h
 include/scribus/mpalette.h
 include/scribus/mspinbox.h
+include/scribus/muster.h
 include/scribus/page.h
 include/scribus/pageitem.h
 include/scribus/query.h
@@ -26,95 +29,12 @@ include/scribus/scrap.h
 include/scribus/scribus.h
 include/scribus/scribusdoc.h
 include/scribus/scribusview.h
+include/scribus/scribuswin.h
 include/scribus/seiten.h
 include/scribus/spalette.h
 include/scribus/tree.h
 include/scribus/vruler.h
 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
@@ -130,6 +50,10 @@ 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/hyphen1.png
+share/doc/scribus/en/hyphen2.png
+share/doc/scribus/en/hyphen3.png
+share/doc/scribus/en/hyphenator.html
 share/doc/scribus/en/index-1.html
 share/doc/scribus/en/index-2.html
 share/doc/scribus/en/index-3.html
@@ -171,121 +95,20 @@ 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.css
 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/dicts/hyph_de.dic
+share/scribus/dicts/hyph_en.dic
+share/scribus/dicts/hyph_es.dic
+share/scribus/dicts/hyph_fr.dic
+share/scribus/dicts/hyph_it.dic
 share/scribus/icons/AddNode.png
 share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.xpm
@@ -428,18 +251,9 @@ share/scribus/scribus.uk.qm
 @dirrm share/scribus/plugins
 @dirrm share/scribus/libs
 @dirrm share/scribus/icons
+@dirrm share/scribus/dicts
 @dirrm share/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