Changes 0.42:

     * Flowed text: text objects that automatically reflow in any shape (not
       only rectangle).
     * Text selection: finally you can shift+arrow or drag over part of a
       text and apply any style to the selected span.
     * Gradient tool: a completely redesigned and much easier to use gradient
       interface, with gradient handles displayed right on canvas.
     * Effects are now usable from within Inkscape on all platforms; this
       version ships with a collection of effects including path
       interpolation, randomization, and various fractal algorithms.
     * Color swatches: a standard facility in most graphic software, now in
       Inkscape too.
     * Colored clones: clones can now be painted differently from their
       original.
     * Tile tracing: the Tile Clones dialog can trace the existing image with
       the tiling, producing a multitude of exciting effects.
     * Grid arrange, baseline align, unclumping: new powerful ways to arrange
       objects.
     * Better PS/EPS export: gradient support, better text handling, a
       command line option for batch export.
     * Command line SVG analysis: use Inkscape from the command line to query
       coordinates and dimensions of objects in an SVG file.
     * Better SVG/CSS compliance: notably, internal CSS stylesheets are now
       supported (read-only).
     * OS X support: In addition to Linux and Windows, Inkscape 0.42 is
       available as a fully self-contained dmg package for Mac OS X.

5 files changed, 87 insertions, 47 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index b958f25e9ce..c4488326536 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/07/22 23:11:06 adam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/28 13:52:10 adam Exp $
 
-DISTNAME=	inkscape-0.41
-PKGREVISION=	1
+DISTNAME=	inkscape-0.42
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,7 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.inkscape.org/
 COMMENT=	Scalable Vector Graphics (SVG) editor
 
-.if ! exists (/usr/bin/iconv)
+.if !exists (/usr/bin/iconv)
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
 .endif
 
@@ -23,16 +22,17 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.4
+
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST
index 4b08f64da68..d089bb443e2 100644
--- a/graphics/inkscape/PLIST
+++ b/graphics/inkscape/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/10 18:38:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/07/28 13:52:10 adam Exp $
 bin/inkscape
 bin/inkview
-lib/inkscape/plugins/libgimpgrad.la
-lib/inkscape/plugins/libgrid.la
+man/fr/man1/inkscape.1
 man/man1/inkscape.1
 man/man1/inkview.1
 share/applications/inkscape.desktop
@@ -29,35 +28,78 @@ share/inkscape/examples/tiger.svgz
 share/inkscape/extensions/SpSVG.pm
 share/inkscape/extensions/ai_input.inx
 share/inkscape/extensions/ai_output.inx
+share/inkscape/extensions/bezmisc.py
+share/inkscape/extensions/cubicsuperpath.py
+share/inkscape/extensions/rtree.py
 share/inkscape/extensions/dia.inx
 share/inkscape/extensions/dia2svg.sh
+share/inkscape/extensions/dots.inx
+share/inkscape/extensions/dots.py
 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/ffgeom.py
+share/inkscape/extensions/ffmet.inx
+share/inkscape/extensions/ffms.inx
+share/inkscape/extensions/ffproc.py
+share/inkscape/extensions/ffscale.py
+share/inkscape/extensions/ffset.inx
+share/inkscape/extensions/ffss.inx
+share/inkscape/extensions/fretfind.py
+share/inkscape/extensions/handles.inx
+share/inkscape/extensions/handles.py
+share/inkscape/extensions/inkex.py
+share/inkscape/extensions/interp.inx
+share/inkscape/extensions/interp.py
+share/inkscape/extensions/kochify.inx
+share/inkscape/extensions/kochify.py
+share/inkscape/extensions/kochify_load.inx
+share/inkscape/extensions/kochify_load.py
+share/inkscape/extensions/lindenmayer.inx
+share/inkscape/extensions/lindenmayer.py
+share/inkscape/extensions/motion.inx
+share/inkscape/extensions/motion.py
+share/inkscape/extensions/pdf_output.inx
+share/inkscape/extensions/ps2pdf.sh
+share/inkscape/extensions/pturtle.py
+share/inkscape/extensions/radiusrand.inx
+share/inkscape/extensions/radiusrand.py
+share/inkscape/extensions/rtree.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/simplepath.py
+share/inkscape/extensions/simplestyle.py
 share/inkscape/extensions/sk2svg.sh
 share/inkscape/extensions/sk_input.inx
+share/inkscape/extensions/straightseg.inx
+share/inkscape/extensions/straightseg.py
 share/inkscape/extensions/svg_dropshadow
 share/inkscape/extensions/svgz_input.inx
 share/inkscape/extensions/svgz_output.inx
 share/inkscape/extensions/txt2svg.inx
 share/inkscape/extensions/txt2svg.pl
+share/inkscape/extensions/wavy.inx
+share/inkscape/extensions/wavy.py
 share/inkscape/extensions/wmf_input.inx
 share/inkscape/fonts/README
 share/inkscape/gradients/README
+share/inkscape/icons/David_icons.svg
+share/inkscape/icons/README.icons
 share/inkscape/icons/icons.svg
+share/inkscape/icons/inkscape.svg
 share/inkscape/keyboards/README
 share/inkscape/markers/markers.svg
 share/inkscape/palettes/README
+share/inkscape/palettes/svg.gpl
+share/inkscape/palettes/webhex.gpl
+share/inkscape/palettes/websafe22.gpl
 share/inkscape/patterns/README
 share/inkscape/screens/about.svg
+share/inkscape/screens/keys.fr.svg
 share/inkscape/screens/keys.sl.svg
 share/inkscape/screens/keys.svg
 share/inkscape/templates/A4.svg
@@ -69,6 +111,10 @@ 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.cs.svg
+share/inkscape/templates/default.de.svg
+share/inkscape/templates/default.fr.svg
+share/inkscape/templates/default.it.svg
 share/inkscape/templates/default_mm.svg
 share/inkscape/templates/default_pt.svg
 share/inkscape/templates/desktop_1024x768.svg
@@ -84,27 +130,50 @@ share/inkscape/templates/no_layers.svg
 share/inkscape/templates/web_banner_468x60.svg
 share/inkscape/templates/web_banner_728x90.svg
 share/inkscape/templates/white_opaque.svg
+share/inkscape/tutorials/README
 share/inkscape/tutorials/elementsofdesign.sl.svg
-share/inkscape/tutorials/elementsofdesign.svg
+share/inkscape/tutorials/gpl-2.svg
+share/inkscape/tutorials/potrace-fr.png
+share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/making_markers.svg
 share/inkscape/tutorials/oldguitar.jpg
-share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/tipsandtricks.sl.svg
-share/inkscape/tutorials/tipsandtricks.svg
 share/inkscape/tutorials/tutorial-advanced.fr.svg
+share/inkscape/tutorials/tutorial-advanced.jp.svg
 share/inkscape/tutorials/tutorial-advanced.sl.svg
 share/inkscape/tutorials/tutorial-advanced.svg
+share/inkscape/tutorials/tutorial-basic.ca.svg
+share/inkscape/tutorials/tutorial-basic.es.svg
 share/inkscape/tutorials/tutorial-basic.fr.svg
+share/inkscape/tutorials/tutorial-basic.jp.svg
 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.es.svg
+share/inkscape/tutorials/tutorial-calligraphy.fr.svg
 share/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-elements.es.svg
+share/inkscape/tutorials/tutorial-elements.fr.svg
+share/inkscape/tutorials/tutorial-elements.svg
+share/inkscape/tutorials/tutorial-shapes.es.svg
+share/inkscape/tutorials/tutorial-shapes.fr.svg
+share/inkscape/tutorials/tutorial-shapes.jp.svg
 share/inkscape/tutorials/tutorial-shapes.sl.svg
 share/inkscape/tutorials/tutorial-shapes.svg
+share/inkscape/tutorials/tutorial-tips.fr.svg
+share/inkscape/tutorials/tutorial-tips.svg
+share/inkscape/tutorials/tutorial-tracing.es.svg
+share/inkscape/tutorials/tutorial-tracing.fr.svg
 share/inkscape/tutorials/tutorial-tracing.svg
 share/inkscape/tutorials/tux.png
+share/inkscape/ui/keybindings.rc
+share/inkscape/ui/menus-bars.xml
+share/inkscape/ui/toolbox.xml
+share/inkscape/ui/units.txt
+share/inkscape/ui/units.xml
+share/pixmaps/inkscape.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/inkscape.mo
@@ -137,7 +206,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/inkscape.mo
 ${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
+@dirrm share/inkscape/ui
 @dirrm share/inkscape/tutorials
 @dirrm share/inkscape/templates
 @dirrm share/inkscape/screens
@@ -152,5 +221,4 @@ share/pixmaps/inkscape.png
 @dirrm share/inkscape/examples
 @dirrm share/inkscape/clipart
 @dirrm share/inkscape
-@dirrm lib/inkscape/plugins
 @dirrm lib/inkscape
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index f696a0ac8d2..ab4a461b8fe 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/05/10 20:22:39 drochner Exp $
+$NetBSD: distinfo,v 1.7 2005/07/28 13:52:10 adam Exp $
 
-SHA1 (inkscape-0.41.tar.bz2) = 9f1f1ad6fa1feea39395f143c23cedb3e8aceb75
-RMD160 (inkscape-0.41.tar.bz2) = ffcc13816c99f8bb9bfed61689854cc1dadae124
-Size (inkscape-0.41.tar.bz2) = 4430290 bytes
-SHA1 (patch-aa) = e1fef64ba4c3f40edaa4c8f7e11b6b0933e272f6
-SHA1 (patch-ab) = ef9ad1dc4a49270d9e7dacccc4e2ea6d41712940
+SHA1 (inkscape-0.42.tar.bz2) = 0f4d18318d57b52b72ca39bde0ac486c564e7991
+RMD160 (inkscape-0.42.tar.bz2) = 4a0136b9cd70f6d79f94b3ce5ae39cf06d232239
+Size (inkscape-0.42.tar.bz2) = 5723495 bytes
diff --git a/graphics/inkscape/patches/patch-aa b/graphics/inkscape/patches/patch-aa
deleted file mode 100644
index 6c8a7d15b6f..00000000000
--- a/graphics/inkscape/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/05/10 20:22:39 drochner Exp $
-
---- configure.orig	2005-05-11 00:15:17.000000000 +0200
-+++ configure
-@@ -21905,7 +21905,7 @@ fi
- 
- done
- 
--if test "x$gc_ok" == "xyes"; then
-+if test "x$gc_ok" = "xyes"; then
- 	echo "$as_me:$LINENO: checking libgc version 6.4+" >&5
- echo $ECHO_N "checking libgc version 6.4+... $ECHO_C" >&6
- 	if test "$cross_compiling" = yes; then
diff --git a/graphics/inkscape/patches/patch-ab b/graphics/inkscape/patches/patch-ab
deleted file mode 100644
index f560a369a0c..00000000000
--- a/graphics/inkscape/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);	
- 	}
-