Changes 0.45:

This release brings the exciting new features developed by the Google
Summer of Code 2006 participants, as well as tons of other
improvements across the board. Here are the highlights:

* Gaussian blur is the first SVG filter supported by Inkscape. You
  can blur any object to any extent - yet it remains vector and
  fully editable. This gives a huge boost to Inkscape as a creative
  art tool.

* Display speed and interactivity: not only does Inkscape render
  faster, but it can now respond to user input before it finished
  redrawing the screen, which greatly improves the interactivity of
  the program.

* History dialog makes it easy to to review your editing session and
  jump to any step of it, undoing and redoing multiple actions with
  one click.

* Several important tool features are added, notably the new
  selection mode in Node tool and the adjustable rounded caps in
  Calligraphic pen.

* Bitmap tracing works better for multi-color traces, sports a
  redesigned dialog and several new options.

* Many new extension effects are added, including Color effects and
  Pattern along path.

* The Outline mode has got many fixes and improvements, including a
  keyboard shortcut.

* Several new commands in Help menu open various Inkscape-related
  pages in your default browser, making Inkscape reference
  information more accessible as you work.

* Dozens of smaller features are added throughout the program, and
  hundreds of bugs are fixed.

7 files changed, 157 insertions, 65 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index d3c4c1724a1..93e13c1e043 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/11/05 17:23:44 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/05 20:20:03 adam Exp $
 
-DISTNAME=	inkscape-0.44.1
+DISTNAME=	inkscape-0.45
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 
diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST
index df3d810f2b7..62223198b09 100644
--- a/graphics/inkscape/PLIST
+++ b/graphics/inkscape/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/10/06 20:29:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/02/05 20:20:03 adam Exp $
 bin/inkscape
 bin/inkview
 man/fr/man1/inkscape.1
@@ -13,15 +13,21 @@ share/inkscape/clipart/ribbon.svg
 share/inkscape/clipart/tux.png
 share/inkscape/clipart/tux.svg
 share/inkscape/examples/README
+share/inkscape/examples/animated-clock.svg
 share/inkscape/examples/art-nouveau-P3.svg
+share/inkscape/examples/car.svgz
 share/inkscape/examples/data_uri.svg
 share/inkscape/examples/eastern-motive-P4G.svg
 share/inkscape/examples/flowsample.svg
+share/inkscape/examples/gallardo.svgz
+share/inkscape/examples/glass.svg
+share/inkscape/examples/gradient-mesh-experimental.svgz
 share/inkscape/examples/gradient.svg
 share/inkscape/examples/i18n.svg
 share/inkscape/examples/istest.pov
 share/inkscape/examples/l-systems.svgz
 share/inkscape/examples/markers.svg
+share/inkscape/examples/rope-3D.svg
 share/inkscape/examples/stars.svgz
 share/inkscape/examples/tesselation-P3.svg
 share/inkscape/examples/text-on-path.svg
@@ -34,6 +40,39 @@ share/inkscape/extensions/ai_output.inx
 share/inkscape/extensions/aisvg.inx
 share/inkscape/extensions/aisvg.xslt
 share/inkscape/extensions/bezmisc.py
+share/inkscape/extensions/color_brighter.inx
+share/inkscape/extensions/color_brighter.py
+share/inkscape/extensions/color_custom.inx
+share/inkscape/extensions/color_custom.py
+share/inkscape/extensions/color_darker.inx
+share/inkscape/extensions/color_darker.py
+share/inkscape/extensions/color_desaturate.inx
+share/inkscape/extensions/color_desaturate.py
+share/inkscape/extensions/color_grayscale.inx
+share/inkscape/extensions/color_grayscale.py
+share/inkscape/extensions/color_lesshue.inx
+share/inkscape/extensions/color_lesshue.py
+share/inkscape/extensions/color_lesslight.inx
+share/inkscape/extensions/color_lesslight.py
+share/inkscape/extensions/color_lesssaturation.inx
+share/inkscape/extensions/color_lesssaturation.py
+share/inkscape/extensions/color_morehue.inx
+share/inkscape/extensions/color_morehue.py
+share/inkscape/extensions/color_morelight.inx
+share/inkscape/extensions/color_morelight.py
+share/inkscape/extensions/color_moresaturation.inx
+share/inkscape/extensions/color_moresaturation.py
+share/inkscape/extensions/color_negative.inx
+share/inkscape/extensions/color_negative.py
+share/inkscape/extensions/color_removeblue.inx
+share/inkscape/extensions/color_removeblue.py
+share/inkscape/extensions/color_removegreen.inx
+share/inkscape/extensions/color_removegreen.py
+share/inkscape/extensions/color_removered.inx
+share/inkscape/extensions/color_removered.py
+share/inkscape/extensions/color_rgbbarrel.inx
+share/inkscape/extensions/color_rgbbarrel.py
+share/inkscape/extensions/coloreffect.py
 share/inkscape/extensions/cspsubdiv.py
 share/inkscape/extensions/cubicsuperpath.py
 share/inkscape/extensions/dia.inx
@@ -51,20 +90,21 @@ share/inkscape/extensions/eps_input.inx
 share/inkscape/extensions/epsi_output.inx
 share/inkscape/extensions/eqtexsvg.inx
 share/inkscape/extensions/eqtexsvg.py
+share/inkscape/extensions/export_gimp_palette.inx
+share/inkscape/extensions/export_gimp_palette.py
 share/inkscape/extensions/extractimage.inx
 share/inkscape/extensions/extractimage.py
 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/fig2svg.sh
 share/inkscape/extensions/fig_input.inx
 share/inkscape/extensions/flatten.inx
 share/inkscape/extensions/flatten.py
-share/inkscape/extensions/fretfind.py
+share/inkscape/extensions/fractalize.inx
+share/inkscape/extensions/fractalize.py
+share/inkscape/extensions/funcplot.inx
+share/inkscape/extensions/funcplot.py
+share/inkscape/extensions/g2pngs.inx
+share/inkscape/extensions/g2pngs.py
 share/inkscape/extensions/gimp_xcf.inx
 share/inkscape/extensions/gimp_xcf.py
 share/inkscape/extensions/handles.inx
@@ -73,20 +113,33 @@ share/inkscape/extensions/ill2svg.pl
 share/inkscape/extensions/inkex.py
 share/inkscape/extensions/inkscape-shadow-white.sh
 share/inkscape/extensions/inkscape-shadow.sh
+share/inkscape/extensions/inkscape_help_commandline.inx
+share/inkscape/extensions/inkscape_help_faq.inx
+share/inkscape/extensions/inkscape_help_manual.inx
+share/inkscape/extensions/inkscape_help_relnotes.inx
+share/inkscape/extensions/inkscape_help_reportabug.inx
+share/inkscape/extensions/inkscape_help_svgspec.inx
 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/lorem_ipsum.inx
+share/inkscape/extensions/lorem_ipsum.py
+share/inkscape/extensions/markers_strokepaint.inx
+share/inkscape/extensions/markers_strokepaint.py
 share/inkscape/extensions/measure.inx
 share/inkscape/extensions/measure.py
 share/inkscape/extensions/motion.inx
 share/inkscape/extensions/motion.py
-share/inkscape/extensions/pdf_output.inx
-share/inkscape/extensions/pdf_output_via_gs_on_win32.inx
+share/inkscape/extensions/outline2svg.inx
+share/inkscape/extensions/outline2svg.pl
+share/inkscape/extensions/pathalongpath.inx
+share/inkscape/extensions/pathalongpath.py
+share/inkscape/extensions/pathmodifier.py
+share/inkscape/extensions/pdf_output.inx.txt
+share/inkscape/extensions/pdf_output_via_gs_on_win32.inx.txt
+share/inkscape/extensions/perspective.inx
+share/inkscape/extensions/perspective.py
 share/inkscape/extensions/ps2dxf.sh
 share/inkscape/extensions/ps2epsi.sh
 share/inkscape/extensions/ps2pdf.cmd
@@ -99,7 +152,9 @@ share/inkscape/extensions/randompnt.inx
 share/inkscape/extensions/randompos.inx
 share/inkscape/extensions/rtree.inx
 share/inkscape/extensions/rtree.py
+share/inkscape/extensions/rubberstretch.py
 share/inkscape/extensions/simplepath.py
+share/inkscape/extensions/simplepath.rb
 share/inkscape/extensions/simplestyle.py
 share/inkscape/extensions/sk2svg.sh
 share/inkscape/extensions/sk_input.inx
@@ -115,8 +170,12 @@ 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/webbrowser_commandline.py
+share/inkscape/extensions/webbrowser_faq.py
+share/inkscape/extensions/webbrowser_manual.py
+share/inkscape/extensions/webbrowser_relnotes.py
+share/inkscape/extensions/webbrowser_reportabug.py
+share/inkscape/extensions/webbrowser_svgspec.py
 share/inkscape/extensions/whirl.inx
 share/inkscape/extensions/whirl.py
 share/inkscape/extensions/wmf_input.inx
@@ -127,10 +186,15 @@ share/inkscape/icons/README.David_icons
 share/inkscape/icons/README.icon_themes
 share/inkscape/icons/README.legacy_icons
 share/inkscape/icons/icons.svg
+share/inkscape/icons/inkscape.file.png
+share/inkscape/icons/inkscape.file.svg
 share/inkscape/icons/inkscape.svg
 share/inkscape/icons/legacy_icons.svg
+share/inkscape/keys/adobe-illustrator-cs2.xml
 share/inkscape/keys/default.xml
 share/inkscape/keys/inkscape.xml
+share/inkscape/keys/macromedia-freehand-mx.xml
+share/inkscape/keys/right-handed-illustration.xml
 share/inkscape/keys/xara.xml
 share/inkscape/markers/markers.svg
 share/inkscape/palettes/Blues.gpl
@@ -144,11 +208,14 @@ share/inkscape/palettes/Reds.gpl
 share/inkscape/palettes/Royal.gpl
 share/inkscape/palettes/Tango-Palette.gpl
 share/inkscape/palettes/Topographic.gpl
+share/inkscape/palettes/Ubuntu.gpl
 share/inkscape/palettes/inkscape.gpl
 share/inkscape/palettes/svg.gpl
 share/inkscape/palettes/webhex.gpl
 share/inkscape/palettes/websafe22.gpl
+share/inkscape/palettes/windows.gpl
 share/inkscape/patterns/README
+share/inkscape/screens/about.bg.svg
 share/inkscape/screens/about.svg
 share/inkscape/screens/keys.de.svg
 share/inkscape/screens/keys.fr.svg
@@ -157,19 +224,28 @@ share/inkscape/screens/keys.svg
 share/inkscape/templates/A4.svg
 share/inkscape/templates/A4_landscape.svg
 share/inkscape/templates/CD_cover_300dpi.svg
+share/inkscape/templates/DVD_cover_regular_300dpi.svg
+share/inkscape/templates/DVD_cover_slim_300dpi.svg
+share/inkscape/templates/DVD_cover_superslim_300dpi.svg
+share/inkscape/templates/DVD_cover_ultraslim_300dpi.svg
 share/inkscape/templates/Letter.svg
 share/inkscape/templates/Letter_landscape.svg
 share/inkscape/templates/README
 share/inkscape/templates/black_opaque.svg
+share/inkscape/templates/business_card_85x54mm.svg
 share/inkscape/templates/business_card_90x50mm.svg
 share/inkscape/templates/default.ca.svg
 share/inkscape/templates/default.cs.svg
 share/inkscape/templates/default.de.svg
+share/inkscape/templates/default.eo.svg
 share/inkscape/templates/default.es.svg
+share/inkscape/templates/default.fi.svg
 share/inkscape/templates/default.fr.svg
 share/inkscape/templates/default.hu.svg
 share/inkscape/templates/default.it.svg
+share/inkscape/templates/default.lt.svg
 share/inkscape/templates/default.pl.svg
+share/inkscape/templates/default.pt_BR.svg
 share/inkscape/templates/default.svg
 share/inkscape/templates/default_mm.svg
 share/inkscape/templates/default_pt.svg
@@ -183,6 +259,9 @@ share/inkscape/templates/icon_48x48.svg
 share/inkscape/templates/icon_64x64.svg
 share/inkscape/templates/no_borders.svg
 share/inkscape/templates/no_layers.svg
+share/inkscape/templates/video_HDTV_1920_1080.svg
+share/inkscape/templates/video_NTSC_720_486.svg
+share/inkscape/templates/video_PAL_720_576.svg
 share/inkscape/templates/web_banner_468x60.svg
 share/inkscape/templates/web_banner_728x90.svg
 share/inkscape/templates/white_opaque.svg
@@ -192,6 +271,8 @@ share/inkscape/tutorials/making_markers.svg
 share/inkscape/tutorials/oldguitar.jpg
 share/inkscape/tutorials/potrace-de.png
 share/inkscape/tutorials/potrace-fr.png
+share/inkscape/tutorials/potrace-pt_BR.png
+share/inkscape/tutorials/potrace-ru.png
 share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/tutorial-advanced.ca.svg
 share/inkscape/tutorials/tutorial-advanced.cs.svg
@@ -200,13 +281,17 @@ share/inkscape/tutorials/tutorial-advanced.es.svg
 share/inkscape/tutorials/tutorial-advanced.fr.svg
 share/inkscape/tutorials/tutorial-advanced.ja.svg
 share/inkscape/tutorials/tutorial-advanced.pt_BR.svg
+share/inkscape/tutorials/tutorial-advanced.ru.svg
 share/inkscape/tutorials/tutorial-advanced.sl.svg
 share/inkscape/tutorials/tutorial-advanced.svg
+share/inkscape/tutorials/tutorial-basic.bg.svg
 share/inkscape/tutorials/tutorial-basic.ca.svg
 share/inkscape/tutorials/tutorial-basic.cs.svg
+share/inkscape/tutorials/tutorial-basic.da.svg
 share/inkscape/tutorials/tutorial-basic.de.svg
 share/inkscape/tutorials/tutorial-basic.es.svg
 share/inkscape/tutorials/tutorial-basic.fr.svg
+share/inkscape/tutorials/tutorial-basic.it.svg
 share/inkscape/tutorials/tutorial-basic.ja.svg
 share/inkscape/tutorials/tutorial-basic.nn.svg
 share/inkscape/tutorials/tutorial-basic.pt_BR.svg
@@ -219,12 +304,15 @@ share/inkscape/tutorials/tutorial-calligraphy.de.svg
 share/inkscape/tutorials/tutorial-calligraphy.es.svg
 share/inkscape/tutorials/tutorial-calligraphy.fr.svg
 share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg
+share/inkscape/tutorials/tutorial-calligraphy.ru.svg
 share/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-elements.ca.svg
 share/inkscape/tutorials/tutorial-elements.de.svg
 share/inkscape/tutorials/tutorial-elements.es.svg
 share/inkscape/tutorials/tutorial-elements.fr.svg
 share/inkscape/tutorials/tutorial-elements.pt_BR.svg
+share/inkscape/tutorials/tutorial-elements.ru.svg
 share/inkscape/tutorials/tutorial-elements.sl.svg
 share/inkscape/tutorials/tutorial-elements.svg
 share/inkscape/tutorials/tutorial-shapes.ca.svg
@@ -232,20 +320,26 @@ share/inkscape/tutorials/tutorial-shapes.cs.svg
 share/inkscape/tutorials/tutorial-shapes.de.svg
 share/inkscape/tutorials/tutorial-shapes.es.svg
 share/inkscape/tutorials/tutorial-shapes.fr.svg
+share/inkscape/tutorials/tutorial-shapes.it.svg
 share/inkscape/tutorials/tutorial-shapes.ja.svg
 share/inkscape/tutorials/tutorial-shapes.pt_BR.svg
+share/inkscape/tutorials/tutorial-shapes.ru.svg
 share/inkscape/tutorials/tutorial-shapes.sl.svg
 share/inkscape/tutorials/tutorial-shapes.svg
+share/inkscape/tutorials/tutorial-tips.ca.svg
 share/inkscape/tutorials/tutorial-tips.de.svg
 share/inkscape/tutorials/tutorial-tips.es.svg
 share/inkscape/tutorials/tutorial-tips.fr.svg
 share/inkscape/tutorials/tutorial-tips.pt_BR.svg
+share/inkscape/tutorials/tutorial-tips.ru.svg
 share/inkscape/tutorials/tutorial-tips.sl.svg
 share/inkscape/tutorials/tutorial-tips.svg
 share/inkscape/tutorials/tutorial-tracing.ca.svg
 share/inkscape/tutorials/tutorial-tracing.de.svg
 share/inkscape/tutorials/tutorial-tracing.es.svg
 share/inkscape/tutorials/tutorial-tracing.fr.svg
+share/inkscape/tutorials/tutorial-tracing.pt_BR.svg
+share/inkscape/tutorials/tutorial-tracing.ru.svg
 share/inkscape/tutorials/tutorial-tracing.sl.svg
 share/inkscape/tutorials/tutorial-tracing.svg
 share/inkscape/tutorials/tux.png
@@ -257,25 +351,34 @@ share/inkscape/ui/units.xml
 share/locale/am/LC_MESSAGES/inkscape.mo
 share/locale/az/LC_MESSAGES/inkscape.mo
 share/locale/be/LC_MESSAGES/inkscape.mo
+share/locale/bg/LC_MESSAGES/inkscape.mo
 share/locale/ca/LC_MESSAGES/inkscape.mo
 share/locale/cs/LC_MESSAGES/inkscape.mo
 share/locale/da/LC_MESSAGES/inkscape.mo
 share/locale/de/LC_MESSAGES/inkscape.mo
+share/locale/dz/LC_MESSAGES/inkscape.mo
 share/locale/el/LC_MESSAGES/inkscape.mo
+share/locale/en_CA/LC_MESSAGES/inkscape.mo
+share/locale/en_GB/LC_MESSAGES/inkscape.mo
+share/locale/en_US@piglatin/LC_MESSAGES/inkscape.mo
+share/locale/eo/LC_MESSAGES/inkscape.mo
 share/locale/es/LC_MESSAGES/inkscape.mo
 share/locale/es_MX/LC_MESSAGES/inkscape.mo
 share/locale/et/LC_MESSAGES/inkscape.mo
-share/locale/eu/LC_MESSAGES/inkscape.mo
+share/locale/fi/LC_MESSAGES/inkscape.mo
 share/locale/fr/LC_MESSAGES/inkscape.mo
 share/locale/ga/LC_MESSAGES/inkscape.mo
 share/locale/gl/LC_MESSAGES/inkscape.mo
+share/locale/hr/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/ko/LC_MESSAGES/inkscape.mo
 share/locale/lt/LC_MESSAGES/inkscape.mo
 share/locale/mk/LC_MESSAGES/inkscape.mo
+share/locale/mn/LC_MESSAGES/inkscape.mo
 share/locale/nb/LC_MESSAGES/inkscape.mo
+share/locale/ne/LC_MESSAGES/inkscape.mo
 share/locale/nl/LC_MESSAGES/inkscape.mo
 share/locale/nn/LC_MESSAGES/inkscape.mo
 share/locale/pa/LC_MESSAGES/inkscape.mo
@@ -283,11 +386,14 @@ share/locale/pl/LC_MESSAGES/inkscape.mo
 share/locale/pt/LC_MESSAGES/inkscape.mo
 share/locale/pt_BR/LC_MESSAGES/inkscape.mo
 share/locale/ru/LC_MESSAGES/inkscape.mo
+share/locale/rw/LC_MESSAGES/inkscape.mo
 share/locale/sk/LC_MESSAGES/inkscape.mo
 share/locale/sl/LC_MESSAGES/inkscape.mo
+share/locale/sq/LC_MESSAGES/inkscape.mo
 share/locale/sr/LC_MESSAGES/inkscape.mo
 share/locale/sr@Latn/LC_MESSAGES/inkscape.mo
 share/locale/sv/LC_MESSAGES/inkscape.mo
+share/locale/th/LC_MESSAGES/inkscape.mo
 share/locale/tr/LC_MESSAGES/inkscape.mo
 share/locale/uk/LC_MESSAGES/inkscape.mo
 share/locale/vi/LC_MESSAGES/inkscape.mo
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 0b087d1047a..6288c66bef3 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2006/10/19 06:19:18 rillig Exp $
+$NetBSD: distinfo,v 1.17 2007/02/05 20:20:03 adam Exp $
 
-SHA1 (inkscape-0.44.1.tar.gz) = 6e55d0cf9f4ef50aaca250de36cde33654fb180a
-RMD160 (inkscape-0.44.1.tar.gz) = 2781febf20e3fcc9e630328ee4ec18b7ddda2aeb
-Size (inkscape-0.44.1.tar.gz) = 10702187 bytes
-SHA1 (patch-aa) = f690b21528e122bafaa86f8aefc63e98459a85c9
+SHA1 (inkscape-0.45.tar.gz) = 8a8259509b323277bc47b11d665acec9f2532b79
+RMD160 (inkscape-0.45.tar.gz) = 967a9b2b461303a1992c6b0713045990bf73e413
+Size (inkscape-0.45.tar.gz) = 13122340 bytes
+SHA1 (patch-aa) = 2e4247a713a5bb28a6fcacb7f32b785d9516a439
 SHA1 (patch-ac) = 17e0c058f54e862ad0d2f392b2856e4f3f48fc7b
-SHA1 (patch-ad) = 441a97c9e3da9b730f55b2bff1a483a51f285658
+SHA1 (patch-ad) = 4700208bb97c3d09733f2777bb32f973779b06a8
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
-SHA1 (patch-af) = ff3388a3533fffd13cae78d6821a3b8dcaab83a2
-SHA1 (patch-ag) = a5f5f899d97f529a83f8814307df6f4e3eb20760
+SHA1 (patch-af) = 205a914797e1980f11ddb461ab3d3ee26553c3d4
+SHA1 (patch-ag) = 5562938a306e2675ba5c9ef127532293fbbb3645
diff --git a/graphics/inkscape/patches/patch-aa b/graphics/inkscape/patches/patch-aa
index f1e8ca24d2f..f464eb0990f 100644
--- a/graphics/inkscape/patches/patch-aa
+++ b/graphics/inkscape/patches/patch-aa
@@ -1,26 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2006/10/06 20:29:11 adam Exp $
+$NetBSD: patch-aa,v 1.9 2007/02/05 20:20:03 adam Exp $
 
---- configure.orig	2006-09-07 09:21:37.000000000 +0200
-+++ configure
-@@ -20883,17 +20883,13 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+--- src/display/nr-filter-gaussian.cpp.orig	2007-02-05 20:56:28.000000000 +0100
++++ src/display/nr-filter-gaussian.cpp
+@@ -16,8 +16,6 @@
+ #include <cmath>
+ #include <glib.h>
  
- /* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dgettext ();
-+#include <libintl.h>
-+
- int
- main ()
- {
--dgettext ();
--  ;
-+dgettext ("", "");
-+
-   return 0;
- }
- _ACEOF
+-using std::isnormal;
+-
+ #include "display/nr-filter-primitive.h"
+ #include "display/nr-filter-gaussian.h"
+ #include "display/nr-filter-types.h"
diff --git a/graphics/inkscape/patches/patch-ad b/graphics/inkscape/patches/patch-ad
index e0f1065c4e7..8e421429119 100644
--- a/graphics/inkscape/patches/patch-ad
+++ b/graphics/inkscape/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2006/07/21 15:36:56 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2007/02/05 20:20:03 adam Exp $
 
---- src/trace/potrace/inkscape-potrace.cpp.orig	2006-07-21 13:01:29.000000000 +0000
+--- src/trace/potrace/inkscape-potrace.cpp.orig	2007-01-16 03:05:41.000000000 +0100
 +++ src/trace/potrace/inkscape-potrace.cpp
-@@ -29,7 +29,16 @@
+@@ -31,7 +31,16 @@
  #include "curve.h"
  #include "bitmap.h"
  
--
 +#if defined(__NetBSD__)
 +#include <sys/param.h>
 +#endif
-+
+ 
 +#if defined(__DragonFly__) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800)
 +static double log2(double val)
 +{
diff --git a/graphics/inkscape/patches/patch-af b/graphics/inkscape/patches/patch-af
index d36e5aa3025..9e9489f863e 100644
--- a/graphics/inkscape/patches/patch-af
+++ b/graphics/inkscape/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2006/10/19 06:19:18 rillig Exp $
+$NetBSD: patch-af,v 1.2 2007/02/05 20:20:03 adam Exp $
 
---- packaging/macosx/Resources/script.orig	2006-09-06 07:41:48.000000000 +0200
-+++ packaging/macosx/Resources/script	2006-10-19 08:14:09.000000000 +0200
+--- packaging/macosx/Resources/script.orig	2007-01-16 03:05:21.000000000 +0100
++++ packaging/macosx/Resources/script
 @@ -17,7 +17,7 @@ open-x11 /tmp/getdisplay.sh || \
  open -a XDarwin /tmp/getdisplay.sh || \
  echo ":0" > /tmp/display.$UID
@@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.1 2006/10/19 06:19:18 rillig Exp $
 +while [ "$?" = "0" -a ! -f /tmp/display.$UID ]; do
      sleep 1
  done
- export "DISPLAY=`cat /tmp/display.$UID`"
+ export DISPLAY="`cat /tmp/display.$UID`"
diff --git a/graphics/inkscape/patches/patch-ag b/graphics/inkscape/patches/patch-ag
index 64541e0cd44..c63a7e90191 100644
--- a/graphics/inkscape/patches/patch-ag
+++ b/graphics/inkscape/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2006/10/19 06:19:18 rillig Exp $
+$NetBSD: patch-ag,v 1.2 2007/02/05 20:20:03 adam Exp $
 
---- share/extensions/ps2pdf.sh.orig	2006-09-06 07:43:07.000000000 +0200
-+++ share/extensions/ps2pdf.sh	2006-10-19 08:15:03.000000000 +0200
+--- share/extensions/ps2pdf.sh.orig	2007-01-16 03:06:10.000000000 +0100
++++ share/extensions/ps2pdf.sh
 @@ -2,7 +2,7 @@
  
- params=`grep "^%%DocumentMedia:" "$1" | head -n 1 | awk '{ if (NF==7) { if ($2!="plain") print "-sPAPERSIZE=" $2; else print "-dDEVICEWIDTHPOINTS=" $3 " -dDEVICEHEIGHTPOINTS=" $4; } }'`
+ params=`grep "^%%DocumentMedia:" "$1" | head -n 1 | awk '{  if (NF==7) { if ($2!="plain") print "-sPAPERSIZE=" $2; else print "-dDEVICEWIDTHPOINTS=" $3 " -dDEVICEHEIGHTPOINTS=" $4; } }'`
  
 -if [ "x${params}x" == "xx" ]
 +if [ "x${params}x" = "xx" ]
  then 
-         params=`grep "^%%BoundingBox:" "$1" | head -n 1 | awk '{ if (NF==5) { print "-dDEVICEWIDTHPOINTS=" $4 " -dDEVICEHEIGHTPOINTS=" $5; } }'`
+         params=`grep "^%%BoundingBox:" "$1" | head -n 1 | awk '{ print "-dDEVICEWIDTHPOINTS=" $4 " -dDEVICEHEIGHTPOINTS=" $5; }'`
  fi