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

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

Also add more MASTER_SITES and use SHLIBTOOL_OVERRIDE.

2 files changed, 23 insertions, 44 deletions

diff --git a/print/scribus/patches/patch-aa b/print/scribus/patches/patch-aa
index 92500d8a37f..58da56166b6 100644
--- a/print/scribus/patches/patch-aa
+++ b/print/scribus/patches/patch-aa
@@ -1,45 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/09 21:32:51 agc Exp $
+$NetBSD: patch-aa,v 1.2 2003/10/29 20:54:51 reed Exp $
 
---- scribus/Makefile.in.orig	Sat Jun  1 19:41:12 2002
-+++ scribus/Makefile.in	Sat Jun  1 19:47:08 2002
-@@ -110,6 +110,7 @@
- KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
- KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+LDFLAGS = @LDFLAGS@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LIBCOMPAT = @LIBCOMPAT@
-@@ -240,12 +241,12 @@
- 
- ####### kdevelop will overwrite this part!!! (end)############
- 
--scribus_LDADD = $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
-+scribus_LDADD = $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBJPEG) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
- 
- SUBDIRS = docs icons libabout libprefs plugins libpostscript profiles libpdf samples 
- 
- EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h scribus.de.qm inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h modify.cpp modify.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribus.fr.qm scribusXml.cpp scribusXml.h scribus.ca.qm scribus.es.qm scribus.hu.qm scribus.it.qm cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h ISOenc.txt frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h TTFenc.txt Stdenc.txt scfonts_encoding.cpp scfonts_encoding.h scfonts_ttf.cpp scfonts_ttf.h scfonts_ttftypes.h muster.cpp muster.h scribus.uk.qm scribus.sk.qm applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h scribus.bg.qm scribus.gl.qm cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h icc34.h lcms.h iso8859-15.enc iso8859-2.enc iso8859-2ps.enc werktoolb.cpp werktoolb.h scribus.lt.qm mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h 
--LDFLAGS = -export-dynamic -s
-+#LDFLAGS = -export-dynamic -s
- # set the include path for X, qt and KDE
- INCLUDES = $(all_includes)
- 
-@@ -322,7 +323,7 @@
- CXXLD = $(CXX)
- #>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
- #>+ 1
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -export-dynamic -s -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
-@@ -425,7 +426,7 @@
- 
- scribus$(EXEEXT): $(scribus_OBJECTS) $(scribus_DEPENDENCIES)
- 	@rm -f scribus$(EXEEXT)
--	$(CXXLINK) $(scribus_LDFLAGS) $(scribus_OBJECTS) $(scribus_LDADD) $(LIBS)
-+	$(CXXLINK) $(LDFLAGS) $(scribus_LDFLAGS) $(scribus_OBJECTS) $(USER_LDFLAGS) $(scribus_LDADD) $(LIBS)
- .cpp.o:
- 	$(CXXCOMPILE) -c $<
- .cpp.obj:
+--- scribus/scpreview.cpp.orig	Wed Oct 15 18:44:36 2003
++++ scribus/scpreview.cpp	Wed Oct 15 19:39:15 2003
+@@ -11,6 +11,7 @@
+ #include <qdir.h>
+ #include <cmath>
+ #include <cstdlib>
++#include <iostream>
+ #include "missing.h"
+ extern float QStoFloat(QString in);
+ extern int QStoInt(QString in);
diff --git a/print/scribus/patches/patch-ab b/print/scribus/patches/patch-ab
new file mode 100644
index 00000000000..b166bfe4261
--- /dev/null
+++ b/print/scribus/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/10/29 20:54:51 reed Exp $
+
+--- scribus/mpalette.cpp.orig	Wed Oct 15 19:15:33 2003
++++ scribus/mpalette.cpp	Wed Oct 15 19:39:06 2003
+@@ -4,6 +4,7 @@
+ #include <qpoint.h>
+ #include <qwmatrix.h>
+ #include <qmessagebox.h>
++#include <iostream>
+ #include "query.h"
+ #include "scribusview.h"
+ extern QPixmap loadIcon(QString nam);