Update to 0.41.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3674 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 127 insertions, 226 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index d753adc75..e65c3266e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	inkscape
-PORTVERSION=	0.39
+PORTVERSION=	0.41
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,15 +15,17 @@ 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 libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui
 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}" \
@@ -31,18 +33,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 
 MAN1=		inkscape.1 inkview.1
 
-.include <bsd.port.pre.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);
 
-.if ${OSVERSION} < 500000
-IGNORE=		"Can not be built with stock C++ compiller"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
-		${WRKSRC}/src/helper/action.cpp
-.if ${ARCH} == "amd64"
-	@${REINPLACE_CMD} -e 's|fpresetsticky|fpsetsticky|g' \
-		${WRKSRC}/src/main.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index a9531209c..5e5c3a8ad 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,2 +1,2 @@
-MD5 (inkscape-0.39.tar.gz) = c9ea2b62cb505681e65e3cc16007fd09
-SIZE (inkscape-0.39.tar.gz) = 4332469
+MD5 (inkscape-0.41.tar.gz) = 989a09d06e4db1ddfd00b8019a5dcd73
+SIZE (inkscape-0.41.tar.gz) = 6090081
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 000000000..9eb52b651
--- /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::db.cpp b/graphics/inkscape/files/patch-src::extension::db.cpp
deleted file mode 100644
index 47f6c986f..000000000
--- a/graphics/inkscape/files/patch-src::extension::db.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/extension/db.cpp.orig	Sat Jul 17 11:50:33 2004
-+++ src/extension/db.cpp	Sat Jul 17 11:52:55 2004
-@@ -80,7 +80,13 @@
- 
- 	if (key == NULL) return NULL;
- 
--	mod = (*moduledict.find(key)).second;
-+	std::map <const char *, Extension *, ltstr>::const_iterator i =
-+		moduledict.find(key);
-+
-+	if (i == moduledict.end())
-+		return NULL;
-+
-+	mod = i->second;
- 
- 	if ( !mod || mod->deactivated() )
- 		return NULL;
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 000000000..bc44302eb
--- /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::livarot::PathOutline.cpp b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
index bf21ea2a4..aa01b7d1a 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::object-edit.cpp b/graphics/inkscape/files/patch-src::object-edit.cpp
new file mode 100644
index 000000000..5d53ed22d
--- /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 d4b7dc1ab..b516cf36b 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,5 +1,11 @@
 bin/inkscape
 bin/inkview
+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
 share/gnome/inkscape/clipart/README
 share/gnome/inkscape/clipart/README-ribbon.txt
@@ -9,204 +15,45 @@ 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.inkmod
-share/gnome/inkscape/extensions/ai_output.inkmod
-share/gnome/inkscape/extensions/dia.inkmod
+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.inkmod
-share/gnome/inkscape/extensions/eps_input.inkmod
-share/gnome/inkscape/extensions/epsi_output.inkmod
+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.inkmod
-share/gnome/inkscape/extensions/roundhole
-share/gnome/inkscape/extensions/roundhole.inkmod
-share/gnome/inkscape/extensions/roundhole.xpm
+share/gnome/inkscape/extensions/ps_input.inx
 share/gnome/inkscape/extensions/sk2svg.sh
-share/gnome/inkscape/extensions/sk_input.inkmod
+share/gnome/inkscape/extensions/sk_input.inx
 share/gnome/inkscape/extensions/svg_dropshadow
-share/gnome/inkscape/extensions/svgz_input.inkmod
-share/gnome/inkscape/extensions/svgz_output.inkmod
-share/gnome/inkscape/extensions/txt2svg.inkmod
+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.inkmod
+share/gnome/inkscape/extensions/wmf_input.inx
 share/gnome/inkscape/fonts/README
 share/gnome/inkscape/gradients/README
-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/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/keyboards/README
 share/gnome/inkscape/markers/markers.svg
 share/gnome/inkscape/palettes/README
@@ -214,18 +61,51 @@ 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
@@ -244,8 +124,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
@@ -272,3 +153,5 @@ share/locale/zh_CN/LC_MESSAGES/inkscape.mo
 @dirrm share/gnome/inkscape/examples
 @dirrm share/gnome/inkscape/clipart
 @dirrm share/gnome/inkscape
+@dirrm lib/inkscape/plugins
+@dirrm lib/inkscape