update to 1.2.1

changes:
-new import/export features
-python scripter additions (not enabled in pkgsrc yet)
-rendering speed improvements
-bugfixes
-more UI translations

note: scribus is able to trigger bugs in older ghostscript versions,
appearently due a too high number of colors used.
As a workaround, it worked for me (drochner) to delete unused colors
from the palette before invoking print preview.
afpl-ghostscript-8.50 works fine, but there is no pkg for (yet).

8 files changed, 305 insertions, 36 deletions

diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index cf79f499fd8..0e5d5245573 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/12/28 23:18:18 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/31 19:15:23 drochner Exp $
 
-DISTNAME=	scribus-1.1.7
-PKGREVISION=	2
+DISTNAME=	scribus-1.2.1
 CATEGORIES=	print
-MASTER_SITES=	http://scribus.planetmirror.com/
+MASTER_SITES=	http://www.scribus.org.uk/downloads/1.2.1/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.scribus.net/
@@ -21,10 +21,13 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=        --with-qt-dir=${QTDIR} \
 			--with-extra-libs=${LOCALBASE}/lib \
 			--with-extra-includes=${LOCALBASE}/include
+# avoid CUPS libs to be pulled in
+CONFIGURE_ENV+=		ac_cv_prog_hacups=no
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/scribus/PLIST b/print/scribus/PLIST
index f0d8a3210a2..16a90620393 100644
--- a/print/scribus/PLIST
+++ b/print/scribus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/03/31 19:15:23 drochner Exp $
 bin/scribus
 include/scribus/alignselect.h
 include/scribus/bookmwin.h
@@ -12,21 +12,34 @@ include/scribus/fparser.h
 include/scribus/fpoint.h
 include/scribus/fpointarray.h
 include/scribus/frameedit.h
+include/scribus/gradienteditor.h
+include/scribus/gtaction.h
+include/scribus/gtfont.h
+include/scribus/gtframestyle.h
+include/scribus/gtmeasure.h
+include/scribus/gtparagraphstyle.h
+include/scribus/gtstyle.h
+include/scribus/gtwriter.h
 include/scribus/helpbrowser.h
 include/scribus/hruler.h
 include/scribus/hyphen.h
 include/scribus/hyphenator.h
+include/scribus/langlist.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/missing.h
 include/scribus/mpalette.h
 include/scribus/mspinbox.h
 include/scribus/muster.h
 include/scribus/page.h
 include/scribus/pageitem.h
 include/scribus/pageselector.h
+include/scribus/prefscontext.h
+include/scribus/prefsfile.h
+include/scribus/prefstable.h
 include/scribus/query.h
 include/scribus/scfonts.h
 include/scribus/scpainter.h
@@ -45,6 +58,7 @@ include/scribus/tree.h
 include/scribus/vgradient.h
 include/scribus/vruler.h
 include/scribus/werktoolb.h
+lib/scribus/dicts/hyph_af.dic
 lib/scribus/dicts/hyph_ca.dic
 lib/scribus/dicts/hyph_cs.dic
 lib/scribus/dicts/hyph_da.dic
@@ -71,10 +85,18 @@ lib/scribus/libs/libabout.la
 lib/scribus/libs/libpdf.la
 lib/scribus/libs/libpostscript.la
 lib/scribus/libs/libpreferences.la
+lib/scribus/plugins/gettext/libcsvim.la
+lib/scribus/plugins/gettext/libhtmlim.la
+lib/scribus/plugins/gettext/libsxwimplugin.la
+lib/scribus/plugins/gettext/libtextfilterplugin.la
+lib/scribus/plugins/gettext/libtxtim.la
 lib/scribus/plugins/libcharselect.la
 lib/scribus/plugins/libfontpreview.la
 lib/scribus/plugins/libimportps.la
+lib/scribus/plugins/libnewfromtemplateplugin.la
+lib/scribus/plugins/liboodrawimp.la
 lib/scribus/plugins/libpreview.la
+lib/scribus/plugins/libsaveastemplateplugin.la
 lib/scribus/plugins/libscribusexportpixmap.la
 lib/scribus/plugins/libsvgexplugin.la
 lib/scribus/plugins/libsvgimplugin.la
@@ -83,6 +105,7 @@ lib/scribus/rgbscribus.txt
 lib/scribus/rgbscribusgnome.txt
 lib/scribus/rgbscribusgreys.txt
 lib/scribus/rgbsvg.txt
+lib/scribus/scribus.af.qm
 lib/scribus/scribus.bg.qm
 lib/scribus/scribus.br.qm
 lib/scribus/scribus.ca.qm
@@ -91,6 +114,7 @@ lib/scribus/scribus.cy.qm
 lib/scribus/scribus.da.qm
 lib/scribus/scribus.de.qm
 lib/scribus/scribus.en_GB.qm
+lib/scribus/scribus.eo.qm
 lib/scribus/scribus.es.qm
 lib/scribus/scribus.eu.qm
 lib/scribus/scribus.fi.qm
@@ -99,15 +123,193 @@ lib/scribus/scribus.gl.qm
 lib/scribus/scribus.hu.qm
 lib/scribus/scribus.id.qm
 lib/scribus/scribus.it.qm
+lib/scribus/scribus.ko.qm
 lib/scribus/scribus.lt.qm
+lib/scribus/scribus.nb.qm
 lib/scribus/scribus.nl.qm
-lib/scribus/scribus.no.qm
 lib/scribus/scribus.pl.qm
 lib/scribus/scribus.ru.qm
+lib/scribus/scribus.se.qm
 lib/scribus/scribus.sk.qm
 lib/scribus/scribus.sl.qm
+lib/scribus/scribus.sq.qm
+lib/scribus/scribus.sr.qm
 lib/scribus/scribus.tr.qm
 lib/scribus/scribus.uk.qm
+lib/scribus/scribus.zh.qm
+share/man/man1/scribus.1
+share/man/pl/man1/scribus.1
+share/scribus/doc/en/about1.html
+share/scribus/doc/en/about2.html
+share/scribus/doc/en/acroreader.html
+share/scribus/doc/en/cms.html
+share/scribus/doc/en/codingstandards.html
+share/scribus/doc/en/contributions.html
+share/scribus/doc/en/cross-platform.html
+share/scribus/doc/en/cups.html
+share/scribus/doc/en/cygwin.html
+share/scribus/doc/en/developers.html
+share/scribus/doc/en/docchanges.html
+share/scribus/doc/en/doccopyright.html
+share/scribus/doc/en/docinfo.html
+share/scribus/doc/en/documentation.html
+share/scribus/doc/en/download.html
+share/scribus/doc/en/faq1.html
+share/scribus/doc/en/faq2.html
+share/scribus/doc/en/faq3.html
+share/scribus/doc/en/fonts1.html
+share/scribus/doc/en/fonts2.html
+share/scribus/doc/en/fonts3.html
+share/scribus/doc/en/gettexthowto.html
+share/scribus/doc/en/gsadv.html
+share/scribus/doc/en/gsview.html
+share/scribus/doc/en/hyphenator.html
+share/scribus/doc/en/images/RDF.png
+share/scribus/doc/en/images/Scripter.png
+share/scribus/doc/en/images/Scripter_error_string.png
+share/scribus/doc/en/images/acro1.png
+share/scribus/doc/en/images/acro3.png
+share/scribus/doc/en/images/acroinfo.png
+share/scribus/doc/en/images/acropass.png
+share/scribus/doc/en/images/acrosec.png
+share/scribus/doc/en/images/batik1.png
+share/scribus/doc/en/images/cmsmodify1.png
+share/scribus/doc/en/images/cmspanel.png
+share/scribus/doc/en/images/colormanager2.png
+share/scribus/doc/en/images/colormgmtscreen.png
+share/scribus/doc/en/images/cups1.png
+share/scribus/doc/en/images/cups2.png
+share/scribus/doc/en/images/docheader1.png
+share/scribus/doc/en/images/docheader2.png
+share/scribus/doc/en/images/fontpref1.png
+share/scribus/doc/en/images/fontpref2.png
+share/scribus/doc/en/images/fontpref3.png
+share/scribus/doc/en/images/fontprev.png
+share/scribus/doc/en/images/fonts.png
+share/scribus/doc/en/images/formularz_export_PDF.png
+share/scribus/doc/en/images/formularz_js_skrypt.png
+share/scribus/doc/en/images/formularz_js_sprawdzanie.png
+share/scribus/doc/en/images/formularz_nowy.png
+share/scribus/doc/en/images/formularz_pole_num.png
+share/scribus/doc/en/images/gammagrayscale.png
+share/scribus/doc/en/images/gimpoptions1.png
+share/scribus/doc/en/images/gimpoptions2.png
+share/scribus/doc/en/images/gimpoptions3.png
+share/scribus/doc/en/images/gsadv1.png
+share/scribus/doc/en/images/gsadv2.png
+share/scribus/doc/en/images/gsadv3.png
+share/scribus/doc/en/images/hyphen1.png
+share/scribus/doc/en/images/hyphen2.png
+share/scribus/doc/en/images/hyphen3.png
+share/scribus/doc/en/images/inkscape.png
+share/scribus/doc/en/images/kfontinstaller.png
+share/scribus/doc/en/images/ksnapshot.png
+share/scribus/doc/en/images/monprof1.png
+share/scribus/doc/en/images/monprof2.png
+share/scribus/doc/en/images/monprof3.png
+share/scribus/doc/en/images/monprof4.png
+share/scribus/doc/en/images/pdfx3-1.png
+share/scribus/doc/en/images/pdfxcolor.png
+share/scribus/doc/en/images/pdfxintent.png
+share/scribus/doc/en/images/prefsblgrid1.png
+share/scribus/doc/en/images/prefsguides.png
+share/scribus/doc/en/images/prefspanel1.png
+share/scribus/doc/en/images/prefspanel2.png
+share/scribus/doc/en/images/prefspanel3.png
+share/scribus/doc/en/images/prefspanel4.png
+share/scribus/doc/en/images/prefspanel5.png
+share/scribus/doc/en/images/printer1.png
+share/scribus/doc/en/images/printer2.png
+share/scribus/doc/en/images/printer3.png
+share/scribus/doc/en/images/printpreview.png
+share/scribus/doc/en/images/printseps.png
+share/scribus/doc/en/images/pstoedit1.png
+share/scribus/doc/en/images/result.png
+share/scribus/doc/en/images/scribus2.png
+share/scribus/doc/en/images/scribuscms1.png
+share/scribus/doc/en/images/scribustru4.png
+share/scribus/doc/en/images/siatka_jednostki_miar.png
+share/scribus/doc/en/images/siatka_menu.png
+share/scribus/doc/en/images/spinbox1.png
+share/scribus/doc/en/images/svg1.png
+share/scribus/doc/en/images/symbole.png
+share/scribus/doc/en/images/ulica.png
+share/scribus/doc/en/images/wlasciwosci_pola.png
+share/scribus/doc/en/images/wyslij_formularz.png
+share/scribus/doc/en/images/xnview.png
+share/scribus/doc/en/importhints.html
+share/scribus/doc/en/importhints2.html
+share/scribus/doc/en/index.html
+share/scribus/doc/en/install-dpkg.html
+share/scribus/doc/en/install.html
+share/scribus/doc/en/install1.html
+share/scribus/doc/en/install2.html
+share/scribus/doc/en/install3.html
+share/scribus/doc/en/install4.html
+share/scribus/doc/en/intro.html
+share/scribus/doc/en/javascriptpdf.html
+share/scribus/doc/en/keys.html
+share/scribus/doc/en/machints1.html
+share/scribus/doc/en/machints2.html
+share/scribus/doc/en/menu.xml
+share/scribus/doc/en/moncal.html
+share/scribus/doc/en/otherinfo.html
+share/scribus/doc/en/parallel-install.html
+share/scribus/doc/en/pdf_form.html
+share/scribus/doc/en/pdfexport1.html
+share/scribus/doc/en/pdfexport2.html
+share/scribus/doc/en/pdfexport3.html
+share/scribus/doc/en/pdfexport4.html
+share/scribus/doc/en/pdfx3.html
+share/scribus/doc/en/plugin_howto.html
+share/scribus/doc/en/prepress.html
+share/scribus/doc/en/print1.html
+share/scribus/doc/en/print2.html
+share/scribus/doc/en/print3.html
+share/scribus/doc/en/resources.html
+share/scribus/doc/en/screenshots.html
+share/scribus/doc/en/scribus-svg.html
+share/scribus/doc/en/scribuscopyright.html
+share/scribus/doc/en/scribusfileformat.html
+share/scribus/doc/en/scripter-faq.html
+share/scribus/doc/en/scripter1.html
+share/scribus/doc/en/scripterapi-PDFfile.html
+share/scribus/doc/en/scripterapi-Printer.html
+share/scribus/doc/en/scripterapi-color.html
+share/scribus/doc/en/scripterapi-constants.html
+share/scribus/doc/en/scripterapi-dialogs.html
+share/scribus/doc/en/scripterapi-doc.html
+share/scribus/doc/en/scripterapi-font.html
+share/scribus/doc/en/scripterapi-getobjprop.html
+share/scribus/doc/en/scripterapi-layer.html
+share/scribus/doc/en/scripterapi-manobj.html
+share/scribus/doc/en/scripterapi-object.html
+share/scribus/doc/en/scripterapi-page.html
+share/scribus/doc/en/scripterapi-pydoc.html
+share/scribus/doc/en/scripterapi-select.html
+share/scribus/doc/en/scripterapi-setobjprop.html
+share/scribus/doc/en/scripterapi-textframes.html
+share/scribus/doc/en/scripterapi.html
+share/scribus/doc/en/settings1.html
+share/scribus/doc/en/specs.html
+share/scribus/doc/en/toolbox.html
+share/scribus/doc/en/toolbox1.html
+share/scribus/doc/en/toolbox10.html
+share/scribus/doc/en/toolbox11.html
+share/scribus/doc/en/toolbox12.html
+share/scribus/doc/en/toolbox13.html
+share/scribus/doc/en/toolbox2.html
+share/scribus/doc/en/toolbox3.html
+share/scribus/doc/en/toolbox4.html
+share/scribus/doc/en/toolbox5.html
+share/scribus/doc/en/toolbox6.html
+share/scribus/doc/en/toolbox7.html
+share/scribus/doc/en/toolbox8.html
+share/scribus/doc/en/toolbox9.html
+share/scribus/doc/en/topten.html
+share/scribus/doc/en/translation_howto.html
+share/scribus/doc/en/tutorials.html
+share/scribus/doc/en/wine.html
 share/scribus/icons/AddNode.png
 share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.png
@@ -117,16 +319,16 @@ 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
+share/scribus/icons/DateiClose.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/DateiSave2.png
 share/scribus/icons/DelPoint.png
 share/scribus/icons/DeleteNode.png
 share/scribus/icons/Deletelayer.png
@@ -179,24 +381,32 @@ share/scribus/icons/Unter.xpm
 share/scribus/icons/Winkel.xpm
 share/scribus/icons/Zeichen.xpm
 share/scribus/icons/acrobat.png
+share/scribus/icons/addf.png
 share/scribus/icons/back.png
 share/scribus/icons/beziertool.png
 share/scribus/icons/bottom.png
 share/scribus/icons/charset.png
 share/scribus/icons/checkbox.png
 share/scribus/icons/combobox.png
+share/scribus/icons/compfile.png
+share/scribus/icons/compfile16.png
 share/scribus/icons/crop.png
 share/scribus/icons/dist.png
 share/scribus/icons/doc.png
 share/scribus/icons/document2.png
+share/scribus/icons/documentinfo.png
 share/scribus/icons/down.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/exit22.png
 share/scribus/icons/expand.png
+share/scribus/icons/filesaveas.png
 share/scribus/icons/fill.png
+share/scribus/icons/find.png
+share/scribus/icons/find16.png
 share/scribus/icons/finish.png
 share/scribus/icons/forward.png
 share/scribus/icons/frame_table.png
@@ -209,16 +419,24 @@ share/scribus/icons/image.png
 share/scribus/icons/irreg.png
 share/scribus/icons/listbox.png
 share/scribus/icons/locked.png
+share/scribus/icons/nftabout.xpm
+share/scribus/icons/nftinfo.xpm
 share/scribus/icons/ok.png
+share/scribus/icons/ok22.png
+share/scribus/icons/ooo_draw.png
+share/scribus/icons/ooo_writer.png
 share/scribus/icons/outlined.png
 share/scribus/icons/pdf.png
 share/scribus/icons/penciladd.png
 share/scribus/icons/pencilsub.png
 share/scribus/icons/postscript.png
 share/scribus/icons/pushbutton.png
+share/scribus/icons/reload.png
+share/scribus/icons/reload16.png
+share/scribus/icons/removef.png
+share/scribus/icons/revert.png
 share/scribus/icons/rotate_ccw.png
 share/scribus/icons/rotate_cw.png
-share/scribus/icons/scribus_head.png
 share/scribus/icons/scribus_logo.jpg
 share/scribus/icons/scribusdoc.png
 share/scribus/icons/scribusicon.png
@@ -244,13 +462,49 @@ share/scribus/icons/triangle.png
 share/scribus/icons/txt.png
 share/scribus/icons/unlock.png
 share/scribus/icons/up.png
+share/scribus/icons/vectorgfx.png
 share/scribus/icons/view.png
 share/scribus/icons/vmirror.png
 share/scribus/samples/LoremIpsum.txt
+share/scribus/templates/br1/br1.png
+share/scribus/templates/br1/br1.sla.gz
+share/scribus/templates/br1/br1tn.png
+share/scribus/templates/br1/map.jpg
+share/scribus/templates/nl1/kites.jpg
+share/scribus/templates/nl1/nl1.png
+share/scribus/templates/nl1/nl1.sla.gz
+share/scribus/templates/nl1/nl1tn.png
+share/scribus/templates/nl2/flowers.jpg
+share/scribus/templates/nl2/nl2.png
+share/scribus/templates/nl2/nl2.sla.gz
+share/scribus/templates/nl2/nl2tn.png
+share/scribus/templates/sc_presentation/presentation.png
+share/scribus/templates/sc_presentation/presentation.sla.gz
+share/scribus/templates/sc_presentation/presentationtn.png
+share/scribus/templates/template.xml
+share/scribus/templates/textbased/an_image.jpg
+share/scribus/templates/textbased/author.jpg
+share/scribus/templates/textbased/textbased.png
+share/scribus/templates/textbased/textbased.sla.gz
+share/scribus/templates/textbased/textbasedtn.png
+@dirrm share/scribus/templates/textbased
+@dirrm share/scribus/templates/sc_presentation
+@dirrm share/scribus/templates/nl2
+@dirrm share/scribus/templates/nl1
+@dirrm share/scribus/templates/br1
+@dirrm share/scribus/templates
 @dirrm share/scribus/samples
 @dirrm share/scribus/icons
+@dirrm share/scribus/doc/en/images
+@dirrm share/scribus/doc/en
+@dirrm share/scribus/doc
 @dirrm share/scribus
+@dirrm share/man/pl/man1
+@dirrm share/man/pl
+@dirrm share/man/man1
+@dirrm share/man
 @dirrm lib/scribus/profiles
+@dirrm lib/scribus/plugins/gettext
 @dirrm lib/scribus/plugins
 @dirrm lib/scribus/libs
 @dirrm lib/scribus/dicts
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index 1e5970c95f1..f56c880c583 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:51:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/03/31 19:15:23 drochner Exp $
 
-SHA1 (scribus-1.1.7.tar.gz) = 144a8d1c29c173b83023e9bb8f83db1924a1cf96
-RMD160 (scribus-1.1.7.tar.gz) = 35581f6f1af8715a413cca4bde61d8a42de3aa6a
-Size (scribus-1.1.7.tar.gz) = 2555298 bytes
-SHA1 (patch-aa) = 5cac75797519761bfbea3ebfb563125a51c32b05
+SHA1 (scribus-1.2.1.tar.bz2) = eeec737a77ff865552ac4aa377b0d9fe3a70030e
+RMD160 (scribus-1.2.1.tar.bz2) = 302d608b427744e3f48082107d989fc29c91044d
+Size (scribus-1.2.1.tar.bz2) = 6436083 bytes
+SHA1 (patch-aa) = b12fd1f333ad5b938221cddb0c355cce0c664719
 SHA1 (patch-ab) = 34bf150818f1fa9a53d23691a4f577f211750c02
-SHA1 (patch-ac) = 3478bbc02a41c955fb820048beb6935567d19a54
 SHA1 (patch-ad) = 9203829ecfb4d8da4ebf185fcd446f1ecbb044c1
-SHA1 (patch-ae) = 9b79846bd5ceb93ed04bf9ec86e3c1fc89a086ee
+SHA1 (patch-ae) = 75d8a0be96d19c0a533a8e847beea190c7b3bd63
 SHA1 (patch-af) = dd909856719c957a6d593eb81da2b7a928c5ca8c
+SHA1 (patch-ag) = ad687b457bd15a80189ee31613bb4c341d93b041
+SHA1 (patch-ah) = e2e6c88bdee3c8e349a66d44e45a822e462d4cb8
diff --git a/print/scribus/patches/patch-aa b/print/scribus/patches/patch-aa
index 116ebc890c7..8e6a8976697 100644
--- a/print/scribus/patches/patch-aa
+++ b/print/scribus/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2004/08/14 21:36:22 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2005/03/31 19:15:23 drochner Exp $
 
---- scribus/scpreview.cpp.orig	2004-05-29 00:33:28.000000000 +0200
+--- scribus/scpreview.cpp.orig	2004-10-24 23:44:51.000000000 +0200
 +++ scribus/scpreview.cpp
 @@ -11,6 +11,7 @@
  #include <qdir.h>
@@ -8,5 +8,5 @@ $NetBSD: patch-aa,v 1.3 2004/08/14 21:36:22 hubertf Exp $
  #include <cstdlib>
 +#include <iostream>
  #include "missing.h"
- extern double QStodouble(QString in);
- extern int QStoInt(QString in);
+ #include "scribus.h"
+ 
diff --git a/print/scribus/patches/patch-ac b/print/scribus/patches/patch-ac
deleted file mode 100644
index 4e1332799e7..00000000000
--- a/print/scribus/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/08/14 21:36:22 hubertf Exp $
-
---- configure.orig	2004-06-05 09:55:44.000000000 +0200
-+++ configure
-@@ -3132,7 +3132,7 @@ else
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/X11/bin
-+for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
diff --git a/print/scribus/patches/patch-ae b/print/scribus/patches/patch-ae
index 559fd623344..25c3f4404e0 100644
--- a/print/scribus/patches/patch-ae
+++ b/print/scribus/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2004/08/14 21:36:22 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2005/03/31 19:15:23 drochner Exp $
 
---- scribus/scribusXml.cpp.orig	2004-05-30 15:08:23.000000000 +0200
+--- scribus/scribusXml.cpp.orig	2005-01-08 09:47:55.000000000 +0100
 +++ scribus/scribusXml.cpp
 @@ -6,6 +6,7 @@
      email                : christian.toepp@mr-ct@gmx.de
@@ -16,5 +16,5 @@ $NetBSD: patch-ae,v 1.2 2004/08/14 21:36:22 hubertf Exp $
  #include <cstdlib>
 -#include <cmath>
  #include "missing.h"
+ #include "splash.h"
  
- #if (_MSC_VER >= 1200)
diff --git a/print/scribus/patches/patch-ag b/print/scribus/patches/patch-ag
new file mode 100644
index 00000000000..f8f069929f3
--- /dev/null
+++ b/print/scribus/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2005/03/31 19:15:23 drochner Exp $
+
+--- ./scribus/plugins/gettext/sxwim/ioapi.h.orig	2005-03-10 17:40:13.000000000 +0100
++++ ./scribus/plugins/gettext/sxwim/ioapi.h
+@@ -39,6 +39,7 @@
+ extern "C" {
+ #endif
+ 
++#define OF(x) x
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
diff --git a/print/scribus/patches/patch-ah b/print/scribus/patches/patch-ah
new file mode 100644
index 00000000000..d5aac5d3c5c
--- /dev/null
+++ b/print/scribus/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2005/03/31 19:15:23 drochner Exp $
+
+--- ./scribus/plugins/fileloader/oodraw/ioapi.h.orig	2005-03-10 17:45:41.000000000 +0100
++++ ./scribus/plugins/fileloader/oodraw/ioapi.h
+@@ -35,6 +35,7 @@
+ extern "C" {
+ #endif
+ 
++#define OF(x) x
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));