5 files changed, 116 insertions, 36 deletions

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 8d79fc6f4af2..935711362172 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4.1
 CATEGORIES=	print editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scribus.org.uk/downloads/${PORTVERSION}/
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index d14a540115e8..d28c5a469358 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (scribus-1.2.3.tar.bz2) = ced1e74d4be30482b48bd04d52e47d46
-SHA256 (scribus-1.2.3.tar.bz2) = 1de5651745bea667ec148b90b5694eea9e1db9da44bc589ec7bea722730583c3
-SIZE (scribus-1.2.3.tar.bz2) = 8048282
+MD5 (scribus-1.2.4.1.tar.bz2) = d72ffe72b1d9ba1230557692af803927
+SHA256 (scribus-1.2.4.1.tar.bz2) = 83b94617173999a4c2a3687146b286a35e7f3cf9f64adf289e4de5d636224e2d
+SIZE (scribus-1.2.4.1.tar.bz2) = 8710153
diff --git a/print/scribus-devel/files/patch-scribus_plugins_scriptplugin_macro.cpp b/print/scribus-devel/files/patch-scribus_plugins_scriptplugin_macro.cpp
deleted file mode 100644
index 797f1fff526b..000000000000
--- a/print/scribus-devel/files/patch-scribus_plugins_scriptplugin_macro.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- scribus/plugins/scriptplugin/macro.cpp.orig	Sun Jul  3 16:34:04 2005
-+++ scribus/plugins/scriptplugin/macro.cpp	Mon Jul  4 13:10:49 2005
-@@ -53,7 +53,7 @@
- {
- 	assert(!PyErr_Occurred());
- 
--	if ((newName == QString::null) or (newName == ""))
-+	if ((newName == QString::null) || (newName == ""))
- 		qDebug("Macro::Macro() called with NULL or '' name");
- 
- 	// set the macro name
-@@ -344,7 +344,7 @@
- // Must not return with an exception set
- void Macro::setMacroName(QString newName)
- {
--	if ((newName == QString::null) or (newName == ""))
-+	if ((newName == QString::null) || (newName == ""))
- 	{
- 		qDebug("Macro::setMacroName(): called with NULL or '' name");
- 		return;
diff --git a/print/scribus-devel/files/patch-scribus_plugins_short-words_vlnadialog.cpp b/print/scribus-devel/files/patch-scribus_plugins_short-words_vlnadialog.cpp
deleted file mode 100644
index 6b49503b8c6e..000000000000
--- a/print/scribus-devel/files/patch-scribus_plugins_short-words_vlnadialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/short-words/vlnadialog.cpp.orig	Wed Feb  2 05:02:38 2005
-+++ scribus/plugins/short-words/vlnadialog.cpp	Mon Jul  4 13:18:50 2005
-@@ -159,7 +159,7 @@
- 
- void VlnaDialog::selectAction(int aAction)
- {
--	if (aAction!=0 and aAction!=1 and aAction!=2) {
-+	if (aAction!=0 && aAction!=1 && aAction!=2) {
- 			aAction = 0;
- 	}
- 	buttonGroup->setButton(aAction);
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index 2217f9b4f003..23077ceb0fd1 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -93,6 +93,7 @@ lib/scribus/dicts/hyph_hu.dic
 lib/scribus/dicts/hyph_it.dic
 lib/scribus/dicts/hyph_lt.dic
 lib/scribus/dicts/hyph_nl.dic
+lib/scribus/dicts/hyph_nn.dic
 lib/scribus/dicts/hyph_pl.dic
 lib/scribus/dicts/hyph_pt.dic
 lib/scribus/dicts/hyph_pt_BR.dic
@@ -206,6 +207,7 @@ lib/scribus/scribus.sk.qm
 lib/scribus/scribus.sl.qm
 lib/scribus/scribus.sq.qm
 lib/scribus/scribus.sr.qm
+lib/scribus/scribus.th_TH.qm
 lib/scribus/scribus.tr.qm
 lib/scribus/scribus.uk.qm
 lib/scribus/scribus.zh.qm
@@ -215,6 +217,113 @@ lib/scribus/scribus.zh.qm
 %%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.png
 %%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.xml
 %%DATADIR%%/doc/cs/tutorials/scribus-short-words/short-words-manual.html
+%%DATADIR%%/doc/de/about1.html
+%%DATADIR%%/doc/de/about2.html
+%%DATADIR%%/doc/de/cms.html
+%%DATADIR%%/doc/de/cms2.html
+%%DATADIR%%/doc/de/cms3.html
+%%DATADIR%%/doc/de/cms4.html
+%%DATADIR%%/doc/de/codingstandards.html
+%%DATADIR%%/doc/de/contributions.html
+%%DATADIR%%/doc/de/cross-platform.html
+%%DATADIR%%/doc/de/cups.html
+%%DATADIR%%/doc/de/developers.html
+%%DATADIR%%/doc/de/doccopyright.html
+%%DATADIR%%/doc/de/docinfo.html
+%%DATADIR%%/doc/de/documentation.html
+%%DATADIR%%/doc/de/download.html
+%%DATADIR%%/doc/de/faq1.html
+%%DATADIR%%/doc/de/faq2.html
+%%DATADIR%%/doc/de/faq3.html
+%%DATADIR%%/doc/de/fonts1.html
+%%DATADIR%%/doc/de/fonts2.html
+%%DATADIR%%/doc/de/fonts3.html
+%%DATADIR%%/doc/de/fonts4.html
+%%DATADIR%%/doc/de/fonts5.html
+%%DATADIR%%/doc/de/gettexthowto.html
+%%DATADIR%%/doc/de/gsfont.html
+%%DATADIR%%/doc/de/hyphenator.html
+%%DATADIR%%/doc/de/importhints.html
+%%DATADIR%%/doc/de/importhints1.html
+%%DATADIR%%/doc/de/importhints2.html
+%%DATADIR%%/doc/de/importhints3.html
+%%DATADIR%%/doc/de/index.html
+%%DATADIR%%/doc/de/install-dpkg.html
+%%DATADIR%%/doc/de/install.html
+%%DATADIR%%/doc/de/install1.html
+%%DATADIR%%/doc/de/install2.html
+%%DATADIR%%/doc/de/install3.html
+%%DATADIR%%/doc/de/intro.html
+%%DATADIR%%/doc/de/irc.html
+%%DATADIR%%/doc/de/javascriptpdf.html
+%%DATADIR%%/doc/de/keys.html
+%%DATADIR%%/doc/de/machints1.html
+%%DATADIR%%/doc/de/machints2.html
+%%DATADIR%%/doc/de/menu.xml
+%%DATADIR%%/doc/de/moncal.html
+%%DATADIR%%/doc/de/mouse.html
+%%DATADIR%%/doc/de/otherinfo.html
+%%DATADIR%%/doc/de/pagetemplate1.html
+%%DATADIR%%/doc/de/parallel-install.html
+%%DATADIR%%/doc/de/pdf_form.html
+%%DATADIR%%/doc/de/pdfexport1.html
+%%DATADIR%%/doc/de/pdfexport2.html
+%%DATADIR%%/doc/de/pdfexport3.html
+%%DATADIR%%/doc/de/pdfexport4.html
+%%DATADIR%%/doc/de/pdflavor.html
+%%DATADIR%%/doc/de/pdfx3.html
+%%DATADIR%%/doc/de/plugin_howto.html
+%%DATADIR%%/doc/de/prepress.html
+%%DATADIR%%/doc/de/print1.html
+%%DATADIR%%/doc/de/print2.html
+%%DATADIR%%/doc/de/print3.html
+%%DATADIR%%/doc/de/readme.html
+%%DATADIR%%/doc/de/resources.html
+%%DATADIR%%/doc/de/scprinters.html
+%%DATADIR%%/doc/de/scribus-svg.html
+%%DATADIR%%/doc/de/scribuscopyright.html
+%%DATADIR%%/doc/de/scribusfileformat.html
+%%DATADIR%%/doc/de/scripter-extensions.html
+%%DATADIR%%/doc/de/scripter-faq.html
+%%DATADIR%%/doc/de/scripter1.html
+%%DATADIR%%/doc/de/scripterapi-ImageExport.html
+%%DATADIR%%/doc/de/scripterapi-PDFfile.html
+%%DATADIR%%/doc/de/scripterapi-Printer.html
+%%DATADIR%%/doc/de/scripterapi-color.html
+%%DATADIR%%/doc/de/scripterapi-constants.html
+%%DATADIR%%/doc/de/scripterapi-dialogs.html
+%%DATADIR%%/doc/de/scripterapi-doc.html
+%%DATADIR%%/doc/de/scripterapi-font.html
+%%DATADIR%%/doc/de/scripterapi-getobjprop.html
+%%DATADIR%%/doc/de/scripterapi-layer.html
+%%DATADIR%%/doc/de/scripterapi-manobj.html
+%%DATADIR%%/doc/de/scripterapi-object.html
+%%DATADIR%%/doc/de/scripterapi-page.html
+%%DATADIR%%/doc/de/scripterapi-pydoc.html
+%%DATADIR%%/doc/de/scripterapi-select.html
+%%DATADIR%%/doc/de/scripterapi-setobjprop.html
+%%DATADIR%%/doc/de/scripterapi-textframes.html
+%%DATADIR%%/doc/de/scripterapi.html
+%%DATADIR%%/doc/de/settings1.html
+%%DATADIR%%/doc/de/short-words.html
+%%DATADIR%%/doc/de/specs.html
+%%DATADIR%%/doc/de/toolbox.html
+%%DATADIR%%/doc/de/toolbox1.html
+%%DATADIR%%/doc/de/toolbox10.html
+%%DATADIR%%/doc/de/toolbox11.html
+%%DATADIR%%/doc/de/toolbox12.html
+%%DATADIR%%/doc/de/toolbox13.html
+%%DATADIR%%/doc/de/toolbox2.html
+%%DATADIR%%/doc/de/toolbox3.html
+%%DATADIR%%/doc/de/toolbox4.html
+%%DATADIR%%/doc/de/toolbox5.html
+%%DATADIR%%/doc/de/toolbox6.html
+%%DATADIR%%/doc/de/toolbox7.html
+%%DATADIR%%/doc/de/toolbox8.html
+%%DATADIR%%/doc/de/toolbox9.html
+%%DATADIR%%/doc/de/topten.html
+%%DATADIR%%/doc/de/translation_howto.html
+%%DATADIR%%/doc/de/tutorials.html
 %%DATADIR%%/doc/en/about1.html
 %%DATADIR%%/doc/en/about2.html
 %%DATADIR%%/doc/en/cms.html
@@ -292,6 +401,7 @@ lib/scribus/scribus.zh.qm
 %%DATADIR%%/doc/en/images/hyphen3.png
 %%DATADIR%%/doc/en/images/inkscape.png
 %%DATADIR%%/doc/en/images/kfontinstaller.png
+%%DATADIR%%/doc/en/images/kfontinstaller2.png
 %%DATADIR%%/doc/en/images/ksnapshot.png
 %%DATADIR%%/doc/en/images/monprof1.png
 %%DATADIR%%/doc/en/images/monprof2.png
@@ -320,6 +430,7 @@ lib/scribus/scribus.zh.qm
 %%DATADIR%%/doc/en/images/scribus2.png
 %%DATADIR%%/doc/en/images/scribuscms1.png
 %%DATADIR%%/doc/en/images/scribustru4.png
+%%DATADIR%%/doc/en/images/scripterprefs.png
 %%DATADIR%%/doc/en/images/siatka_jednostki_miar.png
 %%DATADIR%%/doc/en/images/siatka_menu.png
 %%DATADIR%%/doc/en/images/spinbox1.png
@@ -641,6 +752,7 @@ lib/scribus/scribus.zh.qm
 @dirrm %%DATADIR%%/doc/fr
 @dirrm %%DATADIR%%/doc/en/images
 @dirrm %%DATADIR%%/doc/en
+@dirrm %%DATADIR%%/doc/de
 @dirrm %%DATADIR%%/doc/cs/tutorials/scribus-short-words
 @dirrm %%DATADIR%%/doc/cs/tutorials
 @dirrm %%DATADIR%%/doc/cs