update to 0.41

from the announcement:
The primary focus of 0.41 has been bug fixing.
[...]
A couple new features also found their way in. First, the black and
white tracing functionality introduced in 0.40 has been improved to also
allow conversion of color and grayscale images. Second, is the addition
of a new clone tiler facility which creates patterns, tesselations, and
other sorts of geometric tiling arrangements.
User requests and comments also stimulated a number of improvements to
units handling, extensions, the Invert Selection command, layers
selector, icon theming, and several new translations.

5 files changed, 35 insertions, 194 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index bdc063297a8..0c93fdd6045 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/10 18:38:15 drochner Exp $
 #
 
-DISTNAME=		inkscape-0.40
+DISTNAME=		inkscape-0.41
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=		.tar.bz2
@@ -33,6 +33,7 @@ USE_GNU_TOOLS+=		make
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtkmm24/buildlink3.mk"
 
diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST
index 08b9a8630f5..4b08f64da68 100644
--- a/graphics/inkscape/PLIST
+++ b/graphics/inkscape/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/12 20:54:52 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/10 18:38:15 drochner Exp $
 bin/inkscape
 bin/inkview
 lib/inkscape/plugins/libgimpgrad.la
+lib/inkscape/plugins/libgrid.la
 man/man1/inkscape.1
 man/man1/inkview.1
 share/applications/inkscape.desktop
@@ -13,13 +14,16 @@ share/inkscape/clipart/ribbon.svg
 share/inkscape/clipart/tux.png
 share/inkscape/clipart/tux.svg
 share/inkscape/examples/README
+share/inkscape/examples/art-nouveau-P3.svg
 share/inkscape/examples/data_uri.svg
+share/inkscape/examples/eastern-motive-P4G.svg
 share/inkscape/examples/flowsample.svg
 share/inkscape/examples/gradient.svg
 share/inkscape/examples/i18n.svg
 share/inkscape/examples/istest.pov
 share/inkscape/examples/markers.svg
 share/inkscape/examples/stars.svgz
+share/inkscape/examples/tesselation-P3.svg
 share/inkscape/examples/text-on-path.svg
 share/inkscape/examples/tiger.svgz
 share/inkscape/extensions/SpSVG.pm
@@ -28,15 +32,16 @@ share/inkscape/extensions/ai_output.inx
 share/inkscape/extensions/dia.inx
 share/inkscape/extensions/dia2svg.sh
 share/inkscape/extensions/dropshadow.inx
+share/inkscape/extensions/embed_raster_in_svg.pl
 share/inkscape/extensions/eps_input.inx
 share/inkscape/extensions/epsi_output.inx
 share/inkscape/extensions/gimpgrad.inx
+share/inkscape/extensions/grid.inx
 share/inkscape/extensions/ill2svg.pl
+share/inkscape/extensions/inkscape-shadow-white.sh
+share/inkscape/extensions/inkscape-shadow.sh
 share/inkscape/extensions/ps2epsi.sh
 share/inkscape/extensions/ps_input.inx
-share/inkscape/extensions/roundhole
-share/inkscape/extensions/roundhole.inx
-share/inkscape/extensions/roundhole.xpm
 share/inkscape/extensions/sk2svg.sh
 share/inkscape/extensions/sk_input.inx
 share/inkscape/extensions/svg_dropshadow
@@ -47,175 +52,7 @@ share/inkscape/extensions/txt2svg.pl
 share/inkscape/extensions/wmf_input.inx
 share/inkscape/fonts/README
 share/inkscape/gradients/README
-share/inkscape/icons/add.xpm
-share/inkscape/icons/add_xml_element_node.xpm
-share/inkscape/icons/add_xml_text_node.xpm
-share/inkscape/icons/al_bottom_in.xpm
-share/inkscape/icons/al_bottom_out.xpm
-share/inkscape/icons/al_center_hor.xpm
-share/inkscape/icons/al_center_ver.xpm
-share/inkscape/icons/al_left_in.xpm
-share/inkscape/icons/al_left_out.xpm
-share/inkscape/icons/al_right_in.xpm
-share/inkscape/icons/al_right_out.xpm
-share/inkscape/icons/al_top_in.xpm
-share/inkscape/icons/al_top_out.xpm
-share/inkscape/icons/align_bc.xpm
-share/inkscape/icons/align_bl.xpm
-share/inkscape/icons/align_br.xpm
-share/inkscape/icons/align_cc.xpm
-share/inkscape/icons/align_cl.xpm
-share/inkscape/icons/align_cr.xpm
-share/inkscape/icons/align_tc.xpm
-share/inkscape/icons/align_tl.xpm
-share/inkscape/icons/align_tr.xpm
-share/inkscape/icons/angle_180.xpm
-share/inkscape/icons/angle_270.xpm
-share/inkscape/icons/angle_90.xpm
-share/inkscape/icons/angle_any.xpm
-share/inkscape/icons/arrows_hor.xpm
-share/inkscape/icons/arrows_ver.xpm
-share/inkscape/icons/cap_butt.xpm
-share/inkscape/icons/cap_round.xpm
-share/inkscape/icons/cap_square.xpm
-share/inkscape/icons/clear.xpm
-share/inkscape/icons/create_new.xpm
-share/inkscape/icons/curve.xpm
-share/inkscape/icons/cusp.xpm
-share/inkscape/icons/del.xpm
-share/inkscape/icons/delete_xml_attribute.xpm
-share/inkscape/icons/delete_xml_node.xpm
-share/inkscape/icons/dimension_hor.xpm
-share/inkscape/icons/dimension_ver.xpm
-share/inkscape/icons/div.xpm
-share/inkscape/icons/draw_arc.xpm
-share/inkscape/icons/draw_dynahand.xpm
-share/inkscape/icons/draw_freehand.xpm
-share/inkscape/icons/draw_node.xpm
-share/inkscape/icons/draw_pen.xpm
-share/inkscape/icons/draw_rect.xpm
-share/inkscape/icons/draw_select.xpm
-share/inkscape/icons/draw_spiral.xpm
-share/inkscape/icons/draw_star.xpm
-share/inkscape/icons/draw_text.xpm
-share/inkscape/icons/draw_zoom.xpm
-share/inkscape/icons/dt_active.xpm
-share/inkscape/icons/dt_inactive.xpm
-share/inkscape/icons/duplicate.xpm
-share/inkscape/icons/duplicate_xml_node.xpm
-share/inkscape/icons/edge_down.xpm
-share/inkscape/icons/edge_up.xpm
-share/inkscape/icons/edit_copy.xpm
-share/inkscape/icons/edit_cut.xpm
-share/inkscape/icons/edit_delete.xpm
-share/inkscape/icons/edit_duplicate.xpm
-share/inkscape/icons/edit_paste.xpm
-share/inkscape/icons/edit_redo.xpm
-share/inkscape/icons/edit_undo.xpm
-share/inkscape/icons/ellipse.xpm
-share/inkscape/icons/file_export.xpm
-share/inkscape/icons/file_import.xpm
-share/inkscape/icons/file_new.xpm
-share/inkscape/icons/file_open.xpm
-share/inkscape/icons/file_print.xpm
-share/inkscape/icons/file_print_preview.xpm
-share/inkscape/icons/file_save.xpm
-share/inkscape/icons/file_save_as.xpm
-share/inkscape/icons/fill.xpm
-share/inkscape/icons/fill_fractal.xpm
-share/inkscape/icons/fill_gradient.xpm
-share/inkscape/icons/fill_none.xpm
-share/inkscape/icons/fill_pattern.xpm
-share/inkscape/icons/fill_radial.xpm
-share/inkscape/icons/fill_solid.xpm
-share/inkscape/icons/flip_hor.xpm
-share/inkscape/icons/flip_ver.xpm
-share/inkscape/icons/font.xpm
-share/inkscape/icons/forward.xpm
-share/inkscape/icons/freehand.xpm
-share/inkscape/icons/guide_dialog.png
 share/inkscape/icons/icons.svg
-share/inkscape/icons/join.xpm
-share/inkscape/icons/join_bevel.xpm
-share/inkscape/icons/join_miter.xpm
-share/inkscape/icons/join_round.xpm
-share/inkscape/icons/line.xpm
-share/inkscape/icons/line_dashed.xpm
-share/inkscape/icons/line_doubled.xpm
-share/inkscape/icons/line_full.xpm
-share/inkscape/icons/lock_aspect_no.xpm
-share/inkscape/icons/lock_aspect_yes.xpm
-share/inkscape/icons/marker_arrow_end.xpm
-share/inkscape/icons/marker_arrow_start.xpm
-share/inkscape/icons/marker_none_end.xpm
-share/inkscape/icons/marker_none_start.xpm
-share/inkscape/icons/marker_triangle_end.xpm
-share/inkscape/icons/marker_triangle_start.xpm
-share/inkscape/icons/move.xpm
-share/inkscape/icons/object_align.xpm
-share/inkscape/icons/object_fill.xpm
-share/inkscape/icons/object_flip_hor.xpm
-share/inkscape/icons/object_flip_ver.xpm
-share/inkscape/icons/object_font.xpm
-share/inkscape/icons/object_layout.xpm
-share/inkscape/icons/object_reset.xpm
-share/inkscape/icons/object_rotate.xpm
-share/inkscape/icons/object_stroke.xpm
-share/inkscape/icons/object_tocurve.xpm
-share/inkscape/icons/object_trans.xpm
-share/inkscape/icons/origin.xpm
-share/inkscape/icons/properties_fill.xpm
-share/inkscape/icons/properties_layout.xpm
-share/inkscape/icons/properties_stroke.xpm
-share/inkscape/icons/quit_nope.xpm
-share/inkscape/icons/quit_yep.xpm
-share/inkscape/icons/rect.xpm
-share/inkscape/icons/reread.xpm
-share/inkscape/icons/rotate.xpm
-share/inkscape/icons/rotate_left.xpm
-share/inkscape/icons/rotate_right.xpm
-share/inkscape/icons/scale.xpm
-share/inkscape/icons/scale_hor.xpm
-share/inkscape/icons/scale_ver.xpm
-share/inkscape/icons/select.xpm
-share/inkscape/icons/selection_bot.xpm
-share/inkscape/icons/selection_break.xpm
-share/inkscape/icons/selection_combine.xpm
-share/inkscape/icons/selection_down.xpm
-share/inkscape/icons/selection_group.xpm
-share/inkscape/icons/selection_top.xpm
-share/inkscape/icons/selection_ungroup.xpm
-share/inkscape/icons/selection_up.xpm
-share/inkscape/icons/seperate_tool.xpm
-share/inkscape/icons/set.xpm
-share/inkscape/icons/skew.xpm
-share/inkscape/icons/skew_hor.xpm
-share/inkscape/icons/skew_ver.xpm
-share/inkscape/icons/smooth.xpm
-share/inkscape/icons/stroke.xpm
-share/inkscape/icons/sym.xpm
-share/inkscape/icons/text.xpm
-share/inkscape/icons/toback.xpm
-share/inkscape/icons/tofront.xpm
-share/inkscape/icons/toolbox_draw.xpm
-share/inkscape/icons/toolbox_edit.xpm
-share/inkscape/icons/toolbox_file.xpm
-share/inkscape/icons/toolbox_node.xpm
-share/inkscape/icons/toolbox_object.xpm
-share/inkscape/icons/toolbox_select.xpm
-share/inkscape/icons/toolbox_zoom.xpm
-share/inkscape/icons/unknown.xpm
-share/inkscape/icons/writing_mode_lr.xpm
-share/inkscape/icons/writing_mode_tb.xpm
-share/inkscape/icons/zoom.xpm
-share/inkscape/icons/zoom_1_to_1.xpm
-share/inkscape/icons/zoom_1_to_2.xpm
-share/inkscape/icons/zoom_2_to_1.xpm
-share/inkscape/icons/zoom_draw.xpm
-share/inkscape/icons/zoom_in.xpm
-share/inkscape/icons/zoom_out.xpm
-share/inkscape/icons/zoom_page.xpm
-share/inkscape/icons/zoom_select.xpm
 share/inkscape/keyboards/README
 share/inkscape/markers/markers.svg
 share/inkscape/palettes/README
@@ -232,6 +69,8 @@ share/inkscape/templates/README
 share/inkscape/templates/black_opaque.svg
 share/inkscape/templates/business_card_90x50mm.svg
 share/inkscape/templates/default.svg
+share/inkscape/templates/default_mm.svg
+share/inkscape/templates/default_pt.svg
 share/inkscape/templates/desktop_1024x768.svg
 share/inkscape/templates/desktop_1600x1200.svg
 share/inkscape/templates/desktop_640x480.svg
@@ -247,6 +86,7 @@ share/inkscape/templates/web_banner_728x90.svg
 share/inkscape/templates/white_opaque.svg
 share/inkscape/tutorials/elementsofdesign.sl.svg
 share/inkscape/tutorials/elementsofdesign.svg
+share/inkscape/tutorials/making_markers.svg
 share/inkscape/tutorials/oldguitar.jpg
 share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/tipsandtricks.sl.svg
@@ -259,7 +99,9 @@ share/inkscape/tutorials/tutorial-basic.nn.svg
 share/inkscape/tutorials/tutorial-basic.ru.svg
 share/inkscape/tutorials/tutorial-basic.sl.svg
 share/inkscape/tutorials/tutorial-basic.svg
+share/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-shapes.sl.svg
 share/inkscape/tutorials/tutorial-shapes.svg
 share/inkscape/tutorials/tutorial-tracing.svg
 share/inkscape/tutorials/tux.png
@@ -296,7 +138,6 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/inkscape.mo
 share/pixmaps/inkscape.png
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/inkscape/tutorials
 @dirrm share/inkscape/templates
 @dirrm share/inkscape/screens
@@ -311,6 +152,5 @@ share/pixmaps/inkscape.png
 @dirrm share/inkscape/examples
 @dirrm share/inkscape/clipart
 @dirrm share/inkscape
-@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/inkscape/plugins
 @dirrm lib/inkscape
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index de7f2cb3185..4556eb15b10 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 08:45:08 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/05/10 18:38:15 drochner Exp $
 
-SHA1 (inkscape-0.40.tar.bz2) = 1dc713442abc887343c9dd966a7ea7470023036b
-RMD160 (inkscape-0.40.tar.bz2) = d708017f69fa42a7690afd164480b83de1c18a3d
-Size (inkscape-0.40.tar.bz2) = 3822704 bytes
-SHA1 (patch-aa) = 3042766f99f4bd643c14e73a4774cf870891550a
+SHA1 (inkscape-0.41.tar.bz2) = 9f1f1ad6fa1feea39395f143c23cedb3e8aceb75
+RMD160 (inkscape-0.41.tar.bz2) = ffcc13816c99f8bb9bfed61689854cc1dadae124
+Size (inkscape-0.41.tar.bz2) = 4430290 bytes
+SHA1 (patch-ab) = ef9ad1dc4a49270d9e7dacccc4e2ea6d41712940
diff --git a/graphics/inkscape/patches/patch-aa b/graphics/inkscape/patches/patch-aa
deleted file mode 100644
index 21c4e933a7b..00000000000
--- a/graphics/inkscape/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/01/19 21:54:26 reed Exp $
-
---- configure.orig	2004-11-28 23:21:53.000000000 -0800
-+++ configure
-@@ -21463,7 +21463,7 @@ if test "${ac_cv_lib_gc_GC_malloc+set}" 
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgc -lpthread -ldl $LIBS"
-+LIBS="-lgc $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/graphics/inkscape/patches/patch-ab b/graphics/inkscape/patches/patch-ab
new file mode 100644
index 00000000000..f560a369a0c
--- /dev/null
+++ b/graphics/inkscape/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/05/10 18:38:15 drochner Exp $
+
+--- src/object-edit.cpp.orig	2005-03-16 18:16:43.000000000 +0100
++++ src/object-edit.cpp
+@@ -839,7 +839,7 @@ sp_spiral_outer_set (SPItem *item, const
+ 			spiral->rad = rad_new;
+ 			spiral->t0 = pow (r0 / spiral->rad, 1/spiral->exp);
+ 		}
+-		if (!std::isfinite(spiral->t0)) spiral->t0 = 0.0;
++		if (!finite(spiral->t0)) spiral->t0 = 0.0;
+ 		spiral->t0 = CLAMP (spiral->t0, 0.0, 0.999);	
+ 	}
+