Upgrade to 1.1.1. Some of the changes include: uses freetype

instead of Qt for fonts; multiple documents open at a time;
hyphenator; more languages support; UniCode support; gradient fills;
extended PDF exporter; CUPS support; and libart used for rendering.

Also add more MASTER_SITES and use SHLIBTOOL_OVERRIDE.

5 files changed, 264 insertions, 428 deletions

diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 2b763e9e00f..78e3638dbf3 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2003/08/05 13:40:11 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2003/10/29 20:54:51 reed Exp $
 
-DISTNAME=	scribus-0.7.5
-PKGREVISION=	3
+DISTNAME=	scribus-1.1.1
 CATEGORIES=	print
-MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/
+MASTER_SITES=	http://ftp.kde.com/Office/Text_Word_Processing/Scribus/ \
+		http://web2.altmuehlnet.de/fschmid/ \
+		http://scribus.planetmirror.com/ \
+		ftp://ftp.ntua.gr/pub/gnu/scribus/ \
+		http://scribus.ipc.one.pl/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://web2.altmuehlnet.de/fschmid/
@@ -14,6 +17,9 @@ USE_X11=		# defined
 USE_GMAKE=		# defined
 PTHREAD_OPTS+=		require
 
+USE_LIBTOOL=		YES
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=        --with-qt-dir=${QTDIR} \
 			--with-extra-libs=${LOCALBASE}/lib \
@@ -21,6 +27,7 @@ CONFIGURE_ARGS+=        --with-qt-dir=${QTDIR} \
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/libart2/buildlink2.mk"
 .include "../../x11/qt3-libs/buildlink2.mk"
 .include "../../x11/qt3-tools/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/print/scribus/PLIST b/print/scribus/PLIST
index 8a75623549d..617aeabf7a4 100644
--- a/print/scribus/PLIST
+++ b/print/scribus/PLIST
@@ -1,398 +1,247 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/09 21:32:51 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/10/29 20:54:51 reed Exp $
 bin/scribus
+include/scribus/bookmwin.h
+include/scribus/bookpalette.h
 include/scribus/cmykcolor.h
 include/scribus/colorm.h
 include/scribus/cpalette.h
+include/scribus/customfdialog.h
+include/scribus/fontcombo.h
+include/scribus/fpoint.h
+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
 include/scribus/linecombo.h
 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
 include/scribus/scfonts.h
-include/scribus/scfonts_encoding.h
+include/scribus/scpainter.h
 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/splash.h
 include/scribus/tree.h
+include/scribus/vgradient.h
 include/scribus/vruler.h
-share/scribus/ISOenc.txt
-share/scribus/Stdenc.txt
-share/scribus/TTFenc.txt
-share/scribus/doc/de/chapter11.html
-share/scribus/doc/de/chapter12.html
-share/scribus/doc/de/chapter13.html
-share/scribus/doc/de/chapter14.html
-share/scribus/doc/de/chapter21.html
-share/scribus/doc/de/chapter22.html
-share/scribus/doc/de/chapter23.html
-share/scribus/doc/de/chapter24.html
-share/scribus/doc/de/chapter25.html
-share/scribus/doc/de/chapter31.html
-share/scribus/doc/de/chapter32.html
-share/scribus/doc/de/chapter33.html
-share/scribus/doc/de/chapter34.html
-share/scribus/doc/de/chapter41.html
-share/scribus/doc/de/chapter412.html
-share/scribus/doc/de/chapter42.html
-share/scribus/doc/de/chapter43.html
-share/scribus/doc/de/chapter51.html
-share/scribus/doc/de/chapter52.html
-share/scribus/doc/de/images/1.png
-share/scribus/doc/de/images/color_edit.png
-share/scribus/doc/de/images/colors.png
-share/scribus/doc/de/images/colors_contur.png
-share/scribus/doc/de/images/colors_fill.png
-share/scribus/doc/de/images/colors_shade.png
-share/scribus/doc/de/images/d_n_d_1.png
-share/scribus/doc/de/images/d_n_d_2.png
-share/scribus/doc/de/images/doc_setup.png
-share/scribus/doc/de/images/edit_frame.png
-share/scribus/doc/de/images/edit_pictureframe.png
-share/scribus/doc/de/images/measurement_frame.png
-share/scribus/doc/de/images/measurement_image.png
-share/scribus/doc/de/images/measurement_polygon.png
-share/scribus/doc/de/images/measurement_text.png
-share/scribus/doc/de/images/modify_textframe.png
-share/scribus/doc/de/images/new_doc.png
-share/scribus/doc/de/images/outline.png
-share/scribus/doc/de/images/preferences/general.png
-share/scribus/doc/de/images/preferences/guides.png
-share/scribus/doc/de/images/preferences/tool_picture.png
-share/scribus/doc/de/images/preferences/tools.png
-share/scribus/doc/de/images/preferences/tools_lines.png
-share/scribus/doc/de/images/preferences/tools_oval.png
-share/scribus/doc/de/images/preferences/tools_rectangular.png
-share/scribus/doc/de/images/preferences/tools_text.png
-share/scribus/doc/de/images/preferences/tools_zoom.png
-share/scribus/doc/de/images/preferences/typographics.png
-share/scribus/doc/de/images/print.png
-share/scribus/doc/de/images/save_as_pdf_compression.png
-share/scribus/doc/de/images/save_as_pdf_general.png
-share/scribus/doc/de/images/scrapbook.png
-share/scribus/doc/de/images/scribus_logo.jpg
-share/scribus/doc/de/images/snap_not_to_guides.png
-share/scribus/doc/de/images/snap_to_guides.png
-share/scribus/doc/de/images/style1.png
-share/scribus/doc/de/images/style2.png
-share/scribus/doc/de/images/style3.png
-share/scribus/doc/de/images/style4.png
-share/scribus/doc/de/images/text_too_long.png
-share/scribus/doc/de/images/tools/chain_textframes.png
-share/scribus/doc/de/images/tools/edit.png
-share/scribus/doc/de/images/tools/imageframe.png
-share/scribus/doc/de/images/tools/lines.png
-share/scribus/doc/de/images/tools/move.png
-share/scribus/doc/de/images/tools/oval.png
-share/scribus/doc/de/images/tools/rectangular.png
-share/scribus/doc/de/images/tools/rotate.png
-share/scribus/doc/de/images/tools/textframe.png
-share/scribus/doc/de/images/tools/unchain_textframes.png
-share/scribus/doc/de/images/tools/zoom.png
-share/scribus/doc/de/images/tutorial/kafka1.png
-share/scribus/doc/de/images/tutorial/kafka_transparent.jpg
-share/scribus/doc/de/images/tutorial/new_file.png
-share/scribus/doc/de/images/tutorial/rotate.png
-share/scribus/doc/de/images/tutorial/texte1.png
-share/scribus/doc/de/images/tutorial/yellow_rect.png
-share/scribus/doc/de/images/zoom.png
-share/scribus/doc/de/index.html
-share/scribus/doc/de/tutorial/book_cover.doc
-share/scribus/doc/de/tutorial/book_cover.pdf
-share/scribus/doc/de/tutorial/kafka.jpg
-share/scribus/doc/de/tutorial/kafka.txt
-share/scribus/doc/de/tutorial/kafka_transparent.jpg
-share/scribus/doc/de/tutorial/sign.gif
-share/scribus/doc/en/colormgmtscreen.png
-share/scribus/doc/en/index-1.html
-share/scribus/doc/en/index-2.html
-share/scribus/doc/en/index-3.html
-share/scribus/doc/en/index-4.html
-share/scribus/doc/en/index.html
-share/scribus/doc/en/modify1.png
-share/scribus/doc/en/Polypref.png
-share/scribus/doc/en/changelog.html
-share/scribus/doc/en/cms.html
-share/scribus/doc/en/corel1.png
-share/scribus/doc/en/corel1a.png
-share/scribus/doc/en/corel2b.png
-share/scribus/doc/en/corelphoto.html
-share/scribus/doc/en/index-9.html
-share/scribus/doc/en/layers1.png
-share/scribus/doc/en/modifyimage.png
-share/scribus/doc/en/modifytext.png
-share/scribus/doc/en/optimizelinuxdtp.html
-share/scribus/doc/en/pdf1.png
-share/scribus/doc/en/pdf5.png
-share/scribus/doc/en/pdfexport.html
-share/scribus/doc/en/polypref.png
-share/scribus/doc/en/preferences.html
-share/scribus/doc/en/prefs1.png
-share/scribus/doc/en/prefs2.png
-share/scribus/doc/en/prefs3.png
-share/scribus/doc/en/sclinks.html
-share/scribus/doc/en/scribus_head.png
-share/scribus/doc/en/scribusnib.png
-share/scribus/doc/en/toolshide.png
-share/scribus/doc/en/valid-html401.png
-share/scribus/doc/en/vcss.png
-share/scribus/doc/fr/images/couleur.png
-share/scribus/doc/fr/images/deplac_pg.png
-share/scribus/doc/fr/images/dupli.png
-share/scribus/doc/fr/images/ed_couleur.png
-share/scribus/doc/fr/images/ed_new_couleur.png
-share/scribus/doc/fr/images/fh.gif
-share/scribus/doc/fr/images/inser_page.png
-share/scribus/doc/fr/images/logo_scribus.jpg
-share/scribus/doc/fr/images/modif_filet.png
-share/scribus/doc/fr/images/modif_img.png
-share/scribus/doc/fr/images/modif_nodes.png
-share/scribus/doc/fr/images/modif_txt.png
-share/scribus/doc/fr/images/nav.png
-share/scribus/doc/fr/images/new.png
-share/scribus/doc/fr/images/outils.png
-share/scribus/doc/fr/images/outils_h.png
-share/scribus/doc/fr/images/print.png
-share/scribus/doc/fr/images/prop_doc.png
-share/scribus/doc/fr/images/select_g-fonts.png
-share/scribus/doc/fr/images/spec_01.png
-share/scribus/doc/fr/images/spec_02.png
-share/scribus/doc/fr/images/spec_03.png
-share/scribus/doc/fr/images/styles.png
-share/scribus/doc/fr/images/svgd_pdf.png
-share/scribus/doc/fr/images/zoom.png
-share/scribus/doc/fr/index.html
-share/scribus/doc/fr/page10.html
-share/scribus/doc/fr/page11.html
-share/scribus/doc/fr/page12.html
-share/scribus/doc/fr/page13.html
-share/scribus/doc/fr/page2.html
-share/scribus/doc/fr/page3.html
-share/scribus/doc/fr/page4.html
-share/scribus/doc/fr/page5.html
-share/scribus/doc/fr/page6.html
-share/scribus/doc/fr/page7.html
-share/scribus/doc/fr/page8.html
-share/scribus/doc/fr/page9.html
-share/scribus/doc/fr/tutorial/images/4eme.png
-share/scribus/doc/fr/tutorial/images/4eme_01.png
-share/scribus/doc/fr/tutorial/images/90.png
-share/scribus/doc/fr/tutorial/images/90d.png
-share/scribus/doc/fr/tutorial/images/album.png
-share/scribus/doc/fr/tutorial/images/bloc_carre.png
-share/scribus/doc/fr/tutorial/images/bloc_circ.png
-share/scribus/doc/fr/tutorial/images/bloc_img.png
-share/scribus/doc/fr/tutorial/images/bloc_txt.png
-share/scribus/doc/fr/tutorial/images/capt_01.png
-share/scribus/doc/fr/tutorial/images/capt_02.png
-share/scribus/doc/fr/tutorial/images/capt_03.png
-share/scribus/doc/fr/tutorial/images/capt_04.png
-share/scribus/doc/fr/tutorial/images/capt_05.png
-share/scribus/doc/fr/tutorial/images/capt_06.png
-share/scribus/doc/fr/tutorial/images/capt_07.png
-share/scribus/doc/fr/tutorial/images/capt_08.png
-share/scribus/doc/fr/tutorial/images/carre-texte.png
-share/scribus/doc/fr/tutorial/images/chaine.png
-share/scribus/doc/fr/tutorial/images/couleur_01.png
-share/scribus/doc/fr/tutorial/images/couv.png
-share/scribus/doc/fr/tutorial/images/croix.png
-share/scribus/doc/fr/tutorial/images/dupli_deplac.png
-share/scribus/doc/fr/tutorial/images/esp_align.png
-share/scribus/doc/fr/tutorial/images/esp_align_01.png
-share/scribus/doc/fr/tutorial/images/esp_align_02.png
-share/scribus/doc/fr/tutorial/images/fh.gif
-share/scribus/doc/fr/tutorial/images/fl.gif
-share/scribus/doc/fr/tutorial/images/fl_v.gif
-share/scribus/doc/fr/tutorial/images/gnu_100.png
-share/scribus/doc/fr/tutorial/images/gnu_55.png
-share/scribus/doc/fr/tutorial/images/habill_01.png
-share/scribus/doc/fr/tutorial/images/habill_02.png
-share/scribus/doc/fr/tutorial/images/habill_03.png
-share/scribus/doc/fr/tutorial/images/habill_04.png
-share/scribus/doc/fr/tutorial/images/habill_05.png
-share/scribus/doc/fr/tutorial/images/habill_06.png
-share/scribus/doc/fr/tutorial/images/habill_07.png
-share/scribus/doc/fr/tutorial/images/habill_08.png
-share/scribus/doc/fr/tutorial/images/inserer.png
-share/scribus/doc/fr/tutorial/images/jaune_or.png
-share/scribus/doc/fr/tutorial/images/jaune_s.png
-share/scribus/doc/fr/tutorial/images/logo_scribus.jpg
-share/scribus/doc/fr/tutorial/images/main.png
-share/scribus/doc/fr/tutorial/images/maqu_01.png
-share/scribus/doc/fr/tutorial/images/maqu_02.png
-share/scribus/doc/fr/tutorial/images/maqu_03.png
-share/scribus/doc/fr/tutorial/images/maqu_04.png
-share/scribus/doc/fr/tutorial/images/pages_choix.png
-share/scribus/doc/fr/tutorial/images/plan.png
-share/scribus/doc/fr/tutorial/images/plan_01.png
-share/scribus/doc/fr/tutorial/images/rotation.png
-share/scribus/doc/fr/tutorial/images/s_01.png
-share/scribus/doc/fr/tutorial/images/s_02.png
-share/scribus/doc/fr/tutorial/images/s_03.png
-share/scribus/doc/fr/tutorial/images/s_04.png
-share/scribus/doc/fr/tutorial/images/spec_bloc_01.png
-share/scribus/doc/fr/tutorial/images/spec_cribus.png
-share/scribus/doc/fr/tutorial/images/spec_gnu_100.png
-share/scribus/doc/fr/tutorial/images/spec_gnu_55.png
-share/scribus/doc/fr/tutorial/images/spec_gnu_55_chaine.png
-share/scribus/doc/fr/tutorial/images/spec_s.png
-share/scribus/doc/fr/tutorial/images/styles-02.png
-share/scribus/doc/fr/tutorial/images/styles.png
-share/scribus/doc/fr/tutorial/images/trait.png
-share/scribus/doc/fr/tutorial/index.html
-share/scribus/doc/fr/tutorial/page1.html
-share/scribus/doc/fr/tutorial/page2.html
-share/scribus/doc/fr/tutorial/page3.html
-share/scribus/icons/AddPoint.png
-share/scribus/icons/BezierClose.png
-share/scribus/icons/DelPoint.png
-share/scribus/icons/Deletelayer.png
-share/scribus/icons/Layervisible.xpm
-share/scribus/icons/Lowerlayer.png
-share/scribus/icons/Newlayer.png
-share/scribus/icons/PolyCut.png
-share/scribus/icons/Raiselayer.png
-share/scribus/icons/Reset1Node.png
-share/scribus/icons/ResetNode.png
-share/scribus/icons/RoundCap.png
-share/scribus/icons/Split.png
-share/scribus/icons/AddNode.png
-share/scribus/icons/AppIcon.xpm
-share/scribus/icons/BevelJoin.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
-share/scribus/icons/DateiNeu.xpm
-share/scribus/icons/DateiNeu16.png
-share/scribus/icons/DateiOpen.xpm
-share/scribus/icons/DateiOpen16.png
-share/scribus/icons/DateiPrint.xpm
-share/scribus/icons/DateiPrint16.png
-share/scribus/icons/DateiSave.xpm
-share/scribus/icons/DateiSave16.png
-share/scribus/icons/DeleteNode.png
-share/scribus/icons/DragPix.xpm
-share/scribus/icons/Editm.xpm
-share/scribus/icons/Fett.xpm
-share/scribus/icons/FlipH.xpm
-share/scribus/icons/FlipV.xpm
-share/scribus/icons/Gross.xpm
-share/scribus/icons/HandC.xpm
-share/scribus/icons/Hoch.xpm
-share/scribus/icons/Italic.xpm
-share/scribus/icons/Kapital.xpm
-share/scribus/icons/Kern.xpm
-share/scribus/icons/Klein.xpm
-share/scribus/icons/Kreise.xpm
-share/scribus/icons/Kreuz.xpm
-share/scribus/icons/Lock.xpm
-share/scribus/icons/Lupe.xpm
-share/scribus/icons/LupeZ.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/Rechtecke.xpm
-share/scribus/icons/Rotieren.xpm
-share/scribus/icons/Rotieren2.xpm
-share/scribus/icons/RoundJoin.png
-share/scribus/icons/Spacing.xpm
-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/doc.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/image.png
-share/scribus/icons/pdf.png
-share/scribus/icons/postscript.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/triangle.png
-share/scribus/icons/txt.png
-share/scribus/iso8859-15.enc
-share/scribus/iso8859-2.enc
-share/scribus/iso8859-2ps.enc
-share/scribus/libs/libabout.la
-share/scribus/libs/libabout.so
-share/scribus/libs/libabout.so.0
-share/scribus/libs/libabout.so.0.0
-share/scribus/libs/libpdf.la
-share/scribus/libs/libpdf.so
-share/scribus/libs/libpdf.so.0
-share/scribus/libs/libpdf.so.0.0
-share/scribus/libs/libpostscript.la
-share/scribus/libs/libpostscript.so
-share/scribus/libs/libpostscript.so.0
-share/scribus/libs/libpostscript.so.0.0
-share/scribus/libs/libpreferences.la
-share/scribus/libs/libpreferences.so
-share/scribus/libs/libpreferences.so.0
-share/scribus/libs/libpreferences.so.0.0
-share/scribus/plugins/libcharselect.la
-share/scribus/plugins/libcharselect.so
-share/scribus/plugins/libcharselect.so.0
-share/scribus/plugins/libcharselect.so.0.0
-share/scribus/profiles/ReadMe
-share/scribus/scribus.bg.qm
-share/scribus/scribus.ca.qm
-share/scribus/scribus.de.qm
-share/scribus/scribus.es.qm
-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.uk.qm
-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
-@dirrm share/scribus/samples
-@dirrm share/scribus/profiles
-@dirrm share/scribus/plugins
-@dirrm share/scribus/libs
-@dirrm share/scribus/icons
-@dirrm share/scribus/doc/fr/tutorial/images
-@dirrm share/scribus/doc/fr/tutorial
-@dirrm share/scribus/doc/fr/images
-@dirrm share/scribus/doc/fr
-@dirrm share/scribus/doc/en
-@dirrm share/scribus/doc/de/tutorial
-@dirrm share/scribus/doc/de/images/tutorial
-@dirrm share/scribus/doc/de/images/tools
-@dirrm share/scribus/doc/de/images/preferences
-@dirrm share/scribus/doc/de/images
-@dirrm share/scribus/doc/de
-@dirrm share/scribus/doc
-@dirrm share/scribus
+include/scribus/werktoolb.h
+lib/scribus/dicts/hyph_ca.dic
+lib/scribus/dicts/hyph_cs.dic
+lib/scribus/dicts/hyph_da.dic
+lib/scribus/dicts/hyph_de.dic
+lib/scribus/dicts/hyph_el.dic
+lib/scribus/dicts/hyph_en.dic
+lib/scribus/dicts/hyph_es.dic
+lib/scribus/dicts/hyph_fr.dic
+lib/scribus/dicts/hyph_hu.dic
+lib/scribus/dicts/hyph_it.dic
+lib/scribus/dicts/hyph_nl.dic
+lib/scribus/dicts/hyph_pl.dic
+lib/scribus/dicts/hyph_pt.dic
+lib/scribus/dicts/hyph_ru.dic
+lib/scribus/dicts/hyph_sk.dic
+lib/scribus/dicts/hyph_uk.dic
+lib/scribus/icons/AddNode.png
+lib/scribus/icons/AddPoint.png
+lib/scribus/icons/AppIcon.xpm
+lib/scribus/icons/BevelJoin.png
+lib/scribus/icons/BezierClose.png
+lib/scribus/icons/Bild.xpm
+lib/scribus/icons/ButtCap.png
+lib/scribus/icons/Corner.xpm
+lib/scribus/icons/DateiClos.xpm
+lib/scribus/icons/DateiClos16.png
+lib/scribus/icons/DateiNeu.xpm
+lib/scribus/icons/DateiNeu16.png
+lib/scribus/icons/DateiOpen.xpm
+lib/scribus/icons/DateiOpen16.png
+lib/scribus/icons/DateiPrint.xpm
+lib/scribus/icons/DateiPrint16.png
+lib/scribus/icons/DateiSave.xpm
+lib/scribus/icons/DateiSave16.png
+lib/scribus/icons/DelPoint.png
+lib/scribus/icons/DeleteNode.png
+lib/scribus/icons/Deletelayer.png
+lib/scribus/icons/DragPix.xpm
+lib/scribus/icons/Editm.xpm
+lib/scribus/icons/FlipH.xpm
+lib/scribus/icons/FlipV.xpm
+lib/scribus/icons/Gross.xpm
+lib/scribus/icons/HandC.xpm
+lib/scribus/icons/Hoch.xpm
+lib/scribus/icons/Kapital.xpm
+lib/scribus/icons/Kern.xpm
+lib/scribus/icons/Klein.xpm
+lib/scribus/icons/Kreise.xpm
+lib/scribus/icons/Kreuz.xpm
+lib/scribus/icons/Layervisible.xpm
+lib/scribus/icons/Lock.xpm
+lib/scribus/icons/Lowerlayer.png
+lib/scribus/icons/Lupe.xpm
+lib/scribus/icons/LupeZ.xpm
+lib/scribus/icons/MiterJoin.png
+lib/scribus/icons/MoveAsym.png
+lib/scribus/icons/MoveKontrol.png
+lib/scribus/icons/MoveNode.png
+lib/scribus/icons/MoveSym.png
+lib/scribus/icons/Newlayer.png
+lib/scribus/icons/NoPrint.png
+lib/scribus/icons/PolyCut.png
+lib/scribus/icons/Raiselayer.png
+lib/scribus/icons/Rechtecke.xpm
+lib/scribus/icons/Reset1Node.png
+lib/scribus/icons/ResetNode.png
+lib/scribus/icons/Revers.png
+lib/scribus/icons/Rotieren.xpm
+lib/scribus/icons/Rotieren2.xpm
+lib/scribus/icons/RoundCap.png
+lib/scribus/icons/RoundJoin.png
+lib/scribus/icons/Spacing.xpm
+lib/scribus/icons/Splash.png
+lib/scribus/icons/Split.png
+lib/scribus/icons/SquareCap.png
+lib/scribus/icons/Stift.xpm
+lib/scribus/icons/Stiftalt.xpm
+lib/scribus/icons/Strike.xpm
+lib/scribus/icons/Text.xpm
+lib/scribus/icons/Text2.xpm
+lib/scribus/icons/Tief.xpm
+lib/scribus/icons/Unlock.xpm
+lib/scribus/icons/Unter.xpm
+lib/scribus/icons/Winkel.xpm
+lib/scribus/icons/Zeichen.xpm
+lib/scribus/icons/acrobat.png
+lib/scribus/icons/back.png
+lib/scribus/icons/beziertool.png
+lib/scribus/icons/bottom.png
+lib/scribus/icons/charset.png
+lib/scribus/icons/checkbox.png
+lib/scribus/icons/combobox.png
+lib/scribus/icons/doc.png
+lib/scribus/icons/document2.png
+lib/scribus/icons/down.png
+lib/scribus/icons/editcopy.png
+lib/scribus/icons/editcut.png
+lib/scribus/icons/editdelete.png
+lib/scribus/icons/editpaste.png
+lib/scribus/icons/exit.png
+lib/scribus/icons/fill.png
+lib/scribus/icons/finish.png
+lib/scribus/icons/forward.png
+lib/scribus/icons/gohome.png
+lib/scribus/icons/goto.png
+lib/scribus/icons/hmirror.png
+lib/scribus/icons/image.png
+lib/scribus/icons/irreg.png
+lib/scribus/icons/listbox.png
+lib/scribus/icons/locked.png
+lib/scribus/icons/ok.png
+lib/scribus/icons/outlined.png
+lib/scribus/icons/oval.png
+lib/scribus/icons/pdf.png
+lib/scribus/icons/penciladd.png
+lib/scribus/icons/pencilsub.png
+lib/scribus/icons/postscript.png
+lib/scribus/icons/pushbutton.png
+lib/scribus/icons/rect.png
+lib/scribus/icons/scribus_logo.jpg
+lib/scribus/icons/scribusicon.png
+lib/scribus/icons/shear_down.png
+lib/scribus/icons/shear_left.png
+lib/scribus/icons/shear_right.png
+lib/scribus/icons/shear_up.png
+lib/scribus/icons/spline.png
+lib/scribus/icons/start.png
+lib/scribus/icons/text_block.png
+lib/scribus/icons/text_center.png
+lib/scribus/icons/text_force.png
+lib/scribus/icons/text_left.png
+lib/scribus/icons/text_right.png
+lib/scribus/icons/textview.png
+lib/scribus/icons/top.png
+lib/scribus/icons/trashcan.png
+lib/scribus/icons/trashcan2.png
+lib/scribus/icons/triangle.png
+lib/scribus/icons/txt.png
+lib/scribus/icons/unlock.png
+lib/scribus/icons/up.png
+lib/scribus/icons/vmirror.png
+lib/scribus/libs/libabout.la
+lib/scribus/libs/libabout.so
+lib/scribus/libs/libabout.so.0
+lib/scribus/libs/libabout.so.0.0
+lib/scribus/libs/libpdf.la
+lib/scribus/libs/libpdf.so
+lib/scribus/libs/libpdf.so.0
+lib/scribus/libs/libpdf.so.0.0
+lib/scribus/libs/libpostscript.la
+lib/scribus/libs/libpostscript.so
+lib/scribus/libs/libpostscript.so.0
+lib/scribus/libs/libpostscript.so.0.0
+lib/scribus/libs/libpreferences.la
+lib/scribus/libs/libpreferences.so
+lib/scribus/libs/libpreferences.so.0
+lib/scribus/libs/libpreferences.so.0.0
+lib/scribus/plugins/charselect.da.qm
+lib/scribus/plugins/charselect.no.qm
+lib/scribus/plugins/charselect.sk.qm
+lib/scribus/plugins/libcharselect.la
+lib/scribus/plugins/libcharselect.so
+lib/scribus/plugins/libcharselect.so.0
+lib/scribus/plugins/libcharselect.so.0.0
+lib/scribus/plugins/libpreview.la
+lib/scribus/plugins/libpreview.so
+lib/scribus/plugins/libpreview.so.0
+lib/scribus/plugins/libpreview.so.0.0
+lib/scribus/plugins/libsvgexplugin.la
+lib/scribus/plugins/libsvgexplugin.so
+lib/scribus/plugins/libsvgexplugin.so.0
+lib/scribus/plugins/libsvgexplugin.so.0.0
+lib/scribus/plugins/libsvgimplugin.la
+lib/scribus/plugins/libsvgimplugin.so
+lib/scribus/plugins/libsvgimplugin.so.0
+lib/scribus/plugins/libsvgimplugin.so.0.0
+lib/scribus/plugins/svgexport.sk.qm
+lib/scribus/profiles/ReadMe
+lib/scribus/scribus.bg.qm
+lib/scribus/scribus.cs.qm
+lib/scribus/scribus.cy.qm
+lib/scribus/scribus.da.qm
+lib/scribus/scribus.de.qm
+lib/scribus/scribus.en_GB.qm
+lib/scribus/scribus.es.qm
+lib/scribus/scribus.fr.qm
+lib/scribus/scribus.gl.qm
+lib/scribus/scribus.hu.qm
+lib/scribus/scribus.id.qm
+lib/scribus/scribus.it.qm
+lib/scribus/scribus.nl.qm
+lib/scribus/scribus.no.qm
+lib/scribus/scribus.pl.qm
+lib/scribus/scribus.ru.qm
+lib/scribus/scribus.sk.qm
+lib/scribus/scribus.tr.qm
+lib/scribus/scribus.uk.qm
+@dirrm lib/scribus/profiles
+@dirrm lib/scribus/plugins
+@dirrm lib/scribus/libs
+@dirrm lib/scribus/icons
+@dirrm lib/scribus/dicts
+@dirrm lib/scribus
 @dirrm include/scribus/libpostscript
+@dirrm include/scribus/libpdf
 @dirrm include/scribus
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index acdc06211e9..585ed5c27c7 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/09 21:32:51 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/10/29 20:54:51 reed Exp $
 
-SHA1 (scribus-0.7.5.tar.gz) = c65c733b65d78b542d3120aa17384d2bc9fc730e
-Size (scribus-0.7.5.tar.gz) = 2176536 bytes
-SHA1 (patch-aa) = b06725d07d0c491269fc5013a5564421845175ad
+SHA1 (scribus-1.1.1.tar.gz) = 640e1007fd0b16c1b4f797910d8628b2be0923a2
+Size (scribus-1.1.1.tar.gz) = 2053257 bytes
+SHA1 (patch-aa) = 74c57344608436ab449f042016495d6895c80f76
+SHA1 (patch-ab) = d2430e5b81c2ff00390f8135a753ce6a40653af7
diff --git a/print/scribus/patches/patch-aa b/print/scribus/patches/patch-aa
index 92500d8a37f..58da56166b6 100644
--- a/print/scribus/patches/patch-aa
+++ b/print/scribus/patches/patch-aa
@@ -1,45 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/09 21:32:51 agc Exp $
+$NetBSD: patch-aa,v 1.2 2003/10/29 20:54:51 reed Exp $
 
---- scribus/Makefile.in.orig	Sat Jun  1 19:41:12 2002
-+++ scribus/Makefile.in	Sat Jun  1 19:47:08 2002
-@@ -110,6 +110,7 @@
- KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
- KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+LDFLAGS = @LDFLAGS@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LIBCOMPAT = @LIBCOMPAT@
-@@ -240,12 +241,12 @@
- 
- ####### kdevelop will overwrite this part!!! (end)############
- 
--scribus_LDADD = $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
-+scribus_LDADD = $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBJPEG) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
- 
- SUBDIRS = docs icons libabout libprefs plugins libpostscript profiles libpdf samples 
- 
- EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h scribus.de.qm inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h modify.cpp modify.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribus.fr.qm scribusXml.cpp scribusXml.h scribus.ca.qm scribus.es.qm scribus.hu.qm scribus.it.qm cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h ISOenc.txt frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h TTFenc.txt Stdenc.txt scfonts_encoding.cpp scfonts_encoding.h scfonts_ttf.cpp scfonts_ttf.h scfonts_ttftypes.h muster.cpp muster.h scribus.uk.qm scribus.sk.qm applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h scribus.bg.qm scribus.gl.qm cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h icc34.h lcms.h iso8859-15.enc iso8859-2.enc iso8859-2ps.enc werktoolb.cpp werktoolb.h scribus.lt.qm mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h 
--LDFLAGS = -export-dynamic -s
-+#LDFLAGS = -export-dynamic -s
- # set the include path for X, qt and KDE
- INCLUDES = $(all_includes)
- 
-@@ -322,7 +323,7 @@
- CXXLD = $(CXX)
- #>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
- #>+ 1
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -export-dynamic -s -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
-@@ -425,7 +426,7 @@
- 
- scribus$(EXEEXT): $(scribus_OBJECTS) $(scribus_DEPENDENCIES)
- 	@rm -f scribus$(EXEEXT)
--	$(CXXLINK) $(scribus_LDFLAGS) $(scribus_OBJECTS) $(scribus_LDADD) $(LIBS)
-+	$(CXXLINK) $(LDFLAGS) $(scribus_LDFLAGS) $(scribus_OBJECTS) $(USER_LDFLAGS) $(scribus_LDADD) $(LIBS)
- .cpp.o:
- 	$(CXXCOMPILE) -c $<
- .cpp.obj:
+--- scribus/scpreview.cpp.orig	Wed Oct 15 18:44:36 2003
++++ scribus/scpreview.cpp	Wed Oct 15 19:39:15 2003
+@@ -11,6 +11,7 @@
+ #include <qdir.h>
+ #include <cmath>
+ #include <cstdlib>
++#include <iostream>
+ #include "missing.h"
+ extern float QStoFloat(QString in);
+ extern int QStoInt(QString in);
diff --git a/print/scribus/patches/patch-ab b/print/scribus/patches/patch-ab
new file mode 100644
index 00000000000..b166bfe4261
--- /dev/null
+++ b/print/scribus/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/10/29 20:54:51 reed Exp $
+
+--- scribus/mpalette.cpp.orig	Wed Oct 15 19:15:33 2003
++++ scribus/mpalette.cpp	Wed Oct 15 19:39:06 2003
+@@ -4,6 +4,7 @@
+ #include <qpoint.h>
+ #include <qwmatrix.h>
+ #include <qmessagebox.h>
++#include <iostream>
+ #include "query.h"
+ #include "scribusview.h"
+ extern QPixmap loadIcon(QString nam);