Update to 0.41.

12 files changed, 178 insertions, 380 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index b871b9991198..4ebaaa902ac0 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	inkscape
-PORTVERSION=	0.38.1
-PORTREVISION=	3
+PORTVERSION=	0.41
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,42 +16,34 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program seeks to become a full featured open source SVG editor
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		gc.1:${PORTSDIR}/devel/boehm-gc \
+		gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 RUN_DEPENDS=	${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack intlhack libglade2 libartlgpl2 \
-		desktopfileutils libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libxslt
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_GCC=	3.4
 CONFIGURE_ARGS=	--with-popt \
 		--with-gnome-print
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -L${LOCALBASE}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE} ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -L${LOCALBASE} ${PTHREAD_LIBS}"
 
 MAN1=		inkscape.1 inkview.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-old_gcc_bugs
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
-		${WRKSRC}/src/helper/action.cpp \
-		${WRKSRC}/src/libarikkei/arikkei-token.cpp
-	@${REINPLACE_CMD} -e 's|round|rint|g' \
-		${WRKSRC}/src/livarot/Shape.h \
-		${WRKSRC}/src/object-edit.cpp \
-		${WRKSRC}/src/spiral-context.cpp \
-		${WRKSRC}/src/star-context.cpp
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|<stdint.h>|<sys/types.h>|g' \
-		${WRKSRC}/src/livarot/*.h
-	@${REINPLACE_CMD} -e 's|isfinite|!isinf|g' \
-		${WRKSRC}/src/helper/*.cpp
-.endif
-
-.include <bsd.port.post.mk>
+patch-autotools:
+	@(cd ${PATCH_WRKSRC}; \
+	for file in ${LIBTOOLFILES}; do \
+		${CP} $$file $$file.tmp; \
+		${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
+			$$file.tmp > $$file; \
+		${RM} $$file.tmp; \
+	done);
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 6e6ee44a7f03..5e5c3a8ad7bf 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,2 +1,2 @@
-MD5 (inkscape-0.38.1.tar.gz) = ea486c528649a34827b74077ffd2076c
-SIZE (inkscape-0.38.1.tar.gz) = 3301980
+MD5 (inkscape-0.41.tar.gz) = 989a09d06e4db1ddfd00b8019a5dcd73
+SIZE (inkscape-0.41.tar.gz) = 6090081
diff --git a/graphics/inkscape/files/extra-patch-old_gcc_bugs b/graphics/inkscape/files/extra-patch-old_gcc_bugs
deleted file mode 100644
index 3ae87ef85fae..000000000000
--- a/graphics/inkscape/files/extra-patch-old_gcc_bugs
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/dialogs/desktop-properties.cpp.orig	Mon Apr 12 11:12:20 2004
-+++ src/dialogs/desktop-properties.cpp	Mon Apr 12 11:11:10 2004
-@@ -11,7 +11,6 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
--#include <locale>
- #include <sstream>
- 
- #include <config.h>
-@@ -266,7 +265,6 @@
-         gdouble vbWidth  = (gdouble)atof(sp_repr_attr (repr, "width"))  * 1.25;
-         gdouble vbHeight = (gdouble)atof(sp_repr_attr (repr, "height")) * 1.25;
-         std::ostringstream os;
--        os.imbue(std::locale::classic());
-         os.setf(std::ios::showpoint);
-         os.precision(8);
-         os << "0 0 " << vbWidth << " " << vbHeight;
---- src/document.cpp.orig	Mon Apr 12 10:42:05 2004
-+++ src/document.cpp	Mon Apr 12 10:42:12 2004
-@@ -42,7 +42,6 @@
- 
- #define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 1)
- 
--#include <locale>
- #include <sstream>
- 
- enum {
---- src/libnr/nr-rect.h.orig	Mon Apr 12 09:28:10 2004
-+++ src/libnr/nr-rect.h	Mon Apr 12 09:29:19 2004
-@@ -107,6 +107,33 @@
- 	/** returns the midpoint of this rect. */
- 	Point midpoint() const;
- 	
-+private:
-+    template <NR::Dim2 axis>
-+    double extent() const {
-+        return _max[axis] - _min[axis];
-+    }
-+
-+	template <Dim2 axis>
-+	bool isEmpty() const {
-+		return !( _min[axis] < _max[axis] );
-+	}
-+
-+	template <Dim2 axis>
-+	bool intersects(const Rect &r) const {
-+		return _max[axis] >= r._min[axis] && _min[axis] <= r._max[axis];
-+	}
-+
-+	template <Dim2 axis>
-+	bool contains(const Rect &r) const {
-+		return contains(r._min) && contains(r._max);
-+	}
-+
-+	template <Dim2 axis>
-+	bool contains(const Point &p) const {
-+		return p[axis] >= _min[axis] && p[axis] <= _max[axis];
-+	}
-+
-+public:
- 	/** does this rectangle have zero area? */
- 	bool isEmpty() const {
- 		return isEmpty<X>() && isEmpty<Y>();
-@@ -162,31 +189,6 @@
- 
- private:
- 	Rect() {}
--
--    template <NR::Dim2 axis>
--    double extent() const {
--        return _max[axis] - _min[axis];
--    }
--
--	template <Dim2 axis>
--	bool isEmpty() const {
--		return !( _min[axis] < _max[axis] );
--	}
--
--	template <Dim2 axis>
--	bool intersects(const Rect &r) const {
--		return _max[axis] >= r._min[axis] && _min[axis] <= r._max[axis];
--	}
--
--	template <Dim2 axis>
--	bool contains(const Rect &r) const {
--		return contains(r._min) && contains(r._max);
--	}
--
--	template <Dim2 axis>
--	bool contains(const Point &p) const {
--		return p[axis] >= _min[axis] && p[axis] <= _max[axis];
--	}
- 
- 	Point _min, _max;
- 
---- src/svg/stringstream.h.orig	Sat Apr 10 04:39:51 2004
-+++ src/svg/stringstream.h	Sat Apr 10 04:44:36 2004
-@@ -9,7 +9,6 @@
- 
- 	public:
- 		SVGOStringStream() {
--			this->imbue(std::locale::classic());
- 			this->setf(std::ios::showpoint);
- 			this->precision(8);
- 		}
---- src/svg/svg-path.cpp.orig	Mon Apr 12 11:16:05 2004
-+++ src/svg/svg-path.cpp	Mon Apr 12 11:15:56 2004
-@@ -33,7 +33,6 @@
- #include "svg.h"
- #include "stringstream.h"
- 
--#include <locale>
- #include <sstream>
- 
- /* This module parses an SVG path element into an RsvgBpathDef.
diff --git a/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp b/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp
new file mode 100644
index 000000000000..9eb52b6517e4
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp
@@ -0,0 +1,11 @@
+--- src/dialogs/clonetiler.cpp.orig	Fri Feb 18 02:32:13 2005
++++ src/dialogs/clonetiler.cpp	Fri Feb 18 02:33:24 2005
+@@ -868,7 +868,7 @@
+ clonetiler_xy_changed (GtkAdjustment *adj, gpointer data)
+ {
+     const gchar *pref = (const gchar *) data;
+-    prefs_set_int_attribute ("dialogs.clonetiler", pref, (int) round(adj->value));
++    prefs_set_int_attribute ("dialogs.clonetiler", pref, (int) rint(adj->value));
+ }
+ 
+ static void
diff --git a/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp b/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp
new file mode 100644
index 000000000000..bc44302eb7c8
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp
@@ -0,0 +1,16 @@
+--- src/extension/internal/gnome.cpp.orig	Fri Feb 18 02:44:53 2005
++++ src/extension/internal/gnome.cpp	Fri Feb 18 02:45:56 2005
+@@ -183,6 +183,13 @@
+     return 0;
+ }
+ 
++unsigned int PrintGNOME::comment (Inkscape::Extension::Print * module,
++					const char * comment)
++{
++    // ignore comment
++    return 0;
++}
++
+ unsigned int
+ PrintGNOME::fill(Inkscape::Extension::Print *mod,
+ 		 NRBPath const *bpath, NRMatrix const *ctm, SPStyle const *style,
diff --git a/graphics/inkscape/files/patch-src::knotholder.cpp b/graphics/inkscape/files/patch-src::knotholder.cpp
deleted file mode 100644
index 0c5e31968607..000000000000
--- a/graphics/inkscape/files/patch-src::knotholder.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/knotholder.cpp.orig	Fri Apr 16 23:02:03 2004
-+++ src/knotholder.cpp	Sat Apr 17 01:22:19 2004
-@@ -164,7 +164,7 @@
- 	} else {
- 		SPObject *object = (SPObject *) kh->item;
- 		sp_object_invoke_write (object, object->repr, SP_OBJECT_WRITE_EXT);
--		sp_document_done (SP_OBJECT_DOCUMENT (kh->item));
-+		sp_document_done (SP_OBJECT_DOCUMENT (object));
- 	}
- }
- 
diff --git a/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
index 359ab2d6b0d6..e8da0f994792 100644
--- a/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
+++ b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
@@ -4,7 +4,7 @@
   * This code is in public domain
   */
  
-+#include <stdio.h>
++#include <cstdio>
  #include "nr-matrix.h"
  
  NRMatrix *
diff --git a/graphics/inkscape/files/patch-src::libnr::nr-maybe.h b/graphics/inkscape/files/patch-src::libnr::nr-maybe.h
deleted file mode 100644
index d7ce3dba1a30..000000000000
--- a/graphics/inkscape/files/patch-src::libnr::nr-maybe.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/libnr/nr-maybe.h.orig	Mon Aug  2 11:58:44 2004
-+++ src/libnr/nr-maybe.h	Mon Aug  2 11:59:21 2004
-@@ -18,13 +18,14 @@
- 
- #include <stdexcept>
- #include <typeinfo>
-+#include <string>
- 
- namespace NR {
- 
- /** An exception class for run-time type errors */
- template <typename T>
- class IsNot : public std::domain_error {
--    IsNot() : domain_error(string("Is not ") + typeid(T).name()) {}
-+    IsNot() : domain_error(std::string("Is not ") + typeid(T).name()) {}
- };
- 
- /** A type with only one value, which (in principle) is only equal to itself.
diff --git a/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
index bf21ea2a4790..aa01b7d1a422 100644
--- a/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
+++ b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
@@ -1,9 +1,9 @@
---- src/livarot/PathOutline.cpp.orig	Sat Apr 10 04:09:41 2004
-+++ src/livarot/PathOutline.cpp	Sat Apr 10 04:34:35 2004
+--- src/livarot/PathOutline.cpp.orig	Sat Oct 23 12:10:52 2004
++++ src/livarot/PathOutline.cpp	Fri Feb 18 00:28:16 2005
 @@ -9,6 +9,7 @@
- #include "Path.h"
- //#include "MyMath.h"
- #include <math.h>
+ #include "livarot/Path.h"
+ #include "livarot/path-description.h"
+ #include <cmath>
 +#include <algorithm>
  #include <libnr/nr-point-fns.h>
  
diff --git a/graphics/inkscape/files/patch-src::main.cpp b/graphics/inkscape/files/patch-src::main.cpp
deleted file mode 100644
index 4e97db192993..000000000000
--- a/graphics/inkscape/files/patch-src::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cpp.orig	Fri Jan 30 15:23:48 2004
-+++ src/main.cpp	Fri Jan 30 15:24:10 2004
-@@ -200,7 +200,7 @@
- 	}
- 
- #ifdef HAVE_FPSETMASK
--	fpresetsticky(FP_X_DZ|FP_X_INV);
-+	fpsetsticky(FP_X_DZ|FP_X_INV);
- 	fpsetmask(FP_X_DZ|FP_X_INV);
- #endif
- 	return result;
diff --git a/graphics/inkscape/files/patch-src::object-edit.cpp b/graphics/inkscape/files/patch-src::object-edit.cpp
new file mode 100644
index 000000000000..5d53ed22d4e6
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::object-edit.cpp
@@ -0,0 +1,11 @@
+--- src/object-edit.cpp.orig	Fri Feb 18 02:09:25 2005
++++ src/object-edit.cpp	Fri Feb 18 02:25:08 2005
+@@ -839,7 +839,7 @@
+ 			spiral->rad = rad_new;
+ 			spiral->t0 = pow (r0 / spiral->rad, 1/spiral->exp);
+ 		}
+-		if (!std::isfinite(spiral->t0)) spiral->t0 = 0.0;
++		if (isinf(spiral->t0)) spiral->t0 = 0.0;
+ 		spiral->t0 = CLAMP (spiral->t0, 0.0, 0.999);	
+ 	}
+ 
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index d4d90c29958c..c569be72e1b0 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,197 +1,112 @@
 bin/inkscape
 bin/inkview
-lib/inkscape/extensions/SpSVG.pm
-lib/inkscape/extensions/dia2svg.sh
-lib/inkscape/extensions/ill2svg.pl
-lib/inkscape/extensions/roundhole
-lib/inkscape/extensions/svg_dropshadow
-lib/inkscape/extensions/txt2svg.pl
+lib/inkscape/plugins/libgimpgrad.a
+lib/inkscape/plugins/libgimpgrad.so
+lib/inkscape/plugins/libgimpgrad.so.0
+lib/inkscape/plugins/libgrid.a
+lib/inkscape/plugins/libgrid.so
+lib/inkscape/plugins/libgrid.so.0
 share/gnome/applications/inkscape.desktop
 @exec update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/inkscape/extensions/roundhole.xpm
-share/gnome/inkscape/icons/add.xpm
-share/gnome/inkscape/icons/add_xml_element_node.xpm
-share/gnome/inkscape/icons/add_xml_text_node.xpm
-share/gnome/inkscape/icons/al_bottom_in.xpm
-share/gnome/inkscape/icons/al_bottom_out.xpm
-share/gnome/inkscape/icons/al_center_hor.xpm
-share/gnome/inkscape/icons/al_center_ver.xpm
-share/gnome/inkscape/icons/al_left_in.xpm
-share/gnome/inkscape/icons/al_left_out.xpm
-share/gnome/inkscape/icons/al_right_in.xpm
-share/gnome/inkscape/icons/al_right_out.xpm
-share/gnome/inkscape/icons/al_top_in.xpm
-share/gnome/inkscape/icons/al_top_out.xpm
-share/gnome/inkscape/icons/align_bc.xpm
-share/gnome/inkscape/icons/align_bl.xpm
-share/gnome/inkscape/icons/align_br.xpm
-share/gnome/inkscape/icons/align_cc.xpm
-share/gnome/inkscape/icons/align_cl.xpm
-share/gnome/inkscape/icons/align_cr.xpm
-share/gnome/inkscape/icons/align_tc.xpm
-share/gnome/inkscape/icons/align_tl.xpm
-share/gnome/inkscape/icons/align_tr.xpm
-share/gnome/inkscape/icons/angle_180.xpm
-share/gnome/inkscape/icons/angle_270.xpm
-share/gnome/inkscape/icons/angle_90.xpm
-share/gnome/inkscape/icons/angle_any.xpm
-share/gnome/inkscape/icons/arrows_hor.xpm
-share/gnome/inkscape/icons/arrows_ver.xpm
-share/gnome/inkscape/icons/cap_butt.xpm
-share/gnome/inkscape/icons/cap_round.xpm
-share/gnome/inkscape/icons/cap_square.xpm
-share/gnome/inkscape/icons/clear.xpm
-share/gnome/inkscape/icons/create_new.xpm
-share/gnome/inkscape/icons/curve.xpm
-share/gnome/inkscape/icons/cusp.xpm
-share/gnome/inkscape/icons/del.xpm
-share/gnome/inkscape/icons/delete_xml_attribute.xpm
-share/gnome/inkscape/icons/delete_xml_node.xpm
-share/gnome/inkscape/icons/dimension_hor.xpm
-share/gnome/inkscape/icons/dimension_ver.xpm
-share/gnome/inkscape/icons/div.xpm
-share/gnome/inkscape/icons/draw_arc.xpm
-share/gnome/inkscape/icons/draw_dynahand.xpm
-share/gnome/inkscape/icons/draw_freehand.xpm
-share/gnome/inkscape/icons/draw_node.xpm
-share/gnome/inkscape/icons/draw_pen.xpm
-share/gnome/inkscape/icons/draw_rect.xpm
-share/gnome/inkscape/icons/draw_select.xpm
-share/gnome/inkscape/icons/draw_spiral.xpm
-share/gnome/inkscape/icons/draw_star.xpm
-share/gnome/inkscape/icons/draw_text.xpm
-share/gnome/inkscape/icons/draw_zoom.xpm
-share/gnome/inkscape/icons/dt_active.xpm
-share/gnome/inkscape/icons/dt_inactive.xpm
-share/gnome/inkscape/icons/duplicate.xpm
-share/gnome/inkscape/icons/duplicate_xml_node.xpm
-share/gnome/inkscape/icons/edge_down.xpm
-share/gnome/inkscape/icons/edge_up.xpm
-share/gnome/inkscape/icons/edit_copy.xpm
-share/gnome/inkscape/icons/edit_cut.xpm
-share/gnome/inkscape/icons/edit_delete.xpm
-share/gnome/inkscape/icons/edit_duplicate.xpm
-share/gnome/inkscape/icons/edit_paste.xpm
-share/gnome/inkscape/icons/edit_redo.xpm
-share/gnome/inkscape/icons/edit_undo.xpm
-share/gnome/inkscape/icons/ellipse.xpm
-share/gnome/inkscape/icons/file_export.xpm
-share/gnome/inkscape/icons/file_import.xpm
-share/gnome/inkscape/icons/file_new.xpm
-share/gnome/inkscape/icons/file_open.xpm
-share/gnome/inkscape/icons/file_print.xpm
-share/gnome/inkscape/icons/file_print_preview.xpm
-share/gnome/inkscape/icons/file_save.xpm
-share/gnome/inkscape/icons/file_save_as.xpm
-share/gnome/inkscape/icons/fill.xpm
-share/gnome/inkscape/icons/fill_fractal.xpm
-share/gnome/inkscape/icons/fill_gradient.xpm
-share/gnome/inkscape/icons/fill_none.xpm
-share/gnome/inkscape/icons/fill_pattern.xpm
-share/gnome/inkscape/icons/fill_radial.xpm
-share/gnome/inkscape/icons/fill_solid.xpm
-share/gnome/inkscape/icons/flip_hor.xpm
-share/gnome/inkscape/icons/flip_ver.xpm
-share/gnome/inkscape/icons/font.xpm
-share/gnome/inkscape/icons/forward.xpm
-share/gnome/inkscape/icons/freehand.xpm
-share/gnome/inkscape/icons/guide_dialog.png
+share/gnome/inkscape/clipart/README
+share/gnome/inkscape/clipart/README-ribbon.txt
+share/gnome/inkscape/clipart/inkscape.logo.svg
+share/gnome/inkscape/clipart/orav.svg
+share/gnome/inkscape/clipart/ribbon.svg
+share/gnome/inkscape/clipart/tux.png
+share/gnome/inkscape/clipart/tux.svg
+share/gnome/inkscape/examples/README
+share/gnome/inkscape/examples/art-nouveau-P3.svg
+share/gnome/inkscape/examples/data_uri.svg
+share/gnome/inkscape/examples/eastern-motive-P4G.svg
+share/gnome/inkscape/examples/flowsample.svg
+share/gnome/inkscape/examples/gradient.svg
+share/gnome/inkscape/examples/i18n.svg
+share/gnome/inkscape/examples/istest.pov
+share/gnome/inkscape/examples/markers.svg
+share/gnome/inkscape/examples/stars.svgz
+share/gnome/inkscape/examples/tesselation-P3.svg
+share/gnome/inkscape/examples/text-on-path.svg
+share/gnome/inkscape/examples/tiger.svgz
+share/gnome/inkscape/extensions/SpSVG.pm
+share/gnome/inkscape/extensions/ai_input.inx
+share/gnome/inkscape/extensions/ai_output.inx
+share/gnome/inkscape/extensions/dia.inx
+share/gnome/inkscape/extensions/dia2svg.sh
+share/gnome/inkscape/extensions/dropshadow.inx
+share/gnome/inkscape/extensions/embed_raster_in_svg.pl
+share/gnome/inkscape/extensions/eps_input.inx
+share/gnome/inkscape/extensions/epsi_output.inx
+share/gnome/inkscape/extensions/gimpgrad.inx
+share/gnome/inkscape/extensions/grid.inx
+share/gnome/inkscape/extensions/ill2svg.pl
+share/gnome/inkscape/extensions/inkscape-shadow-white.sh
+share/gnome/inkscape/extensions/inkscape-shadow.sh
+share/gnome/inkscape/extensions/ps2epsi.sh
+share/gnome/inkscape/extensions/ps_input.inx
+share/gnome/inkscape/extensions/sk2svg.sh
+share/gnome/inkscape/extensions/sk_input.inx
+share/gnome/inkscape/extensions/svg_dropshadow
+share/gnome/inkscape/extensions/svgz_input.inx
+share/gnome/inkscape/extensions/svgz_output.inx
+share/gnome/inkscape/extensions/txt2svg.inx
+share/gnome/inkscape/extensions/txt2svg.pl
+share/gnome/inkscape/extensions/wmf_input.inx
+share/gnome/inkscape/fonts/README
+share/gnome/inkscape/gradients/README
 share/gnome/inkscape/icons/icons.svg
-share/gnome/inkscape/icons/join.xpm
-share/gnome/inkscape/icons/join_bevel.xpm
-share/gnome/inkscape/icons/join_miter.xpm
-share/gnome/inkscape/icons/join_round.xpm
-share/gnome/inkscape/icons/line.xpm
-share/gnome/inkscape/icons/line_dashed.xpm
-share/gnome/inkscape/icons/line_doubled.xpm
-share/gnome/inkscape/icons/line_full.xpm
-share/gnome/inkscape/icons/lock_aspect_no.xpm
-share/gnome/inkscape/icons/lock_aspect_yes.xpm
-share/gnome/inkscape/icons/marker_arrow_end.xpm
-share/gnome/inkscape/icons/marker_arrow_start.xpm
-share/gnome/inkscape/icons/marker_none_end.xpm
-share/gnome/inkscape/icons/marker_none_start.xpm
-share/gnome/inkscape/icons/marker_triangle_end.xpm
-share/gnome/inkscape/icons/marker_triangle_start.xpm
-share/gnome/inkscape/icons/move.xpm
-share/gnome/inkscape/icons/object_align.xpm
-share/gnome/inkscape/icons/object_fill.xpm
-share/gnome/inkscape/icons/object_flip_hor.xpm
-share/gnome/inkscape/icons/object_flip_ver.xpm
-share/gnome/inkscape/icons/object_font.xpm
-share/gnome/inkscape/icons/object_layout.xpm
-share/gnome/inkscape/icons/object_reset.xpm
-share/gnome/inkscape/icons/object_rotate.xpm
-share/gnome/inkscape/icons/object_stroke.xpm
-share/gnome/inkscape/icons/object_tocurve.xpm
-share/gnome/inkscape/icons/object_trans.xpm
-share/gnome/inkscape/icons/origin.xpm
-share/gnome/inkscape/icons/properties_fill.xpm
-share/gnome/inkscape/icons/properties_layout.xpm
-share/gnome/inkscape/icons/properties_stroke.xpm
-share/gnome/inkscape/icons/quit_nope.xpm
-share/gnome/inkscape/icons/quit_yep.xpm
-share/gnome/inkscape/icons/rect.xpm
-share/gnome/inkscape/icons/reread.xpm
-share/gnome/inkscape/icons/rotate.xpm
-share/gnome/inkscape/icons/rotate_left.xpm
-share/gnome/inkscape/icons/rotate_right.xpm
-share/gnome/inkscape/icons/scale.xpm
-share/gnome/inkscape/icons/scale_hor.xpm
-share/gnome/inkscape/icons/scale_ver.xpm
-share/gnome/inkscape/icons/select.xpm
-share/gnome/inkscape/icons/selection_bot.xpm
-share/gnome/inkscape/icons/selection_break.xpm
-share/gnome/inkscape/icons/selection_combine.xpm
-share/gnome/inkscape/icons/selection_down.xpm
-share/gnome/inkscape/icons/selection_group.xpm
-share/gnome/inkscape/icons/selection_top.xpm
-share/gnome/inkscape/icons/selection_ungroup.xpm
-share/gnome/inkscape/icons/selection_up.xpm
-share/gnome/inkscape/icons/seperate_tool.xpm
-share/gnome/inkscape/icons/set.xpm
-share/gnome/inkscape/icons/skew.xpm
-share/gnome/inkscape/icons/skew_hor.xpm
-share/gnome/inkscape/icons/skew_ver.xpm
-share/gnome/inkscape/icons/smooth.xpm
-share/gnome/inkscape/icons/stroke.xpm
-share/gnome/inkscape/icons/sym.xpm
-share/gnome/inkscape/icons/text.xpm
-share/gnome/inkscape/icons/toback.xpm
-share/gnome/inkscape/icons/tofront.xpm
-share/gnome/inkscape/icons/toolbox_draw.xpm
-share/gnome/inkscape/icons/toolbox_edit.xpm
-share/gnome/inkscape/icons/toolbox_file.xpm
-share/gnome/inkscape/icons/toolbox_node.xpm
-share/gnome/inkscape/icons/toolbox_object.xpm
-share/gnome/inkscape/icons/toolbox_select.xpm
-share/gnome/inkscape/icons/toolbox_zoom.xpm
-share/gnome/inkscape/icons/unknown.xpm
-share/gnome/inkscape/icons/writing_mode_lr.xpm
-share/gnome/inkscape/icons/writing_mode_tb.xpm
-share/gnome/inkscape/icons/zoom.xpm
-share/gnome/inkscape/icons/zoom_1_to_1.xpm
-share/gnome/inkscape/icons/zoom_1_to_2.xpm
-share/gnome/inkscape/icons/zoom_2_to_1.xpm
-share/gnome/inkscape/icons/zoom_draw.xpm
-share/gnome/inkscape/icons/zoom_in.xpm
-share/gnome/inkscape/icons/zoom_out.xpm
-share/gnome/inkscape/icons/zoom_page.xpm
-share/gnome/inkscape/icons/zoom_select.xpm
-share/gnome/inkscape/modules/ai_input.inkmod
-share/gnome/inkscape/modules/dia.inkmod
-share/gnome/inkscape/modules/dropshadow.inkmod
-share/gnome/inkscape/modules/roundhole.inkmod
-share/gnome/inkscape/modules/svgz_input.inkmod
-share/gnome/inkscape/modules/svgz_output.inkmod
-share/gnome/inkscape/modules/txt2svg.inkmod
+share/gnome/inkscape/keyboards/README
+share/gnome/inkscape/markers/markers.svg
+share/gnome/inkscape/palettes/README
+share/gnome/inkscape/patterns/README
 share/gnome/inkscape/screens/about.svg
+share/gnome/inkscape/screens/keys.sl.svg
 share/gnome/inkscape/screens/keys.svg
+share/gnome/inkscape/templates/A4.svg
+share/gnome/inkscape/templates/A4_landscape.svg
+share/gnome/inkscape/templates/CD_cover_300dpi.svg
+share/gnome/inkscape/templates/Letter.svg
+share/gnome/inkscape/templates/Letter_landscape.svg
+share/gnome/inkscape/templates/README
+share/gnome/inkscape/templates/black_opaque.svg
+share/gnome/inkscape/templates/business_card_90x50mm.svg
+share/gnome/inkscape/templates/default.svg
+share/gnome/inkscape/templates/default_mm.svg
+share/gnome/inkscape/templates/default_pt.svg
+share/gnome/inkscape/templates/desktop_1024x768.svg
+share/gnome/inkscape/templates/desktop_1600x1200.svg
+share/gnome/inkscape/templates/desktop_640x480.svg
+share/gnome/inkscape/templates/desktop_800x600.svg
+share/gnome/inkscape/templates/icon_16x16.svg
+share/gnome/inkscape/templates/icon_32x32.svg
+share/gnome/inkscape/templates/icon_48x48.svg
+share/gnome/inkscape/templates/icon_64x64.svg
+share/gnome/inkscape/templates/no_borders.svg
+share/gnome/inkscape/templates/no_layers.svg
+share/gnome/inkscape/templates/web_banner_468x60.svg
+share/gnome/inkscape/templates/web_banner_728x90.svg
+share/gnome/inkscape/templates/white_opaque.svg
+share/gnome/inkscape/tutorials/elementsofdesign.sl.svg
 share/gnome/inkscape/tutorials/elementsofdesign.svg
+share/gnome/inkscape/tutorials/making_markers.svg
+share/gnome/inkscape/tutorials/oldguitar.jpg
+share/gnome/inkscape/tutorials/potrace.png
+share/gnome/inkscape/tutorials/tipsandtricks.sl.svg
 share/gnome/inkscape/tutorials/tipsandtricks.svg
+share/gnome/inkscape/tutorials/tutorial-advanced.fr.svg
+share/gnome/inkscape/tutorials/tutorial-advanced.sl.svg
 share/gnome/inkscape/tutorials/tutorial-advanced.svg
+share/gnome/inkscape/tutorials/tutorial-basic.fr.svg
+share/gnome/inkscape/tutorials/tutorial-basic.nn.svg
 share/gnome/inkscape/tutorials/tutorial-basic.ru.svg
+share/gnome/inkscape/tutorials/tutorial-basic.sl.svg
 share/gnome/inkscape/tutorials/tutorial-basic.svg
+share/gnome/inkscape/tutorials/tutorial-calligraphy.sl.svg
+share/gnome/inkscape/tutorials/tutorial-calligraphy.svg
+share/gnome/inkscape/tutorials/tutorial-shapes.sl.svg
+share/gnome/inkscape/tutorials/tutorial-shapes.svg
+share/gnome/inkscape/tutorials/tutorial-tracing.svg
+share/gnome/inkscape/tutorials/tux.png
 share/gnome/pixmaps/inkscape.png
 share/locale/am/LC_MESSAGES/inkscape.mo
 share/locale/az/LC_MESSAGES/inkscape.mo
@@ -210,8 +125,9 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
 share/locale/hu/LC_MESSAGES/inkscape.mo
 share/locale/it/LC_MESSAGES/inkscape.mo
 share/locale/ja/LC_MESSAGES/inkscape.mo
+share/locale/nb/LC_MESSAGES/inkscape.mo
 share/locale/nl/LC_MESSAGES/inkscape.mo
-share/locale/no/LC_MESSAGES/inkscape.mo
+share/locale/nn/LC_MESSAGES/inkscape.mo
 share/locale/pl/LC_MESSAGES/inkscape.mo
 share/locale/pt/LC_MESSAGES/inkscape.mo
 share/locale/pt_BR/LC_MESSAGES/inkscape.mo
@@ -225,11 +141,19 @@ share/locale/tr/LC_MESSAGES/inkscape.mo
 share/locale/uk/LC_MESSAGES/inkscape.mo
 share/locale/zh_CN/LC_MESSAGES/inkscape.mo
 @dirrm share/gnome/inkscape/tutorials
+@dirrm share/gnome/inkscape/templates
 @dirrm share/gnome/inkscape/screens
-@dirrm share/gnome/inkscape/modules
+@dirrm share/gnome/inkscape/patterns
+@dirrm share/gnome/inkscape/palettes
+@dirrm share/gnome/inkscape/markers
+@dirrm share/gnome/inkscape/keyboards
 @dirrm share/gnome/inkscape/icons
+@dirrm share/gnome/inkscape/gradients
+@dirrm share/gnome/inkscape/fonts
 @dirrm share/gnome/inkscape/extensions
+@dirrm share/gnome/inkscape/examples
+@dirrm share/gnome/inkscape/clipart
 @dirrm share/gnome/inkscape
-@dirrm lib/inkscape/extensions
+@dirrm lib/inkscape/plugins
 @dirrm lib/inkscape
 @unexec update-desktop-database > /dev/null || /usr/bin/true