update to 1.2.5

changes:
-fontconfig support
-Icon Tool Bars are now dockable
-bugfixes

3 files changed, 363 insertions, 347 deletions

diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 712160b1fc7..fe51b440a58 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/07/22 04:46:18 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2006/10/17 17:08:07 drochner Exp $
 
-DISTNAME=	scribus-1.2.4.1
-PKGREVISION=	1
+DISTNAME=	scribus-1.2.5
 CATEGORIES=	print
-MASTER_SITES=	http://www.scribus.org.uk/downloads/1.2.4.1/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scribus/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/print/scribus/PLIST b/print/scribus/PLIST
index 42c42efa125..844ac1e913f 100644
--- a/print/scribus/PLIST
+++ b/print/scribus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/02 19:04:55 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/10/17 17:08:08 drochner Exp $
 bin/scribus
 include/scribus/alignselect.h
 include/scribus/bookmwin.h
@@ -68,6 +68,7 @@ lib/scribus/dicts/README_en_GB.txt
 lib/scribus/dicts/README_es_ES.txt
 lib/scribus/dicts/README_fi_FI.txt
 lib/scribus/dicts/README_hu_HU.txt
+lib/scribus/dicts/README_hyph_is_IS.txt
 lib/scribus/dicts/README_lt_LT.txt
 lib/scribus/dicts/README_no_NO.txt
 lib/scribus/dicts/README_pl_PL.txt
@@ -91,6 +92,7 @@ lib/scribus/dicts/hyph_fr.dic
 lib/scribus/dicts/hyph_ga.dic
 lib/scribus/dicts/hyph_hr.dic
 lib/scribus/dicts/hyph_hu.dic
+lib/scribus/dicts/hyph_is.dic
 lib/scribus/dicts/hyph_it.dic
 lib/scribus/dicts/hyph_lt.dic
 lib/scribus/dicts/hyph_nl.dic
@@ -109,6 +111,7 @@ 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/libdocim.la
 lib/scribus/plugins/gettext/libhtmlim.la
 lib/scribus/plugins/gettext/libodtimplugin.la
 lib/scribus/plugins/gettext/libsxwimplugin.la
@@ -142,6 +145,7 @@ lib/scribus/scribus.cs.qm
 lib/scribus/scribus.cy.qm
 lib/scribus/scribus.da.qm
 lib/scribus/scribus.de.qm
+lib/scribus/scribus.dz.qm
 lib/scribus/scribus.en_GB.qm
 lib/scribus/scribus.eo.qm
 lib/scribus/scribus.es.qm
@@ -152,6 +156,7 @@ lib/scribus/scribus.gl.qm
 lib/scribus/scribus.hu.qm
 lib/scribus/scribus.id.qm
 lib/scribus/scribus.it.qm
+lib/scribus/scribus.ja.qm
 lib/scribus/scribus.ko.qm
 lib/scribus/scribus.lt.qm
 lib/scribus/scribus.nb.qm
@@ -170,331 +175,344 @@ lib/scribus/scribus.uk.qm
 lib/scribus/scribus.zh.qm
 man/man1/scribus.1
 man/pl/man1/scribus.1
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/after_short_words.png
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/before_short_words.png
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/dialog.png
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/menu.png
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/menu.xml
+share/doc/${PKGNAME}/cs/tutorials/scribus-short-words/short-words-manual.html
+share/doc/${PKGNAME}/de/about1.html
+share/doc/${PKGNAME}/de/about2.html
+share/doc/${PKGNAME}/de/cms.html
+share/doc/${PKGNAME}/de/cms2.html
+share/doc/${PKGNAME}/de/cms3.html
+share/doc/${PKGNAME}/de/cms4.html
+share/doc/${PKGNAME}/de/codingstandards.html
+share/doc/${PKGNAME}/de/contributions.html
+share/doc/${PKGNAME}/de/cross-platform.html
+share/doc/${PKGNAME}/de/cups.html
+share/doc/${PKGNAME}/de/developers.html
+share/doc/${PKGNAME}/de/doccopyright.html
+share/doc/${PKGNAME}/de/docinfo.html
+share/doc/${PKGNAME}/de/documentation.html
+share/doc/${PKGNAME}/de/download.html
+share/doc/${PKGNAME}/de/faq1.html
+share/doc/${PKGNAME}/de/faq2.html
+share/doc/${PKGNAME}/de/faq3.html
+share/doc/${PKGNAME}/de/fonts1.html
+share/doc/${PKGNAME}/de/fonts2.html
+share/doc/${PKGNAME}/de/fonts3.html
+share/doc/${PKGNAME}/de/fonts4.html
+share/doc/${PKGNAME}/de/fonts5.html
+share/doc/${PKGNAME}/de/gettexthowto.html
+share/doc/${PKGNAME}/de/gsfont.html
+share/doc/${PKGNAME}/de/hyphenator.html
+share/doc/${PKGNAME}/de/importhints.html
+share/doc/${PKGNAME}/de/importhints1.html
+share/doc/${PKGNAME}/de/importhints2.html
+share/doc/${PKGNAME}/de/importhints3.html
+share/doc/${PKGNAME}/de/index.html
+share/doc/${PKGNAME}/de/install-dpkg.html
+share/doc/${PKGNAME}/de/install.html
+share/doc/${PKGNAME}/de/install1.html
+share/doc/${PKGNAME}/de/install2.html
+share/doc/${PKGNAME}/de/install3.html
+share/doc/${PKGNAME}/de/intro.html
+share/doc/${PKGNAME}/de/irc.html
+share/doc/${PKGNAME}/de/javascriptpdf.html
+share/doc/${PKGNAME}/de/keys.html
+share/doc/${PKGNAME}/de/machints1.html
+share/doc/${PKGNAME}/de/machints2.html
+share/doc/${PKGNAME}/de/menu.xml
+share/doc/${PKGNAME}/de/moncal.html
+share/doc/${PKGNAME}/de/mouse.html
+share/doc/${PKGNAME}/de/otherinfo.html
+share/doc/${PKGNAME}/de/pagetemplate1.html
+share/doc/${PKGNAME}/de/parallel-install.html
+share/doc/${PKGNAME}/de/pdf_form.html
+share/doc/${PKGNAME}/de/pdfexport1.html
+share/doc/${PKGNAME}/de/pdfexport2.html
+share/doc/${PKGNAME}/de/pdfexport3.html
+share/doc/${PKGNAME}/de/pdfexport4.html
+share/doc/${PKGNAME}/de/pdflavor.html
+share/doc/${PKGNAME}/de/pdfx3.html
+share/doc/${PKGNAME}/de/plugin_howto.html
+share/doc/${PKGNAME}/de/prepress.html
+share/doc/${PKGNAME}/de/print1.html
+share/doc/${PKGNAME}/de/print2.html
+share/doc/${PKGNAME}/de/print3.html
+share/doc/${PKGNAME}/de/readme.html
+share/doc/${PKGNAME}/de/resources.html
+share/doc/${PKGNAME}/de/scprinters.html
+share/doc/${PKGNAME}/de/scribus-svg.html
+share/doc/${PKGNAME}/de/scribuscopyright.html
+share/doc/${PKGNAME}/de/scribusfileformat.html
+share/doc/${PKGNAME}/de/scripter-extensions.html
+share/doc/${PKGNAME}/de/scripter-faq.html
+share/doc/${PKGNAME}/de/scripter1.html
+share/doc/${PKGNAME}/de/scripterapi-ImageExport.html
+share/doc/${PKGNAME}/de/scripterapi-PDFfile.html
+share/doc/${PKGNAME}/de/scripterapi-Printer.html
+share/doc/${PKGNAME}/de/scripterapi-color.html
+share/doc/${PKGNAME}/de/scripterapi-constants.html
+share/doc/${PKGNAME}/de/scripterapi-dialogs.html
+share/doc/${PKGNAME}/de/scripterapi-doc.html
+share/doc/${PKGNAME}/de/scripterapi-font.html
+share/doc/${PKGNAME}/de/scripterapi-getobjprop.html
+share/doc/${PKGNAME}/de/scripterapi-layer.html
+share/doc/${PKGNAME}/de/scripterapi-manobj.html
+share/doc/${PKGNAME}/de/scripterapi-object.html
+share/doc/${PKGNAME}/de/scripterapi-page.html
+share/doc/${PKGNAME}/de/scripterapi-pydoc.html
+share/doc/${PKGNAME}/de/scripterapi-select.html
+share/doc/${PKGNAME}/de/scripterapi-setobjprop.html
+share/doc/${PKGNAME}/de/scripterapi-textframes.html
+share/doc/${PKGNAME}/de/scripterapi.html
+share/doc/${PKGNAME}/de/settings1.html
+share/doc/${PKGNAME}/de/short-words.html
+share/doc/${PKGNAME}/de/specs.html
+share/doc/${PKGNAME}/de/toolbox.html
+share/doc/${PKGNAME}/de/toolbox1.html
+share/doc/${PKGNAME}/de/toolbox10.html
+share/doc/${PKGNAME}/de/toolbox11.html
+share/doc/${PKGNAME}/de/toolbox12.html
+share/doc/${PKGNAME}/de/toolbox13.html
+share/doc/${PKGNAME}/de/toolbox2.html
+share/doc/${PKGNAME}/de/toolbox3.html
+share/doc/${PKGNAME}/de/toolbox4.html
+share/doc/${PKGNAME}/de/toolbox5.html
+share/doc/${PKGNAME}/de/toolbox6.html
+share/doc/${PKGNAME}/de/toolbox7.html
+share/doc/${PKGNAME}/de/toolbox8.html
+share/doc/${PKGNAME}/de/toolbox9.html
+share/doc/${PKGNAME}/de/topten.html
+share/doc/${PKGNAME}/de/translation_howto.html
+share/doc/${PKGNAME}/de/tutorials.html
+share/doc/${PKGNAME}/en/about1.html
+share/doc/${PKGNAME}/en/about2.html
+share/doc/${PKGNAME}/en/cms.html
+share/doc/${PKGNAME}/en/cms2.html
+share/doc/${PKGNAME}/en/cms3.html
+share/doc/${PKGNAME}/en/cms4.html
+share/doc/${PKGNAME}/en/codingstandards.html
+share/doc/${PKGNAME}/en/contributions.html
+share/doc/${PKGNAME}/en/cross-platform.html
+share/doc/${PKGNAME}/en/cups.html
+share/doc/${PKGNAME}/en/developers.html
+share/doc/${PKGNAME}/en/doccopyright.html
+share/doc/${PKGNAME}/en/docinfo.html
+share/doc/${PKGNAME}/en/documentation.html
+share/doc/${PKGNAME}/en/download.html
+share/doc/${PKGNAME}/en/faq1.html
+share/doc/${PKGNAME}/en/faq2.html
+share/doc/${PKGNAME}/en/faq3.html
+share/doc/${PKGNAME}/en/fonts1.html
+share/doc/${PKGNAME}/en/fonts2.html
+share/doc/${PKGNAME}/en/fonts3.html
+share/doc/${PKGNAME}/en/fonts4.html
+share/doc/${PKGNAME}/en/fonts5.html
+share/doc/${PKGNAME}/en/gettexthowto.html
+share/doc/${PKGNAME}/en/gsfont.html
+share/doc/${PKGNAME}/en/hyphenator.html
+share/doc/${PKGNAME}/en/images/RDF.png
+share/doc/${PKGNAME}/en/images/Scripter.png
+share/doc/${PKGNAME}/en/images/Scripter_error_string.png
+share/doc/${PKGNAME}/en/images/acro1.png
+share/doc/${PKGNAME}/en/images/acro2.png
+share/doc/${PKGNAME}/en/images/acro3.png
+share/doc/${PKGNAME}/en/images/acroinfo.png
+share/doc/${PKGNAME}/en/images/acropass.png
+share/doc/${PKGNAME}/en/images/acroreader5.1.png
+share/doc/${PKGNAME}/en/images/acrosec.png
+share/doc/${PKGNAME}/en/images/after_short_words.png
+share/doc/${PKGNAME}/en/images/batik1.png
+share/doc/${PKGNAME}/en/images/before_short_words.png
+share/doc/${PKGNAME}/en/images/cmsmodify1.png
+share/doc/${PKGNAME}/en/images/cmspanel.png
+share/doc/${PKGNAME}/en/images/colormanager2.png
+share/doc/${PKGNAME}/en/images/colormgmtscreen.png
+share/doc/${PKGNAME}/en/images/cups1.png
+share/doc/${PKGNAME}/en/images/cups2.png
+share/doc/${PKGNAME}/en/images/docheader1.png
+share/doc/${PKGNAME}/en/images/docheader2.png
+share/doc/${PKGNAME}/en/images/docinfo.png
+share/doc/${PKGNAME}/en/images/docinfo2.png
+share/doc/${PKGNAME}/en/images/filepicker.png
+share/doc/${PKGNAME}/en/images/fontpref1.png
+share/doc/${PKGNAME}/en/images/fontpref2.png
+share/doc/${PKGNAME}/en/images/fontpref3.png
+share/doc/${PKGNAME}/en/images/fontprev.png
+share/doc/${PKGNAME}/en/images/fonts.png
+share/doc/${PKGNAME}/en/images/fonts2.png
+share/doc/${PKGNAME}/en/images/fonts3.png
+share/doc/${PKGNAME}/en/images/fonts4.png
+share/doc/${PKGNAME}/en/images/fontsampler.png
+share/doc/${PKGNAME}/en/images/fontsampler2.png
+share/doc/${PKGNAME}/en/images/formularz_export_PDF.png
+share/doc/${PKGNAME}/en/images/formularz_js_skrypt.png
+share/doc/${PKGNAME}/en/images/formularz_js_sprawdzanie.png
+share/doc/${PKGNAME}/en/images/formularz_nowy.png
+share/doc/${PKGNAME}/en/images/formularz_pole_num.png
+share/doc/${PKGNAME}/en/images/gammagrayscale.png
+share/doc/${PKGNAME}/en/images/gimpoptions1.png
+share/doc/${PKGNAME}/en/images/gimpoptions2.png
+share/doc/${PKGNAME}/en/images/gimpoptions3.png
+share/doc/${PKGNAME}/en/images/gsadv1.png
+share/doc/${PKGNAME}/en/images/gsadv2.png
+share/doc/${PKGNAME}/en/images/gsadv3.png
+share/doc/${PKGNAME}/en/images/htmlimport.png
+share/doc/${PKGNAME}/en/images/htmlstyle.png
+share/doc/${PKGNAME}/en/images/hyphen1.png
+share/doc/${PKGNAME}/en/images/hyphen2.png
+share/doc/${PKGNAME}/en/images/hyphen3.png
+share/doc/${PKGNAME}/en/images/inkscape.png
+share/doc/${PKGNAME}/en/images/kfontinstaller.png
+share/doc/${PKGNAME}/en/images/kfontinstaller2.png
+share/doc/${PKGNAME}/en/images/ksnapshot.png
+share/doc/${PKGNAME}/en/images/monprof1.png
+share/doc/${PKGNAME}/en/images/monprof2.png
+share/doc/${PKGNAME}/en/images/monprof3.png
+share/doc/${PKGNAME}/en/images/monprof4.png
+share/doc/${PKGNAME}/en/images/newdoc1.png
+share/doc/${PKGNAME}/en/images/oochart.png
+share/doc/${PKGNAME}/en/images/ooeps1.png
+share/doc/${PKGNAME}/en/images/oogettext1.png
+share/doc/${PKGNAME}/en/images/pagenumbering.png
+share/doc/${PKGNAME}/en/images/pagetemplate1.png
+share/doc/${PKGNAME}/en/images/pdfx3-1.png
+share/doc/${PKGNAME}/en/images/pdfxcolor.png
+share/doc/${PKGNAME}/en/images/pdfxintent.png
+share/doc/${PKGNAME}/en/images/prefsblgrid1.png
+share/doc/${PKGNAME}/en/images/prefsguides.png
+share/doc/${PKGNAME}/en/images/prefspanel1.png
+share/doc/${PKGNAME}/en/images/prefspanel2.png
+share/doc/${PKGNAME}/en/images/prefspanel3.png
+share/doc/${PKGNAME}/en/images/prefspanel4.png
+share/doc/${PKGNAME}/en/images/prefspanel5.png
+share/doc/${PKGNAME}/en/images/printer1.png
+share/doc/${PKGNAME}/en/images/printer2.png
+share/doc/${PKGNAME}/en/images/printpreview.png
+share/doc/${PKGNAME}/en/images/printseps.png
+share/doc/${PKGNAME}/en/images/proppalette1.png
+share/doc/${PKGNAME}/en/images/pstoedit1.png
+share/doc/${PKGNAME}/en/images/result.png
+share/doc/${PKGNAME}/en/images/scribus2.png
+share/doc/${PKGNAME}/en/images/scribuscms1.png
+share/doc/${PKGNAME}/en/images/scribustru4.png
+share/doc/${PKGNAME}/en/images/scripterprefs.png
+share/doc/${PKGNAME}/en/images/siatka_jednostki_miar.png
+share/doc/${PKGNAME}/en/images/siatka_menu.png
+share/doc/${PKGNAME}/en/images/spinbox1.png
+share/doc/${PKGNAME}/en/images/svg1.png
+share/doc/${PKGNAME}/en/images/swdialog.png
+share/doc/${PKGNAME}/en/images/swmenu.png
+share/doc/${PKGNAME}/en/images/symbole.png
+share/doc/${PKGNAME}/en/images/toolbar1.png
+share/doc/${PKGNAME}/en/images/toolbar1b.png
+share/doc/${PKGNAME}/en/images/toolbar1c.png
+share/doc/${PKGNAME}/en/images/toolbar1d.png
+share/doc/${PKGNAME}/en/images/toolbar3.png
+share/doc/${PKGNAME}/en/images/ulica.png
+share/doc/${PKGNAME}/en/images/wlasciwosci_pola.png
+share/doc/${PKGNAME}/en/images/wyslij_formularz.png
+share/doc/${PKGNAME}/en/images/xnview.png
+share/doc/${PKGNAME}/en/importhints.html
+share/doc/${PKGNAME}/en/importhints1.html
+share/doc/${PKGNAME}/en/importhints2.html
+share/doc/${PKGNAME}/en/importhints3.html
+share/doc/${PKGNAME}/en/importhints4.html
+share/doc/${PKGNAME}/en/index.html
+share/doc/${PKGNAME}/en/install-dpkg.html
+share/doc/${PKGNAME}/en/install.html
+share/doc/${PKGNAME}/en/install1.html
+share/doc/${PKGNAME}/en/install2.html
+share/doc/${PKGNAME}/en/install3.html
+share/doc/${PKGNAME}/en/intro.html
+share/doc/${PKGNAME}/en/irc.html
+share/doc/${PKGNAME}/en/javascriptpdf.html
+share/doc/${PKGNAME}/en/keys.html
+share/doc/${PKGNAME}/en/machints1.html
+share/doc/${PKGNAME}/en/machints2.html
+share/doc/${PKGNAME}/en/menu.xml
+share/doc/${PKGNAME}/en/moncal.html
+share/doc/${PKGNAME}/en/mouse.html
+share/doc/${PKGNAME}/en/otherinfo.html
+share/doc/${PKGNAME}/en/pagenumber.html
+share/doc/${PKGNAME}/en/pagetemplate1.html
+share/doc/${PKGNAME}/en/parallel-install.html
+share/doc/${PKGNAME}/en/pdf_form.html
+share/doc/${PKGNAME}/en/pdfexport1.html
+share/doc/${PKGNAME}/en/pdfexport2.html
+share/doc/${PKGNAME}/en/pdfexport3.html
+share/doc/${PKGNAME}/en/pdfexport4.html
+share/doc/${PKGNAME}/en/pdflavor.html
+share/doc/${PKGNAME}/en/pdfx3.html
+share/doc/${PKGNAME}/en/plugin_howto.html
+share/doc/${PKGNAME}/en/prepress.html
+share/doc/${PKGNAME}/en/print1.html
+share/doc/${PKGNAME}/en/print2.html
+share/doc/${PKGNAME}/en/print3.html
+share/doc/${PKGNAME}/en/readme.html
+share/doc/${PKGNAME}/en/resources.html
+share/doc/${PKGNAME}/en/scprinters.html
+share/doc/${PKGNAME}/en/scribus-svg.html
+share/doc/${PKGNAME}/en/scribuscopyright.html
+share/doc/${PKGNAME}/en/scribusfileformat.html
+share/doc/${PKGNAME}/en/scripter-extensions.html
+share/doc/${PKGNAME}/en/scripter-faq.html
+share/doc/${PKGNAME}/en/scripter1.html
+share/doc/${PKGNAME}/en/scripterapi-ImageExport.html
+share/doc/${PKGNAME}/en/scripterapi-PDFfile.html
+share/doc/${PKGNAME}/en/scripterapi-Printer.html
+share/doc/${PKGNAME}/en/scripterapi-color.html
+share/doc/${PKGNAME}/en/scripterapi-constants.html
+share/doc/${PKGNAME}/en/scripterapi-dialogs.html
+share/doc/${PKGNAME}/en/scripterapi-doc.html
+share/doc/${PKGNAME}/en/scripterapi-font.html
+share/doc/${PKGNAME}/en/scripterapi-getobjprop.html
+share/doc/${PKGNAME}/en/scripterapi-layer.html
+share/doc/${PKGNAME}/en/scripterapi-manobj.html
+share/doc/${PKGNAME}/en/scripterapi-object.html
+share/doc/${PKGNAME}/en/scripterapi-page.html
+share/doc/${PKGNAME}/en/scripterapi-pydoc.html
+share/doc/${PKGNAME}/en/scripterapi-select.html
+share/doc/${PKGNAME}/en/scripterapi-setobjprop.html
+share/doc/${PKGNAME}/en/scripterapi-textframes.html
+share/doc/${PKGNAME}/en/scripterapi.html
+share/doc/${PKGNAME}/en/settings1.html
+share/doc/${PKGNAME}/en/short-words.html
+share/doc/${PKGNAME}/en/specs.html
+share/doc/${PKGNAME}/en/toolbox.html
+share/doc/${PKGNAME}/en/toolbox1.html
+share/doc/${PKGNAME}/en/toolbox10.html
+share/doc/${PKGNAME}/en/toolbox11.html
+share/doc/${PKGNAME}/en/toolbox12.html
+share/doc/${PKGNAME}/en/toolbox13.html
+share/doc/${PKGNAME}/en/toolbox2.html
+share/doc/${PKGNAME}/en/toolbox3.html
+share/doc/${PKGNAME}/en/toolbox4.html
+share/doc/${PKGNAME}/en/toolbox5.html
+share/doc/${PKGNAME}/en/toolbox6.html
+share/doc/${PKGNAME}/en/toolbox7.html
+share/doc/${PKGNAME}/en/toolbox8.html
+share/doc/${PKGNAME}/en/toolbox9.html
+share/doc/${PKGNAME}/en/topten.html
+share/doc/${PKGNAME}/en/translation_howto.html
+share/doc/${PKGNAME}/en/tutorials.html
+share/doc/${PKGNAME}/en/workspace1.html
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/after_short_words.png
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/before_short_words.png
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/dialog.png
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/menu.png
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/menu.xml
+share/doc/${PKGNAME}/fr/tutorials/scribus-short-words/short-words-manual.html
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/after_short_words.png
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/before_short_words.png
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/dialog.png
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/menu.png
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/menu.xml
+share/doc/${PKGNAME}/pl/tutorials/scribus-short-words/short-words-manual.html
 share/pixmaps/scribusicon.png
-share/scribus/doc/cs/tutorials/scribus-short-words/after_short_words.png
-share/scribus/doc/cs/tutorials/scribus-short-words/before_short_words.png
-share/scribus/doc/cs/tutorials/scribus-short-words/dialog.png
-share/scribus/doc/cs/tutorials/scribus-short-words/menu.png
-share/scribus/doc/cs/tutorials/scribus-short-words/menu.xml
-share/scribus/doc/cs/tutorials/scribus-short-words/short-words-manual.html
-share/scribus/doc/de/about1.html
-share/scribus/doc/de/about2.html
-share/scribus/doc/de/cms.html
-share/scribus/doc/de/cms2.html
-share/scribus/doc/de/cms3.html
-share/scribus/doc/de/cms4.html
-share/scribus/doc/de/codingstandards.html
-share/scribus/doc/de/contributions.html
-share/scribus/doc/de/cross-platform.html
-share/scribus/doc/de/cups.html
-share/scribus/doc/de/developers.html
-share/scribus/doc/de/doccopyright.html
-share/scribus/doc/de/docinfo.html
-share/scribus/doc/de/documentation.html
-share/scribus/doc/de/download.html
-share/scribus/doc/de/faq1.html
-share/scribus/doc/de/faq2.html
-share/scribus/doc/de/faq3.html
-share/scribus/doc/de/fonts1.html
-share/scribus/doc/de/fonts2.html
-share/scribus/doc/de/fonts3.html
-share/scribus/doc/de/fonts4.html
-share/scribus/doc/de/fonts5.html
-share/scribus/doc/de/gettexthowto.html
-share/scribus/doc/de/gsfont.html
-share/scribus/doc/de/hyphenator.html
-share/scribus/doc/de/importhints.html
-share/scribus/doc/de/importhints1.html
-share/scribus/doc/de/importhints2.html
-share/scribus/doc/de/importhints3.html
-share/scribus/doc/de/index.html
-share/scribus/doc/de/install-dpkg.html
-share/scribus/doc/de/install.html
-share/scribus/doc/de/install1.html
-share/scribus/doc/de/install2.html
-share/scribus/doc/de/install3.html
-share/scribus/doc/de/intro.html
-share/scribus/doc/de/irc.html
-share/scribus/doc/de/javascriptpdf.html
-share/scribus/doc/de/keys.html
-share/scribus/doc/de/machints1.html
-share/scribus/doc/de/machints2.html
-share/scribus/doc/de/menu.xml
-share/scribus/doc/de/moncal.html
-share/scribus/doc/de/mouse.html
-share/scribus/doc/de/otherinfo.html
-share/scribus/doc/de/pagetemplate1.html
-share/scribus/doc/de/parallel-install.html
-share/scribus/doc/de/pdf_form.html
-share/scribus/doc/de/pdfexport1.html
-share/scribus/doc/de/pdfexport2.html
-share/scribus/doc/de/pdfexport3.html
-share/scribus/doc/de/pdfexport4.html
-share/scribus/doc/de/pdflavor.html
-share/scribus/doc/de/pdfx3.html
-share/scribus/doc/de/plugin_howto.html
-share/scribus/doc/de/prepress.html
-share/scribus/doc/de/print1.html
-share/scribus/doc/de/print2.html
-share/scribus/doc/de/print3.html
-share/scribus/doc/de/readme.html
-share/scribus/doc/de/resources.html
-share/scribus/doc/de/scprinters.html
-share/scribus/doc/de/scribus-svg.html
-share/scribus/doc/de/scribuscopyright.html
-share/scribus/doc/de/scribusfileformat.html
-share/scribus/doc/de/scripter-extensions.html
-share/scribus/doc/de/scripter-faq.html
-share/scribus/doc/de/scripter1.html
-share/scribus/doc/de/scripterapi-ImageExport.html
-share/scribus/doc/de/scripterapi-PDFfile.html
-share/scribus/doc/de/scripterapi-Printer.html
-share/scribus/doc/de/scripterapi-color.html
-share/scribus/doc/de/scripterapi-constants.html
-share/scribus/doc/de/scripterapi-dialogs.html
-share/scribus/doc/de/scripterapi-doc.html
-share/scribus/doc/de/scripterapi-font.html
-share/scribus/doc/de/scripterapi-getobjprop.html
-share/scribus/doc/de/scripterapi-layer.html
-share/scribus/doc/de/scripterapi-manobj.html
-share/scribus/doc/de/scripterapi-object.html
-share/scribus/doc/de/scripterapi-page.html
-share/scribus/doc/de/scripterapi-pydoc.html
-share/scribus/doc/de/scripterapi-select.html
-share/scribus/doc/de/scripterapi-setobjprop.html
-share/scribus/doc/de/scripterapi-textframes.html
-share/scribus/doc/de/scripterapi.html
-share/scribus/doc/de/settings1.html
-share/scribus/doc/de/short-words.html
-share/scribus/doc/de/specs.html
-share/scribus/doc/de/toolbox.html
-share/scribus/doc/de/toolbox1.html
-share/scribus/doc/de/toolbox10.html
-share/scribus/doc/de/toolbox11.html
-share/scribus/doc/de/toolbox12.html
-share/scribus/doc/de/toolbox13.html
-share/scribus/doc/de/toolbox2.html
-share/scribus/doc/de/toolbox3.html
-share/scribus/doc/de/toolbox4.html
-share/scribus/doc/de/toolbox5.html
-share/scribus/doc/de/toolbox6.html
-share/scribus/doc/de/toolbox7.html
-share/scribus/doc/de/toolbox8.html
-share/scribus/doc/de/toolbox9.html
-share/scribus/doc/de/topten.html
-share/scribus/doc/de/translation_howto.html
-share/scribus/doc/de/tutorials.html
-share/scribus/doc/en/about1.html
-share/scribus/doc/en/about2.html
-share/scribus/doc/en/cms.html
-share/scribus/doc/en/cms2.html
-share/scribus/doc/en/cms3.html
-share/scribus/doc/en/cms4.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/developers.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/fonts4.html
-share/scribus/doc/en/fonts5.html
-share/scribus/doc/en/gettexthowto.html
-share/scribus/doc/en/gsfont.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/acro2.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/acroreader5.1.png
-share/scribus/doc/en/images/acrosec.png
-share/scribus/doc/en/images/after_short_words.png
-share/scribus/doc/en/images/batik1.png
-share/scribus/doc/en/images/before_short_words.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/docinfo.png
-share/scribus/doc/en/images/docinfo2.png
-share/scribus/doc/en/images/filepicker.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/fonts2.png
-share/scribus/doc/en/images/fonts3.png
-share/scribus/doc/en/images/fonts4.png
-share/scribus/doc/en/images/fontsampler.png
-share/scribus/doc/en/images/fontsampler2.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/kfontinstaller2.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/oochart.png
-share/scribus/doc/en/images/ooeps1.png
-share/scribus/doc/en/images/oogettext1.png
-share/scribus/doc/en/images/pagetemplate1.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/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/scripterprefs.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/swdialog.png
-share/scribus/doc/en/images/swmenu.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/importhints1.html
-share/scribus/doc/en/importhints2.html
-share/scribus/doc/en/importhints3.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/intro.html
-share/scribus/doc/en/irc.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/mouse.html
-share/scribus/doc/en/otherinfo.html
-share/scribus/doc/en/pagetemplate1.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/pdflavor.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/readme.html
-share/scribus/doc/en/resources.html
-share/scribus/doc/en/scprinters.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-extensions.html
-share/scribus/doc/en/scripter-faq.html
-share/scribus/doc/en/scripter1.html
-share/scribus/doc/en/scripterapi-ImageExport.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/short-words.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/fr/tutorials/scribus-short-words/after_short_words.png
-share/scribus/doc/fr/tutorials/scribus-short-words/before_short_words.png
-share/scribus/doc/fr/tutorials/scribus-short-words/dialog.png
-share/scribus/doc/fr/tutorials/scribus-short-words/menu.png
-share/scribus/doc/fr/tutorials/scribus-short-words/menu.xml
-share/scribus/doc/fr/tutorials/scribus-short-words/short-words-manual.html
-share/scribus/doc/pl/tutorials/scribus-short-words/after_short_words.png
-share/scribus/doc/pl/tutorials/scribus-short-words/before_short_words.png
-share/scribus/doc/pl/tutorials/scribus-short-words/dialog.png
-share/scribus/doc/pl/tutorials/scribus-short-words/menu.png
-share/scribus/doc/pl/tutorials/scribus-short-words/menu.xml
-share/scribus/doc/pl/tutorials/scribus-short-words/short-words-manual.html
 share/scribus/icons/AddNode.png
 share/scribus/icons/AddPoint.png
 share/scribus/icons/AppIcon.png
@@ -659,7 +677,6 @@ share/scribus/samples/ReadMe
 share/scribus/samples/Sample1.py
 share/scribus/samples/boilerplate.py
 share/scribus/samples/golden-mean.py
-share/scribus/samples/htmlimport.py
 share/scribus/samples/legende.py
 share/scribus/samples/moins_10_pourcent_group.py
 share/scribus/samples/plus_10_pourcent_group.py
@@ -704,20 +721,20 @@ share/scribus/templates/textbased/textbasedtn.png
 @dirrm share/scribus/samples
 @dirrm share/scribus/plugins
 @dirrm share/scribus/icons
-@dirrm share/scribus/doc/pl/tutorials/scribus-short-words
-@dirrm share/scribus/doc/pl/tutorials
-@dirrm share/scribus/doc/pl
-@dirrm share/scribus/doc/fr/tutorials/scribus-short-words
-@dirrm share/scribus/doc/fr/tutorials
-@dirrm share/scribus/doc/fr
-@dirrm share/scribus/doc/en/images
-@dirrm share/scribus/doc/en
-@dirrm share/scribus/doc/de
-@dirrm share/scribus/doc/cs/tutorials/scribus-short-words
-@dirrm share/scribus/doc/cs/tutorials
-@dirrm share/scribus/doc/cs
-@dirrm share/scribus/doc
 @dirrm share/scribus
+@dirrm share/doc/${PKGNAME}/pl/tutorials/scribus-short-words
+@dirrm share/doc/${PKGNAME}/pl/tutorials
+@dirrm share/doc/${PKGNAME}/pl
+@dirrm share/doc/${PKGNAME}/fr/tutorials/scribus-short-words
+@dirrm share/doc/${PKGNAME}/fr/tutorials
+@dirrm share/doc/${PKGNAME}/fr
+@dirrm share/doc/${PKGNAME}/en/images
+@dirrm share/doc/${PKGNAME}/en
+@dirrm share/doc/${PKGNAME}/de
+@dirrm share/doc/${PKGNAME}/cs/tutorials/scribus-short-words
+@dirrm share/doc/${PKGNAME}/cs/tutorials
+@dirrm share/doc/${PKGNAME}/cs
+@dirrm share/doc/${PKGNAME}
 @dirrm lib/scribus/profiles
 @dirrm lib/scribus/plugins/gettext
 @dirrm lib/scribus/plugins
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index aa5d068cb3c..ab0dc62f3d0 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2006/03/17 23:53:31 wiz Exp $
+$NetBSD: distinfo,v 1.13 2006/10/17 17:08:08 drochner Exp $
 
-SHA1 (scribus-1.2.4.1.tar.bz2) = c7dfc98d35a0524184c0835e8db376bc71f13f05
-RMD160 (scribus-1.2.4.1.tar.bz2) = b5859d4ed8ea2384e2786d7e7629ac52a63d894c
-Size (scribus-1.2.4.1.tar.bz2) = 8710153 bytes
+SHA1 (scribus-1.2.5.tar.bz2) = cc0222a0c18d146c5ee084d623f2faa22bd2da1b
+RMD160 (scribus-1.2.5.tar.bz2) = 0410ee141f4ce1997af046939fdffdaf5b6321e1
+Size (scribus-1.2.5.tar.bz2) = 9066058 bytes
 SHA1 (patch-aa) = 785be88925de52c8b085be854c010d3a68305ca0
 SHA1 (patch-ab) = 22cfa87e6c2a5ae17336b760110552cf738cb39b
 SHA1 (patch-ad) = a30c6441880c65970a925833aeec1d4390d3069b