11 files changed, 367 insertions, 95 deletions

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 9e53b98b5a29..f9567b447b58 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,16 +7,10 @@
 #
 
 PORTNAME=	scribus
-PORTVERSION=	1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	print editors
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		http://scribus.planetmirror.com/ \
-		http://www.scribus.org.uk/downloads/${PORTVERSION}/ \
-		http://docs.scribus.net/releases/${PORTVERSION}/ \
-		http://web2.altmuehlnet.de/fschmid/ \
-		http://ahnews.music.salford.ac.uk/scribus/downloads/ \
-		http://mirrors.ntua.gr/Scribus/
-MASTER_SITE_SUBDIR=	apps/office
+MASTER_SITES=	http://www.scribus.org.uk/downloads/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
@@ -30,17 +24,23 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 USE_BZIP2=	yes
 USE_QT_VER=	3
-USE_GNOME=	libartlgpl2 gnometarget
+USE_GNOME=	gnometarget libartlgpl2 libxml2
 USE_GHOSTSCRIPT_RUN=	yes
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
-		%%PREFIX%%/lib/scribus/plugins
+USE_LIBTOOL_VER=	15
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
+MAN1=		scribus.1
+MANLANG=	"" pl
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CXXFLAGS+=	-fpermissive
+.endif
+
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO_MSG} ""
@@ -54,5 +54,7 @@ post-patch:
 		 s|-O2||g ; \
 		 s|2\.3|${PYTHON_VERSION:S/^python//}|g ; \
 		 s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/share/man|/man|g' ${WRKSRC}/scribus/manpages/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index c2088f696b2d..bc73e906e8c5 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (scribus-1.2.tar.bz2) = 7d2c2b228f9a6ff82c9401fd54bdbe16
-SIZE (scribus-1.2.tar.bz2) = 2282007
+MD5 (scribus-1.2.1.tar.bz2) = 002cb629e817722f4123df7a41fc824b
+SIZE (scribus-1.2.1.tar.bz2) = 6436083
diff --git a/print/scribus-devel/files/patch-admin-ltmain.sh b/print/scribus-devel/files/patch-admin-ltmain.sh
deleted file mode 100644
index 2a39aeb5fa11..000000000000
--- a/print/scribus-devel/files/patch-admin-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- admin/ltmain.sh.orig	Mon Jun  7 02:20:19 2004
-+++ admin/ltmain.sh	Mon Jun  7 02:24:08 2004
-@@ -1123,6 +1123,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1202,7 +1203,7 @@
-       -l*)
- 	if test "$arg" = "-lc"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
- 	    # These systems don't actually have c library (as such)
- 	    continue
- 	    ;;
-@@ -2744,7 +2745,7 @@
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -4622,10 +4623,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/print/scribus-devel/files/patch-scribus::helpbrowser.cpp b/print/scribus-devel/files/patch-scribus::helpbrowser.cpp
new file mode 100644
index 000000000000..c02deeb72aca
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::helpbrowser.cpp
@@ -0,0 +1,11 @@
+--- scribus/helpbrowser.cpp.orig	Fri Jan  7 05:18:30 2005
++++ scribus/helpbrowser.cpp	Mon Jan 10 22:11:45 2005
+@@ -58,7 +58,7 @@
+ 	QString fileName;
+ 	mHistory.clear();
+ 	struct histd his;
+-	language = guiLanguage=="" ? "en" : guiLanguage.left(2);
++	language = guiLanguage=="" ? QString( "en" ) : guiLanguage.left(2);
+ 	helpBrowsermainLayout = new QVBoxLayout( this); 
+ 	buttonLayout = new QHBoxLayout;
+ 	buttonLayout->setSpacing( 6 );
diff --git a/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp b/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
new file mode 100644
index 000000000000..acd6e36c2694
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
@@ -0,0 +1,11 @@
+--- scribus/plugins/fileloader/oodraw/sxwunzip.cpp.orig	Fri Dec 17 10:17:03 2004
++++ scribus/plugins/fileloader/oodraw/sxwunzip.cpp	Mon Jan 10 20:43:53 2005
+@@ -24,6 +24,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ # include <unistd.h>
+ # include <utime.h>
diff --git a/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp b/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
new file mode 100644
index 000000000000..905dea924193
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
@@ -0,0 +1,11 @@
+--- scribus/plugins/gettext/sxwim/sxwunzip.cpp.orig	Wed Dec 15 05:46:22 2004
++++ scribus/plugins/gettext/sxwim/sxwunzip.cpp	Mon Jan 10 20:34:50 2005
+@@ -26,6 +26,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #include <utime.h>
+ 
diff --git a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp
deleted file mode 100644
index 5bc93d8ee468..000000000000
--- a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/scriptplugin/cmdobj.cpp.orig	Tue Jul 13 05:24:03 2004
-+++ scribus/plugins/scriptplugin/cmdobj.cpp	Sun Aug 29 20:02:39 2004
-@@ -26,7 +26,7 @@
- 															Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen);
- 	Carrier->doc->ActPage->SetRectFrame(Carrier->doc->ActPage->Items.at(i));
- 	if (GetUniqueItem(QString(Name)) == NULL)
--		(Name != "") ? Carrier->doc->ActPage->Items.at(i)->AnName = QString(Name) : NULL;
-+		(Name != "") ? Carrier->doc->ActPage->Items.at(i)->AnName = QString(Name) : QString::null;
- /*	else
- 	{
- 		PyErr_SetString(PyExc_Exception, ERROBJ);
diff --git a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
new file mode 100644
index 000000000000..2982e2b88c51
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
@@ -0,0 +1,56 @@
+--- scribus/plugins/scriptplugin/scriptplugin.cpp.orig	Tue Jan  4 07:45:50 2005
++++ scribus/plugins/scriptplugin/scriptplugin.cpp	Mon Jan 10 21:21:27 2005
+@@ -52,6 +52,27 @@
+ #include <qtextstream.h>
+ #include <cstdlib>
+ 
++// XXX Implement strndup for FreeBSD.
++#ifdef __FreeBSD__
++#ifdef __cplusplus
++extern "C" {
++#endif
++static char *
++mystrndup(const char *str, int len) {
++    char *ret;
++
++    if ((str == NULL || len < 0)) return(NULL);
++    ret = (char *)malloc(len + 1);
++    if (ret == NULL) return(NULL);
++    memcpy(ret, str, len);
++    ret[len] = '\0';
++    return(ret);
++}
++#ifdef __cplusplus
++}
++#endif
++#endif
++
+ // Exceptions; visible from cmdvar.h, set up in initscribus()
+ PyObject* ScribusException;
+ PyObject* NoDocOpenError;
+@@ -499,8 +520,13 @@
+ {
+ 	/* Work around the braindead Python/C API not using 'const' for
+ 	 * strings it won't change. */
++#ifdef __FreeBSD__
++	char* newNameTemp = mystrndup(newName, strlen(newName));
++	char* oldNameTemp = mystrndup(oldName, strlen(oldName));
++#else
+ 	char* newNameTemp = strndup(newName, strlen(newName));
+ 	char* oldNameTemp = strndup(oldName, strlen(oldName));
++#endif
+ 	assert(newNameTemp != NULL);
+ 	assert(oldNameTemp != NULL);
+ 	/* We use PyMapping_GetItemString because unlike PyDict_GetItemString it
+@@ -563,7 +589,11 @@
+ 	 */
+ 	QCString utfTranslated = translated.utf8();
+ 	const char* trch = utfTranslated.data();
++#ifdef __FreeBSD__
++	return mystrndup(trch, strlen(trch));
++#else
+ 	return strndup(trch, strlen(trch));
++#endif
+ }
+ 
+ /* Now we're using the more pythonic convention for names:
diff --git a/print/scribus-devel/files/patch-scribus::utils.cpp b/print/scribus-devel/files/patch-scribus::utils.cpp
new file mode 100644
index 000000000000..2a4eb366ed78
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::utils.cpp
@@ -0,0 +1,10 @@
+--- scribus/util.cpp.orig	Fri Jan  7 04:04:34 2005
++++ scribus/util.cpp	Mon Jan 10 22:03:01 2005
+@@ -29,6 +29,7 @@
+ #include <qdir.h>
+ #include <qpointarray.h>
+ #include <qmessagebox.h>
++#include <algorithm>
+ #include <cstdlib>
+ #include <cmath>
+ #include <unistd.h>
diff --git a/print/scribus-devel/pkg-descr b/print/scribus-devel/pkg-descr
index b82bc46c35a2..5f700fe50c94 100644
--- a/print/scribus-devel/pkg-descr
+++ b/print/scribus-devel/pkg-descr
@@ -5,4 +5,4 @@ Scribus offers support for professional publishing features, such
 as CMYK color, easy PDF creation, Encapsulated Postscript import/export
 and creation of color separations.
 
-WWW: http://www.scribus.net/
+WWW: http://www.scribus.org.uk/
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index cab4c7ec41bd..23bc6dbe5d9c 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -23,6 +23,7 @@ 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
@@ -35,6 +36,9 @@ 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
@@ -53,6 +57,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
@@ -75,36 +80,64 @@ lib/scribus/dicts/hyph_sl.dic
 lib/scribus/dicts/hyph_sv.dic
 lib/scribus/dicts/hyph_uk.dic
 lib/scribus/import.prolog
+lib/scribus/libs/libabout.a
 lib/scribus/libs/libabout.so
 lib/scribus/libs/libabout.so.0
+lib/scribus/libs/libpdf.a
 lib/scribus/libs/libpdf.so
 lib/scribus/libs/libpdf.so.0
+lib/scribus/libs/libpostscript.a
 lib/scribus/libs/libpostscript.so
 lib/scribus/libs/libpostscript.so.0
+lib/scribus/libs/libpreferences.a
 lib/scribus/libs/libpreferences.so
 lib/scribus/libs/libpreferences.so.0
+lib/scribus/plugins/gettext/libcsvim.a
 lib/scribus/plugins/gettext/libcsvim.so
 lib/scribus/plugins/gettext/libcsvim.so.0
+lib/scribus/plugins/gettext/libhtmlim.a
+lib/scribus/plugins/gettext/libhtmlim.so
+lib/scribus/plugins/gettext/libhtmlim.so.0
+lib/scribus/plugins/gettext/libsxwimplugin.a
+lib/scribus/plugins/gettext/libsxwimplugin.so
+lib/scribus/plugins/gettext/libsxwimplugin.so.0
+lib/scribus/plugins/gettext/libtextfilterplugin.a
+lib/scribus/plugins/gettext/libtextfilterplugin.so
+lib/scribus/plugins/gettext/libtextfilterplugin.so.0
+lib/scribus/plugins/gettext/libtxtim.a
 lib/scribus/plugins/gettext/libtxtim.so
 lib/scribus/plugins/gettext/libtxtim.so.0
+lib/scribus/plugins/libcharselect.a
 lib/scribus/plugins/libcharselect.so
 lib/scribus/plugins/libcharselect.so.0
+lib/scribus/plugins/libfontpreview.a
 lib/scribus/plugins/libfontpreview.so
 lib/scribus/plugins/libfontpreview.so.0
+lib/scribus/plugins/libimportps.a
 lib/scribus/plugins/libimportps.so
 lib/scribus/plugins/libimportps.so.0
+lib/scribus/plugins/libnewfromtemplateplugin.a
 lib/scribus/plugins/libnewfromtemplateplugin.so
 lib/scribus/plugins/libnewfromtemplateplugin.so.0
+lib/scribus/plugins/liboodrawimp.a
+lib/scribus/plugins/liboodrawimp.so
+lib/scribus/plugins/liboodrawimp.so.0
+lib/scribus/plugins/libpreview.a
 lib/scribus/plugins/libpreview.so
 lib/scribus/plugins/libpreview.so.0
+lib/scribus/plugins/libsaveastemplateplugin.a
 lib/scribus/plugins/libsaveastemplateplugin.so
 lib/scribus/plugins/libsaveastemplateplugin.so.0
+lib/scribus/plugins/libscribusexportpixmap.a
 lib/scribus/plugins/libscribusexportpixmap.so
 lib/scribus/plugins/libscribusexportpixmap.so.0
+lib/scribus/plugins/libscriptplugin.a
 lib/scribus/plugins/libscriptplugin.so
 lib/scribus/plugins/libscriptplugin.so.0
+lib/scribus/plugins/libsvgexplugin.a
 lib/scribus/plugins/libsvgexplugin.so
 lib/scribus/plugins/libsvgexplugin.so.0
+lib/scribus/plugins/libsvgimplugin.a
 lib/scribus/plugins/libsvgimplugin.so
 lib/scribus/plugins/libsvgimplugin.so.0
 lib/scribus/profiles/ReadMe
@@ -112,6 +145,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
@@ -120,6 +154,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
@@ -128,39 +163,191 @@ 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
-%%DATADIR%%/doc/en/Scripter/Manual.css
-%%DATADIR%%/doc/en/Scripter/Scripter.png
-%%DATADIR%%/doc/en/Scripter/index.html
-%%DATADIR%%/doc/en/Scripter/node1.html
-%%DATADIR%%/doc/en/Scripter/node10.html
-%%DATADIR%%/doc/en/Scripter/node11.html
-%%DATADIR%%/doc/en/Scripter/node12.html
-%%DATADIR%%/doc/en/Scripter/node13.html
-%%DATADIR%%/doc/en/Scripter/node14.html
-%%DATADIR%%/doc/en/Scripter/node15.html
-%%DATADIR%%/doc/en/Scripter/node16.html
-%%DATADIR%%/doc/en/Scripter/node17.html
-%%DATADIR%%/doc/en/Scripter/node18.html
-%%DATADIR%%/doc/en/Scripter/node19.html
-%%DATADIR%%/doc/en/Scripter/node2.html
-%%DATADIR%%/doc/en/Scripter/node3.html
-%%DATADIR%%/doc/en/Scripter/node4.html
-%%DATADIR%%/doc/en/Scripter/node5.html
-%%DATADIR%%/doc/en/Scripter/node6.html
-%%DATADIR%%/doc/en/Scripter/node7.html
-%%DATADIR%%/doc/en/Scripter/node8.html
-%%DATADIR%%/doc/en/Scripter/node9.html
+lib/scribus/scribus.zh.qm
+%%DATADIR%%/doc/en/about1.html
+%%DATADIR%%/doc/en/about2.html
+%%DATADIR%%/doc/en/acroreader.html
+%%DATADIR%%/doc/en/cms.html
+%%DATADIR%%/doc/en/codingstandards.html
+%%DATADIR%%/doc/en/contributions.html
+%%DATADIR%%/doc/en/cross-platform.html
+%%DATADIR%%/doc/en/cups.html
+%%DATADIR%%/doc/en/cygwin.html
+%%DATADIR%%/doc/en/developers.html
+%%DATADIR%%/doc/en/docchanges.html
+%%DATADIR%%/doc/en/doccopyright.html
+%%DATADIR%%/doc/en/docinfo.html
+%%DATADIR%%/doc/en/documentation.html
+%%DATADIR%%/doc/en/download.html
+%%DATADIR%%/doc/en/faq1.html
+%%DATADIR%%/doc/en/faq2.html
+%%DATADIR%%/doc/en/faq3.html
+%%DATADIR%%/doc/en/fonts1.html
+%%DATADIR%%/doc/en/fonts2.html
+%%DATADIR%%/doc/en/fonts3.html
+%%DATADIR%%/doc/en/gettexthowto.html
+%%DATADIR%%/doc/en/gsadv.html
+%%DATADIR%%/doc/en/gsview.html
+%%DATADIR%%/doc/en/hyphenator.html
+%%DATADIR%%/doc/en/images/RDF.png
+%%DATADIR%%/doc/en/images/Scripter.png
+%%DATADIR%%/doc/en/images/Scripter_error_string.png
+%%DATADIR%%/doc/en/images/acro1.png
+%%DATADIR%%/doc/en/images/acro3.png
+%%DATADIR%%/doc/en/images/acroinfo.png
+%%DATADIR%%/doc/en/images/acropass.png
+%%DATADIR%%/doc/en/images/acrosec.png
+%%DATADIR%%/doc/en/images/batik1.png
+%%DATADIR%%/doc/en/images/cmsmodify1.png
+%%DATADIR%%/doc/en/images/cmspanel.png
+%%DATADIR%%/doc/en/images/colormanager2.png
+%%DATADIR%%/doc/en/images/colormgmtscreen.png
+%%DATADIR%%/doc/en/images/cups1.png
+%%DATADIR%%/doc/en/images/cups2.png
+%%DATADIR%%/doc/en/images/docheader1.png
+%%DATADIR%%/doc/en/images/docheader2.png
+%%DATADIR%%/doc/en/images/fontpref1.png
+%%DATADIR%%/doc/en/images/fontpref2.png
+%%DATADIR%%/doc/en/images/fontpref3.png
+%%DATADIR%%/doc/en/images/fontprev.png
+%%DATADIR%%/doc/en/images/fonts.png
+%%DATADIR%%/doc/en/images/formularz_export_PDF.png
+%%DATADIR%%/doc/en/images/formularz_js_skrypt.png
+%%DATADIR%%/doc/en/images/formularz_js_sprawdzanie.png
+%%DATADIR%%/doc/en/images/formularz_nowy.png
+%%DATADIR%%/doc/en/images/formularz_pole_num.png
+%%DATADIR%%/doc/en/images/gammagrayscale.png
+%%DATADIR%%/doc/en/images/gimpoptions1.png
+%%DATADIR%%/doc/en/images/gimpoptions2.png
+%%DATADIR%%/doc/en/images/gimpoptions3.png
+%%DATADIR%%/doc/en/images/gsadv1.png
+%%DATADIR%%/doc/en/images/gsadv2.png
+%%DATADIR%%/doc/en/images/gsadv3.png
+%%DATADIR%%/doc/en/images/hyphen1.png
+%%DATADIR%%/doc/en/images/hyphen2.png
+%%DATADIR%%/doc/en/images/hyphen3.png
+%%DATADIR%%/doc/en/images/inkscape.png
+%%DATADIR%%/doc/en/images/kfontinstaller.png
+%%DATADIR%%/doc/en/images/ksnapshot.png
+%%DATADIR%%/doc/en/images/monprof1.png
+%%DATADIR%%/doc/en/images/monprof2.png
+%%DATADIR%%/doc/en/images/monprof3.png
+%%DATADIR%%/doc/en/images/monprof4.png
+%%DATADIR%%/doc/en/images/pdfx3-1.png
+%%DATADIR%%/doc/en/images/pdfxcolor.png
+%%DATADIR%%/doc/en/images/pdfxintent.png
+%%DATADIR%%/doc/en/images/prefsblgrid1.png
+%%DATADIR%%/doc/en/images/prefsguides.png
+%%DATADIR%%/doc/en/images/prefspanel1.png
+%%DATADIR%%/doc/en/images/prefspanel2.png
+%%DATADIR%%/doc/en/images/prefspanel3.png
+%%DATADIR%%/doc/en/images/prefspanel4.png
+%%DATADIR%%/doc/en/images/prefspanel5.png
+%%DATADIR%%/doc/en/images/printer1.png
+%%DATADIR%%/doc/en/images/printer2.png
+%%DATADIR%%/doc/en/images/printer3.png
+%%DATADIR%%/doc/en/images/printpreview.png
+%%DATADIR%%/doc/en/images/printseps.png
+%%DATADIR%%/doc/en/images/pstoedit1.png
+%%DATADIR%%/doc/en/images/result.png
+%%DATADIR%%/doc/en/images/scribus2.png
+%%DATADIR%%/doc/en/images/scribuscms1.png
+%%DATADIR%%/doc/en/images/scribustru4.png
+%%DATADIR%%/doc/en/images/siatka_jednostki_miar.png
+%%DATADIR%%/doc/en/images/siatka_menu.png
+%%DATADIR%%/doc/en/images/spinbox1.png
+%%DATADIR%%/doc/en/images/svg1.png
+%%DATADIR%%/doc/en/images/symbole.png
+%%DATADIR%%/doc/en/images/ulica.png
+%%DATADIR%%/doc/en/images/wlasciwosci_pola.png
+%%DATADIR%%/doc/en/images/wyslij_formularz.png
+%%DATADIR%%/doc/en/images/xnview.png
+%%DATADIR%%/doc/en/importhints.html
+%%DATADIR%%/doc/en/importhints2.html
+%%DATADIR%%/doc/en/index.html
+%%DATADIR%%/doc/en/install-dpkg.html
+%%DATADIR%%/doc/en/install.html
+%%DATADIR%%/doc/en/install1.html
+%%DATADIR%%/doc/en/install2.html
+%%DATADIR%%/doc/en/install3.html
+%%DATADIR%%/doc/en/install4.html
+%%DATADIR%%/doc/en/intro.html
+%%DATADIR%%/doc/en/javascriptpdf.html
+%%DATADIR%%/doc/en/keys.html
+%%DATADIR%%/doc/en/machints1.html
+%%DATADIR%%/doc/en/machints2.html
+%%DATADIR%%/doc/en/menu.xml
+%%DATADIR%%/doc/en/moncal.html
+%%DATADIR%%/doc/en/otherinfo.html
+%%DATADIR%%/doc/en/parallel-install.html
+%%DATADIR%%/doc/en/pdf_form.html
+%%DATADIR%%/doc/en/pdfexport1.html
+%%DATADIR%%/doc/en/pdfexport2.html
+%%DATADIR%%/doc/en/pdfexport3.html
+%%DATADIR%%/doc/en/pdfexport4.html
+%%DATADIR%%/doc/en/pdfx3.html
+%%DATADIR%%/doc/en/plugin_howto.html
+%%DATADIR%%/doc/en/prepress.html
+%%DATADIR%%/doc/en/print1.html
+%%DATADIR%%/doc/en/print2.html
+%%DATADIR%%/doc/en/print3.html
+%%DATADIR%%/doc/en/resources.html
+%%DATADIR%%/doc/en/screenshots.html
+%%DATADIR%%/doc/en/scribus-svg.html
+%%DATADIR%%/doc/en/scribuscopyright.html
+%%DATADIR%%/doc/en/scribusfileformat.html
+%%DATADIR%%/doc/en/scripter-faq.html
+%%DATADIR%%/doc/en/scripter1.html
+%%DATADIR%%/doc/en/scripterapi-PDFfile.html
+%%DATADIR%%/doc/en/scripterapi-Printer.html
+%%DATADIR%%/doc/en/scripterapi-color.html
+%%DATADIR%%/doc/en/scripterapi-constants.html
+%%DATADIR%%/doc/en/scripterapi-dialogs.html
+%%DATADIR%%/doc/en/scripterapi-doc.html
+%%DATADIR%%/doc/en/scripterapi-font.html
+%%DATADIR%%/doc/en/scripterapi-getobjprop.html
+%%DATADIR%%/doc/en/scripterapi-layer.html
+%%DATADIR%%/doc/en/scripterapi-manobj.html
+%%DATADIR%%/doc/en/scripterapi-object.html
+%%DATADIR%%/doc/en/scripterapi-page.html
+%%DATADIR%%/doc/en/scripterapi-pydoc.html
+%%DATADIR%%/doc/en/scripterapi-select.html
+%%DATADIR%%/doc/en/scripterapi-setobjprop.html
+%%DATADIR%%/doc/en/scripterapi-textframes.html
+%%DATADIR%%/doc/en/scripterapi.html
+%%DATADIR%%/doc/en/settings1.html
+%%DATADIR%%/doc/en/specs.html
+%%DATADIR%%/doc/en/toolbox.html
+%%DATADIR%%/doc/en/toolbox1.html
+%%DATADIR%%/doc/en/toolbox10.html
+%%DATADIR%%/doc/en/toolbox11.html
+%%DATADIR%%/doc/en/toolbox12.html
+%%DATADIR%%/doc/en/toolbox13.html
+%%DATADIR%%/doc/en/toolbox2.html
+%%DATADIR%%/doc/en/toolbox3.html
+%%DATADIR%%/doc/en/toolbox4.html
+%%DATADIR%%/doc/en/toolbox5.html
+%%DATADIR%%/doc/en/toolbox6.html
+%%DATADIR%%/doc/en/toolbox7.html
+%%DATADIR%%/doc/en/toolbox8.html
+%%DATADIR%%/doc/en/toolbox9.html
+%%DATADIR%%/doc/en/topten.html
+%%DATADIR%%/doc/en/translation_howto.html
+%%DATADIR%%/doc/en/tutorials.html
+%%DATADIR%%/doc/en/wine.html
 %%DATADIR%%/icons/AddNode.png
 %%DATADIR%%/icons/AddPoint.png
 %%DATADIR%%/icons/AppIcon.png
@@ -232,6 +419,7 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/icons/Winkel.xpm
 %%DATADIR%%/icons/Zeichen.xpm
 %%DATADIR%%/icons/acrobat.png
+%%DATADIR%%/icons/addf.png
 %%DATADIR%%/icons/back.png
 %%DATADIR%%/icons/beziertool.png
 %%DATADIR%%/icons/bottom.png
@@ -272,6 +460,9 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/icons/nftabout.xpm
 %%DATADIR%%/icons/nftinfo.xpm
 %%DATADIR%%/icons/ok.png
+%%DATADIR%%/icons/ok22.png
+%%DATADIR%%/icons/ooo_draw.png
+%%DATADIR%%/icons/ooo_writer.png
 %%DATADIR%%/icons/outlined.png
 %%DATADIR%%/icons/pdf.png
 %%DATADIR%%/icons/penciladd.png
@@ -280,6 +471,7 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/icons/pushbutton.png
 %%DATADIR%%/icons/reload.png
 %%DATADIR%%/icons/reload16.png
+%%DATADIR%%/icons/removef.png
 %%DATADIR%%/icons/revert.png
 %%DATADIR%%/icons/rotate_ccw.png
 %%DATADIR%%/icons/rotate_cw.png
@@ -308,6 +500,7 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/icons/txt.png
 %%DATADIR%%/icons/unlock.png
 %%DATADIR%%/icons/up.png
+%%DATADIR%%/icons/vectorgfx.png
 %%DATADIR%%/icons/view.png
 %%DATADIR%%/icons/vmirror.png
 %%DATADIR%%/samples/3columnA4.py
@@ -316,6 +509,7 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/samples/LoremIpsum.txt
 %%DATADIR%%/samples/ReadMe
 %%DATADIR%%/samples/Sample1.py
+%%DATADIR%%/samples/boilerplate.py
 %%DATADIR%%/samples/golden-mean.py
 %%DATADIR%%/samples/htmlimport.py
 %%DATADIR%%/samples/legende.py
@@ -325,14 +519,43 @@ lib/scribus/scribus.uk.qm
 %%DATADIR%%/samples/quote.py
 %%DATADIR%%/samples/trait_de_coupe.py
 %%DATADIR%%/samples/wordcount.py
+%%DATADIR%%/scripts/COPYING
+%%DATADIR%%/scripts/ChangeLog
 %%DATADIR%%/scripts/FontSample.py
+%%DATADIR%%/scripts/NEWS
 %%DATADIR%%/scripts/ReadMe
-%%DATADIR%%/templates/Readme
+%%DATADIR%%/scripts/TODO
+%%DATADIR%%/templates/br1/br1.png
+%%DATADIR%%/templates/br1/br1.sla.gz
+%%DATADIR%%/templates/br1/br1tn.png
+%%DATADIR%%/templates/br1/map.jpg
+%%DATADIR%%/templates/nl1/kites.jpg
+%%DATADIR%%/templates/nl1/nl1.png
+%%DATADIR%%/templates/nl1/nl1.sla.gz
+%%DATADIR%%/templates/nl1/nl1tn.png
+%%DATADIR%%/templates/nl2/flowers.jpg
+%%DATADIR%%/templates/nl2/nl2.png
+%%DATADIR%%/templates/nl2/nl2.sla.gz
+%%DATADIR%%/templates/nl2/nl2tn.png
+%%DATADIR%%/templates/sc_presentation/presentation.png
+%%DATADIR%%/templates/sc_presentation/presentation.sla.gz
+%%DATADIR%%/templates/sc_presentation/presentationtn.png
+%%DATADIR%%/templates/template.xml
+%%DATADIR%%/templates/textbased/an_image.jpg
+%%DATADIR%%/templates/textbased/author.jpg
+%%DATADIR%%/templates/textbased/textbased.png
+%%DATADIR%%/templates/textbased/textbased.sla.gz
+%%DATADIR%%/templates/textbased/textbasedtn.png
+@dirrm %%DATADIR%%/templates/textbased
+@dirrm %%DATADIR%%/templates/sc_presentation
+@dirrm %%DATADIR%%/templates/nl2
+@dirrm %%DATADIR%%/templates/nl1
+@dirrm %%DATADIR%%/templates/br1
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/doc/en/Scripter
+@dirrm %%DATADIR%%/doc/en/images
 @dirrm %%DATADIR%%/doc/en
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%