14 files changed, 306 insertions, 178 deletions

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 53bdbd36a232..16754339e541 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,23 +7,32 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	print editors
 MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
-		http://scribus.planetmirror.com/
+		http://scribus.planetmirror.com/ \
+		http://mirrors.ntua.gr/Scribus/ \
+		http://ftp.ntua.gr/pub/gnu/scribus/ \
+		ftp://ftp.ntua.gr/pub/gnu/scribus/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-USE_GHOSTSCRIPT_RUN=	yes
+LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		lcms:${PORTSDIR}/graphics/lcms \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		cups.2:${PORTSDIR}/print/cups-base \
+		freetype.9:${PORTSDIR}/print/freetype2
+
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
+USE_GHOSTSCRIPT_RUN=	yes
 
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_PYTHON=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
@@ -40,6 +49,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \
+		s|-O2||g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index e3b60cbbce19..811ee829a0ef 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (scribus-1.0.1.tar.gz) = 2d5b464ffe606ac5339494336dd247ac
-SIZE (scribus-1.0.1.tar.gz) = 1920292
+MD5 (scribus-1.1.6.tar.gz) = e7227085febfc00bbb1b2527a5559022
+SIZE (scribus-1.1.6.tar.gz) = 2719343
diff --git a/print/scribus-devel/files/patch-scribus-page.cpp b/print/scribus-devel/files/patch-scribus-page.cpp
new file mode 100644
index 000000000000..1ad8342a1fd0
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-page.cpp
@@ -0,0 +1,20 @@
+--- scribus/page.cpp.orig	Tue Apr 20 16:17:32 2004
++++ scribus/page.cpp	Tue Apr 20 16:20:34 2004
+@@ -55,6 +55,8 @@
+ #include <qprocess.h>
+ #include <qscrollbar.h>
+ 
++#include <unistd.h>
++
+ #ifdef HAVE_TIFF
+ 	#include <tiffio.h>
+ #endif
+@@ -7929,7 +7931,7 @@
+ 				it++;
+ 				hg->cab = it == NULL ? 0 : (*it).toInt();
+ 				it++;
+-				hg->cstroke = it == NULL ? "None" : *it;
++				hg->cstroke = it == NULL ? QString("None") : *it;
+ 				it++;
+ 				hg->cshade2 = it == NULL ? 100 : (*it).toInt();
+ 				it++;
diff --git a/print/scribus-devel/files/patch-scribus-scribus.cpp b/print/scribus-devel/files/patch-scribus-scribus.cpp
index d3fa4c045b68..206d820145fd 100644
--- a/print/scribus-devel/files/patch-scribus-scribus.cpp
+++ b/print/scribus-devel/files/patch-scribus-scribus.cpp
@@ -1,15 +1,6 @@
---- scribus/scribus.cpp.orig	Fri Jul 11 21:58:11 2003
-+++ scribus/scribus.cpp	Tue Jul 15 12:40:29 2003
-@@ -3051,7 +3051,7 @@
- void ScribusApp::slotHelpAbout()
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	typedef About* (*sdem)(QWidget *d);
- 	sdem demo;
- 	QString pfad = PREL;
-@@ -4694,7 +4694,7 @@
+--- scribus/scribus.cpp.orig	Thu Apr 22 23:14:09 2004
++++ scribus/scribus.cpp	Thu Apr 22 23:16:00 2004
+@@ -5660,7 +5660,7 @@
  void ScribusApp::slotPrefsOrg()
  {
  	void *mo;
@@ -18,48 +9,21 @@
  	bool zChange = false;
  	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
  	sdem demo;
-@@ -5156,7 +5156,7 @@
- 
- PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
- {
--	char *error;
-+	const char *error;
- 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
- 	sdem demo;
- 	QString pfad = PREL;
-@@ -5191,7 +5191,7 @@
+@@ -6142,7 +6142,7 @@
  bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
  {
  	bool ret = false;
 -	char *error;
 +	const char *error;
  	void *PDFDriver;
- 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
+ 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs, QProgressBar *dia2);
  	sdem demo;
-@@ -5738,7 +5738,7 @@
- 
- void ScribusApp::FinalizePlugs()
- {
--	char *error;
-+	const char *error;
- 	QMap<QString, PlugData>::Iterator it;
- 	struct PlugData pda;
- 	typedef void (*sdem2)();
-@@ -5808,7 +5808,7 @@
- void ScribusApp::CallDLL(QString name)
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	struct PlugData pda;
- 	pda = PluginMap[name];
- 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
-@@ -5842,7 +5842,7 @@
- bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	typedef QString (*sdem0)();
- 	typedef int (*sdem1)();
- 	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
+@@ -6686,7 +6686,7 @@
+ 		dia.setSelection(defNa);
+ 	if (dia.exec() == QDialog::Accepted)
+ 		{
+-			LoadEnc = cod ? dia.TxCodeM->currentText() : "";
++			LoadEnc = cod ? dia.TxCodeM->currentText() : QString("");
+ 			this->repaint();
+ 			qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+ 			return dia.selectedFile();
diff --git a/print/scribus-devel/files/patch-scribus-scribusXml.cpp b/print/scribus-devel/files/patch-scribus-scribusXml.cpp
new file mode 100644
index 000000000000..d3a33aad46f9
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-scribusXml.cpp
@@ -0,0 +1,20 @@
+--- scribus/scribusXml.cpp.orig	Tue Apr 20 16:36:12 2004
++++ scribus/scribusXml.cpp	Tue Apr 20 16:38:07 2004
+@@ -2400,7 +2400,7 @@
+ 		}
+ 		else
+ 			ob.setAttribute("ANNOTATION",0);
+-		ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : "");
++		ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : QString(""));
+ 		ob.setAttribute("TEXTFLOW", item->Textflow ? 1 : 0);
+ 		ob.setAttribute("TEXTFLOW2", item->Textflow2 ? 1 : 0);
+ 		ob.setAttribute("AUTOTEXT", item->isAutoText ? 1 : 0);
+@@ -2785,7 +2785,7 @@
+ 			}
+ 			else
+ 				ob.setAttribute("ANNOTATION",0);
+-			ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : "");
++			ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : QString(""));
+ 			ob.setAttribute("TEXTFLOW", item->Textflow ? 1 : 0);
+ 			ob.setAttribute("TEXTFLOW2", item->Textflow2 ? 1 : 0);
+ 			ob.setAttribute("AUTOTEXT", item->isAutoText ? 1 : 0);
diff --git a/print/scribus-devel/files/patch-scribus-scribusview.cpp b/print/scribus-devel/files/patch-scribus-scribusview.cpp
deleted file mode 100644
index a237a7a22122..000000000000
--- a/print/scribus-devel/files/patch-scribus-scribusview.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- scribus/scribusview.cpp.orig	Wed Dec 25 22:48:05 2002
-+++ scribus/scribusview.cpp	Wed Jan  8 01:25:13 2003
-@@ -19,6 +19,7 @@
- #include "scribusview.moc"
- #include "page.h"
- #include "pageback.h"
-+#include <stdlib.h>
- #include <qcolor.h>
- #include <qfont.h>
- #include <qfontmetrics.h>
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index e9b34534dc14..d5790e0a504c 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/scribus
+include/scribus/alignselect.h
 include/scribus/bookmwin.h
 include/scribus/bookpalette.h
 include/scribus/cmykcolor.h
@@ -6,6 +7,7 @@ include/scribus/colorm.h
 include/scribus/cpalette.h
 include/scribus/customfdialog.h
 include/scribus/fontcombo.h
+include/scribus/fparser.h
 include/scribus/fpoint.h
 include/scribus/fpointarray.h
 include/scribus/frameedit.h
@@ -18,7 +20,6 @@ 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
@@ -26,27 +27,31 @@ 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/shadebutton.h
 include/scribus/spalette.h
 include/scribus/splash.h
+include/scribus/styleselect.h
 include/scribus/tree.h
+include/scribus/vgradient.h
 include/scribus/vruler.h
 include/scribus/werktoolb.h
-lib/scribus/ISOenc.txt
-lib/scribus/Stdenc.txt
-lib/scribus/TTFenc.txt
+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_fi.dic
 lib/scribus/dicts/hyph_fr.dic
+lib/scribus/dicts/hyph_ga.dic
 lib/scribus/dicts/hyph_hu.dic
 lib/scribus/dicts/hyph_it.dic
 lib/scribus/dicts/hyph_nl.dic
@@ -57,7 +62,8 @@ 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/AppIcon.png
+lib/scribus/icons/AppIcon2.png
 lib/scribus/icons/BevelJoin.png
 lib/scribus/icons/BezierClose.png
 lib/scribus/icons/Bild.xpm
@@ -99,6 +105,7 @@ 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
@@ -130,6 +137,7 @@ lib/scribus/icons/bottom.png
 lib/scribus/icons/charset.png
 lib/scribus/icons/checkbox.png
 lib/scribus/icons/combobox.png
+lib/scribus/icons/crop.png
 lib/scribus/icons/doc.png
 lib/scribus/icons/document2.png
 lib/scribus/icons/down.png
@@ -138,30 +146,39 @@ lib/scribus/icons/editcut.png
 lib/scribus/icons/editdelete.png
 lib/scribus/icons/editpaste.png
 lib/scribus/icons/exit.png
+lib/scribus/icons/expand.png
+lib/scribus/icons/fill.png
 lib/scribus/icons/finish.png
 lib/scribus/icons/forward.png
+lib/scribus/icons/frame_table.png
+lib/scribus/icons/framenoresize.png
+lib/scribus/icons/frameresize.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/oval.png
+lib/scribus/icons/outlined.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/rotate_ccw.png
+lib/scribus/icons/rotate_cw.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/signature.png
 lib/scribus/icons/spline.png
 lib/scribus/icons/start.png
+lib/scribus/icons/testfill.png
 lib/scribus/icons/text_block.png
 lib/scribus/icons/text_center.png
 lib/scribus/icons/text_force.png
@@ -173,20 +190,9 @@ 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/iso8859-10ps.enc
-lib/scribus/iso8859-13.enc
-lib/scribus/iso8859-13ps.enc
-lib/scribus/iso8859-15.enc
-lib/scribus/iso8859-2.enc
-lib/scribus/iso8859-2ps.enc
-lib/scribus/iso8859-3ps.enc
-lib/scribus/iso8859-4ps.enc
-lib/scribus/iso8859-5ps.enc
-lib/scribus/iso8859-7ps.enc
-lib/scribus/iso8859-9ps.enc
-lib/scribus/koi8ps.enc
 lib/scribus/libs/libabout.so
 lib/scribus/libs/libabout.so.0
 lib/scribus/libs/libpdf.so
@@ -195,23 +201,33 @@ lib/scribus/libs/libpostscript.so
 lib/scribus/libs/libpostscript.so.0
 lib/scribus/libs/libpreferences.so
 lib/scribus/libs/libpreferences.so.0
-lib/scribus/plugins/charselect.da.qm
 lib/scribus/plugins/charselect.no.qm
 lib/scribus/plugins/charselect.sk.qm
 lib/scribus/plugins/libcharselect.so
 lib/scribus/plugins/libcharselect.so.0
 lib/scribus/plugins/libpreview.so
 lib/scribus/plugins/libpreview.so.0
+lib/scribus/plugins/libscriptplugin.so
+lib/scribus/plugins/libscriptplugin.so.0
 lib/scribus/plugins/libsvgexplugin.so
 lib/scribus/plugins/libsvgexplugin.so.0
+lib/scribus/plugins/libsvgimplugin.so
+lib/scribus/plugins/libsvgimplugin.so.0
 lib/scribus/plugins/svgexport.sk.qm
 lib/scribus/profiles/ReadMe
+lib/scribus/rgbscribus.txt
+lib/scribus/rgbscribusgnome.txt
+lib/scribus/rgbscribusgreys.txt
+lib/scribus/rgbsvg.txt
 lib/scribus/scribus.bg.qm
+lib/scribus/scribus.br.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.fi.qm
 lib/scribus/scribus.fr.qm
 lib/scribus/scribus.gl.qm
 lib/scribus/scribus.hu.qm
@@ -224,6 +240,50 @@ lib/scribus/scribus.ru.qm
 lib/scribus/scribus.sk.qm
 lib/scribus/scribus.tr.qm
 lib/scribus/scribus.uk.qm
+share/scribus/doc/en/Scripter/Manual.css
+share/scribus/doc/en/Scripter/Scripter.png
+share/scribus/doc/en/Scripter/index.html
+share/scribus/doc/en/Scripter/node1.html
+share/scribus/doc/en/Scripter/node10.html
+share/scribus/doc/en/Scripter/node11.html
+share/scribus/doc/en/Scripter/node12.html
+share/scribus/doc/en/Scripter/node13.html
+share/scribus/doc/en/Scripter/node14.html
+share/scribus/doc/en/Scripter/node15.html
+share/scribus/doc/en/Scripter/node16.html
+share/scribus/doc/en/Scripter/node17.html
+share/scribus/doc/en/Scripter/node18.html
+share/scribus/doc/en/Scripter/node19.html
+share/scribus/doc/en/Scripter/node2.html
+share/scribus/doc/en/Scripter/node3.html
+share/scribus/doc/en/Scripter/node4.html
+share/scribus/doc/en/Scripter/node5.html
+share/scribus/doc/en/Scripter/node6.html
+share/scribus/doc/en/Scripter/node7.html
+share/scribus/doc/en/Scripter/node8.html
+share/scribus/doc/en/Scripter/node9.html
+share/scribus/doc/en/Scripter/scribus_head.png
+share/scribus/samples/3columnA4.py
+share/scribus/samples/3columnUSLTR.py
+share/scribus/samples/Calendar.py
+share/scribus/samples/ReadMe
+share/scribus/samples/Sample1.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
+share/scribus/samples/pochette_cd.py
+share/scribus/samples/quote.py
+share/scribus/samples/trait_de_coupe.py
+share/scribus/samples/wordcount.py
+share/scribus/scripts/FontSample.py
+share/scribus/scripts/ReadMe
+@dirrm share/scribus/scripts
+@dirrm share/scribus/samples
+@dirrm share/scribus/doc/en/Scripter
+@dirrm share/scribus/doc/en
+@dirrm share/scribus/doc
+@dirrm share/scribus
 @dirrm lib/scribus/profiles
 @dirrm lib/scribus/plugins
 @dirrm lib/scribus/libs
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 53bdbd36a232..16754339e541 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -7,23 +7,32 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	print editors
 MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
-		http://scribus.planetmirror.com/
+		http://scribus.planetmirror.com/ \
+		http://mirrors.ntua.gr/Scribus/ \
+		http://ftp.ntua.gr/pub/gnu/scribus/ \
+		ftp://ftp.ntua.gr/pub/gnu/scribus/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-USE_GHOSTSCRIPT_RUN=	yes
+LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		lcms:${PORTSDIR}/graphics/lcms \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		cups.2:${PORTSDIR}/print/cups-base \
+		freetype.9:${PORTSDIR}/print/freetype2
+
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
+USE_GHOSTSCRIPT_RUN=	yes
 
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_PYTHON=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
@@ -40,6 +49,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \
+		s|-O2||g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index e3b60cbbce19..811ee829a0ef 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,2 +1,2 @@
-MD5 (scribus-1.0.1.tar.gz) = 2d5b464ffe606ac5339494336dd247ac
-SIZE (scribus-1.0.1.tar.gz) = 1920292
+MD5 (scribus-1.1.6.tar.gz) = e7227085febfc00bbb1b2527a5559022
+SIZE (scribus-1.1.6.tar.gz) = 2719343
diff --git a/print/scribus/files/patch-scribus-page.cpp b/print/scribus/files/patch-scribus-page.cpp
new file mode 100644
index 000000000000..1ad8342a1fd0
--- /dev/null
+++ b/print/scribus/files/patch-scribus-page.cpp
@@ -0,0 +1,20 @@
+--- scribus/page.cpp.orig	Tue Apr 20 16:17:32 2004
++++ scribus/page.cpp	Tue Apr 20 16:20:34 2004
+@@ -55,6 +55,8 @@
+ #include <qprocess.h>
+ #include <qscrollbar.h>
+ 
++#include <unistd.h>
++
+ #ifdef HAVE_TIFF
+ 	#include <tiffio.h>
+ #endif
+@@ -7929,7 +7931,7 @@
+ 				it++;
+ 				hg->cab = it == NULL ? 0 : (*it).toInt();
+ 				it++;
+-				hg->cstroke = it == NULL ? "None" : *it;
++				hg->cstroke = it == NULL ? QString("None") : *it;
+ 				it++;
+ 				hg->cshade2 = it == NULL ? 100 : (*it).toInt();
+ 				it++;
diff --git a/print/scribus/files/patch-scribus-scribus.cpp b/print/scribus/files/patch-scribus-scribus.cpp
index d3fa4c045b68..206d820145fd 100644
--- a/print/scribus/files/patch-scribus-scribus.cpp
+++ b/print/scribus/files/patch-scribus-scribus.cpp
@@ -1,15 +1,6 @@
---- scribus/scribus.cpp.orig	Fri Jul 11 21:58:11 2003
-+++ scribus/scribus.cpp	Tue Jul 15 12:40:29 2003
-@@ -3051,7 +3051,7 @@
- void ScribusApp::slotHelpAbout()
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	typedef About* (*sdem)(QWidget *d);
- 	sdem demo;
- 	QString pfad = PREL;
-@@ -4694,7 +4694,7 @@
+--- scribus/scribus.cpp.orig	Thu Apr 22 23:14:09 2004
++++ scribus/scribus.cpp	Thu Apr 22 23:16:00 2004
+@@ -5660,7 +5660,7 @@
  void ScribusApp::slotPrefsOrg()
  {
  	void *mo;
@@ -18,48 +9,21 @@
  	bool zChange = false;
  	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
  	sdem demo;
-@@ -5156,7 +5156,7 @@
- 
- PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
- {
--	char *error;
-+	const char *error;
- 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
- 	sdem demo;
- 	QString pfad = PREL;
-@@ -5191,7 +5191,7 @@
+@@ -6142,7 +6142,7 @@
  bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
  {
  	bool ret = false;
 -	char *error;
 +	const char *error;
  	void *PDFDriver;
- 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
+ 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs, QProgressBar *dia2);
  	sdem demo;
-@@ -5738,7 +5738,7 @@
- 
- void ScribusApp::FinalizePlugs()
- {
--	char *error;
-+	const char *error;
- 	QMap<QString, PlugData>::Iterator it;
- 	struct PlugData pda;
- 	typedef void (*sdem2)();
-@@ -5808,7 +5808,7 @@
- void ScribusApp::CallDLL(QString name)
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	struct PlugData pda;
- 	pda = PluginMap[name];
- 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
-@@ -5842,7 +5842,7 @@
- bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	typedef QString (*sdem0)();
- 	typedef int (*sdem1)();
- 	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
+@@ -6686,7 +6686,7 @@
+ 		dia.setSelection(defNa);
+ 	if (dia.exec() == QDialog::Accepted)
+ 		{
+-			LoadEnc = cod ? dia.TxCodeM->currentText() : "";
++			LoadEnc = cod ? dia.TxCodeM->currentText() : QString("");
+ 			this->repaint();
+ 			qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+ 			return dia.selectedFile();
diff --git a/print/scribus/files/patch-scribus-scribusXml.cpp b/print/scribus/files/patch-scribus-scribusXml.cpp
new file mode 100644
index 000000000000..d3a33aad46f9
--- /dev/null
+++ b/print/scribus/files/patch-scribus-scribusXml.cpp
@@ -0,0 +1,20 @@
+--- scribus/scribusXml.cpp.orig	Tue Apr 20 16:36:12 2004
++++ scribus/scribusXml.cpp	Tue Apr 20 16:38:07 2004
+@@ -2400,7 +2400,7 @@
+ 		}
+ 		else
+ 			ob.setAttribute("ANNOTATION",0);
+-		ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : "");
++		ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : QString(""));
+ 		ob.setAttribute("TEXTFLOW", item->Textflow ? 1 : 0);
+ 		ob.setAttribute("TEXTFLOW2", item->Textflow2 ? 1 : 0);
+ 		ob.setAttribute("AUTOTEXT", item->isAutoText ? 1 : 0);
+@@ -2785,7 +2785,7 @@
+ 			}
+ 			else
+ 				ob.setAttribute("ANNOTATION",0);
+-			ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : "");
++			ob.setAttribute("ANNAME", !item->AutoName ? item->AnName : QString(""));
+ 			ob.setAttribute("TEXTFLOW", item->Textflow ? 1 : 0);
+ 			ob.setAttribute("TEXTFLOW2", item->Textflow2 ? 1 : 0);
+ 			ob.setAttribute("AUTOTEXT", item->isAutoText ? 1 : 0);
diff --git a/print/scribus/files/patch-scribus-scribusview.cpp b/print/scribus/files/patch-scribus-scribusview.cpp
deleted file mode 100644
index a237a7a22122..000000000000
--- a/print/scribus/files/patch-scribus-scribusview.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- scribus/scribusview.cpp.orig	Wed Dec 25 22:48:05 2002
-+++ scribus/scribusview.cpp	Wed Jan  8 01:25:13 2003
-@@ -19,6 +19,7 @@
- #include "scribusview.moc"
- #include "page.h"
- #include "pageback.h"
-+#include <stdlib.h>
- #include <qcolor.h>
- #include <qfont.h>
- #include <qfontmetrics.h>
diff --git a/print/scribus/pkg-plist b/print/scribus/pkg-plist
index e9b34534dc14..d5790e0a504c 100644
--- a/print/scribus/pkg-plist
+++ b/print/scribus/pkg-plist
@@ -1,4 +1,5 @@
 bin/scribus
+include/scribus/alignselect.h
 include/scribus/bookmwin.h
 include/scribus/bookpalette.h
 include/scribus/cmykcolor.h
@@ -6,6 +7,7 @@ include/scribus/colorm.h
 include/scribus/cpalette.h
 include/scribus/customfdialog.h
 include/scribus/fontcombo.h
+include/scribus/fparser.h
 include/scribus/fpoint.h
 include/scribus/fpointarray.h
 include/scribus/frameedit.h
@@ -18,7 +20,6 @@ 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
@@ -26,27 +27,31 @@ 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/shadebutton.h
 include/scribus/spalette.h
 include/scribus/splash.h
+include/scribus/styleselect.h
 include/scribus/tree.h
+include/scribus/vgradient.h
 include/scribus/vruler.h
 include/scribus/werktoolb.h
-lib/scribus/ISOenc.txt
-lib/scribus/Stdenc.txt
-lib/scribus/TTFenc.txt
+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_fi.dic
 lib/scribus/dicts/hyph_fr.dic
+lib/scribus/dicts/hyph_ga.dic
 lib/scribus/dicts/hyph_hu.dic
 lib/scribus/dicts/hyph_it.dic
 lib/scribus/dicts/hyph_nl.dic
@@ -57,7 +62,8 @@ 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/AppIcon.png
+lib/scribus/icons/AppIcon2.png
 lib/scribus/icons/BevelJoin.png
 lib/scribus/icons/BezierClose.png
 lib/scribus/icons/Bild.xpm
@@ -99,6 +105,7 @@ 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
@@ -130,6 +137,7 @@ lib/scribus/icons/bottom.png
 lib/scribus/icons/charset.png
 lib/scribus/icons/checkbox.png
 lib/scribus/icons/combobox.png
+lib/scribus/icons/crop.png
 lib/scribus/icons/doc.png
 lib/scribus/icons/document2.png
 lib/scribus/icons/down.png
@@ -138,30 +146,39 @@ lib/scribus/icons/editcut.png
 lib/scribus/icons/editdelete.png
 lib/scribus/icons/editpaste.png
 lib/scribus/icons/exit.png
+lib/scribus/icons/expand.png
+lib/scribus/icons/fill.png
 lib/scribus/icons/finish.png
 lib/scribus/icons/forward.png
+lib/scribus/icons/frame_table.png
+lib/scribus/icons/framenoresize.png
+lib/scribus/icons/frameresize.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/oval.png
+lib/scribus/icons/outlined.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/rotate_ccw.png
+lib/scribus/icons/rotate_cw.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/signature.png
 lib/scribus/icons/spline.png
 lib/scribus/icons/start.png
+lib/scribus/icons/testfill.png
 lib/scribus/icons/text_block.png
 lib/scribus/icons/text_center.png
 lib/scribus/icons/text_force.png
@@ -173,20 +190,9 @@ 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/iso8859-10ps.enc
-lib/scribus/iso8859-13.enc
-lib/scribus/iso8859-13ps.enc
-lib/scribus/iso8859-15.enc
-lib/scribus/iso8859-2.enc
-lib/scribus/iso8859-2ps.enc
-lib/scribus/iso8859-3ps.enc
-lib/scribus/iso8859-4ps.enc
-lib/scribus/iso8859-5ps.enc
-lib/scribus/iso8859-7ps.enc
-lib/scribus/iso8859-9ps.enc
-lib/scribus/koi8ps.enc
 lib/scribus/libs/libabout.so
 lib/scribus/libs/libabout.so.0
 lib/scribus/libs/libpdf.so
@@ -195,23 +201,33 @@ lib/scribus/libs/libpostscript.so
 lib/scribus/libs/libpostscript.so.0
 lib/scribus/libs/libpreferences.so
 lib/scribus/libs/libpreferences.so.0
-lib/scribus/plugins/charselect.da.qm
 lib/scribus/plugins/charselect.no.qm
 lib/scribus/plugins/charselect.sk.qm
 lib/scribus/plugins/libcharselect.so
 lib/scribus/plugins/libcharselect.so.0
 lib/scribus/plugins/libpreview.so
 lib/scribus/plugins/libpreview.so.0
+lib/scribus/plugins/libscriptplugin.so
+lib/scribus/plugins/libscriptplugin.so.0
 lib/scribus/plugins/libsvgexplugin.so
 lib/scribus/plugins/libsvgexplugin.so.0
+lib/scribus/plugins/libsvgimplugin.so
+lib/scribus/plugins/libsvgimplugin.so.0
 lib/scribus/plugins/svgexport.sk.qm
 lib/scribus/profiles/ReadMe
+lib/scribus/rgbscribus.txt
+lib/scribus/rgbscribusgnome.txt
+lib/scribus/rgbscribusgreys.txt
+lib/scribus/rgbsvg.txt
 lib/scribus/scribus.bg.qm
+lib/scribus/scribus.br.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.fi.qm
 lib/scribus/scribus.fr.qm
 lib/scribus/scribus.gl.qm
 lib/scribus/scribus.hu.qm
@@ -224,6 +240,50 @@ lib/scribus/scribus.ru.qm
 lib/scribus/scribus.sk.qm
 lib/scribus/scribus.tr.qm
 lib/scribus/scribus.uk.qm
+share/scribus/doc/en/Scripter/Manual.css
+share/scribus/doc/en/Scripter/Scripter.png
+share/scribus/doc/en/Scripter/index.html
+share/scribus/doc/en/Scripter/node1.html
+share/scribus/doc/en/Scripter/node10.html
+share/scribus/doc/en/Scripter/node11.html
+share/scribus/doc/en/Scripter/node12.html
+share/scribus/doc/en/Scripter/node13.html
+share/scribus/doc/en/Scripter/node14.html
+share/scribus/doc/en/Scripter/node15.html
+share/scribus/doc/en/Scripter/node16.html
+share/scribus/doc/en/Scripter/node17.html
+share/scribus/doc/en/Scripter/node18.html
+share/scribus/doc/en/Scripter/node19.html
+share/scribus/doc/en/Scripter/node2.html
+share/scribus/doc/en/Scripter/node3.html
+share/scribus/doc/en/Scripter/node4.html
+share/scribus/doc/en/Scripter/node5.html
+share/scribus/doc/en/Scripter/node6.html
+share/scribus/doc/en/Scripter/node7.html
+share/scribus/doc/en/Scripter/node8.html
+share/scribus/doc/en/Scripter/node9.html
+share/scribus/doc/en/Scripter/scribus_head.png
+share/scribus/samples/3columnA4.py
+share/scribus/samples/3columnUSLTR.py
+share/scribus/samples/Calendar.py
+share/scribus/samples/ReadMe
+share/scribus/samples/Sample1.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
+share/scribus/samples/pochette_cd.py
+share/scribus/samples/quote.py
+share/scribus/samples/trait_de_coupe.py
+share/scribus/samples/wordcount.py
+share/scribus/scripts/FontSample.py
+share/scribus/scripts/ReadMe
+@dirrm share/scribus/scripts
+@dirrm share/scribus/samples
+@dirrm share/scribus/doc/en/Scripter
+@dirrm share/scribus/doc/en
+@dirrm share/scribus/doc
+@dirrm share/scribus
 @dirrm lib/scribus/profiles
 @dirrm lib/scribus/plugins
 @dirrm lib/scribus/libs