Update sketch to 0.6.10, provided by Masao Uebayashi in pkg/13122.

Changes since the last version in pkgsrc include 1.5 years of bugfixes
and enhancements as well as updates to newer python version. Complete
ChangeLog in work/sket*/NEWS or at http://sketch.sourceforge.net/relnotes.html

4 files changed, 61 insertions, 22 deletions

diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 6f7be7ea216..e695b4713cb 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/05/09 13:11:26 agc Exp $
-# FreeBSD Id: Makefile,v 1.4 1999/05/19 09:41:06 tg Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/19 00:06:52 wiz Exp $
+#
 
-DISTNAME=	sketch-0.6.3
+DISTNAME=	sketch-0.6.10
 CATEGORIES=	graphics
-MASTER_SITES=   ${MASTER_SITE_BACKUP}
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=sketch/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://sketch.sourceforge.net/
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 65c6b71ab4d..a043b8d4faa 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 11:37:35 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/19 00:06:52 wiz Exp $
 
-SHA1 (sketch-0.6.3.tar.gz) = 186ee6a924f4a4cd6e567a25696228fe9bd1b179
-Size (sketch-0.6.3.tar.gz) = 749685 bytes
-SHA1 (patch-aa) = d27d4612880e63426ff4038ef2c706486e195e47
+SHA1 (sketch-0.6.10.tar.gz) = 78a619853bb8bdc5a8638c6e67e692b97fa33b60
+Size (sketch-0.6.10.tar.gz) = 845864 bytes
+SHA1 (patch-aa) = eb4e491391fe8066fa8c80ffbca11e66bae3528e
diff --git a/graphics/sketch/patches/patch-aa b/graphics/sketch/patches/patch-aa
index 59ab846f033..b037821b78f 100644
--- a/graphics/sketch/patches/patch-aa
+++ b/graphics/sketch/patches/patch-aa
@@ -1,18 +1,26 @@
-$NetBSD: patch-aa,v 1.5 1999/12/02 03:03:32 sakamoto Exp $
+$NetBSD: patch-aa,v 1.6 2001/07/19 00:06:52 wiz Exp $
 
---- ./setup.py.orig	Fri Oct 15 03:13:08 1999
-+++ ./setup.py	Thu Dec  2 10:05:26 1999
-@@ -64,4 +64,6 @@
+--- setup.py.orig	Sat May 12 21:20:07 2001
++++ setup.py
+@@ -84,6 +84,8 @@
+             config.macros.append(item)
          elif head == '-L':
              config.lib_dirs.append(item)
 +        elif head == '-R':
 +            config.lib_dirs.append(item)
          elif head == '-l':
              config.libraries.append(item)
-@@ -213,5 +215,5 @@
-     if setup == None:
-         setup = os.path.join(sys.prefix, 'lib/python' + sys.version[:3],
--                             'config/Setup')
-+                             'config/Setup.tk')
-     print 'reading configuration from', setup, '...',
-     configs = extract_config(setup, ['_tkinter'])
+         else:
+@@ -346,6 +348,12 @@
+         print 'reading additional configuration from', setup_local, '...',
+         configs = extract_config(setup_local, configs)
+         print 'done'
++                                              
++    # NetBSD separately has 'Setup.tk' for tk-related configuration
++    setup_tk = os.path.join(configdir, 'Setup.tk')
++    print 'reading tk-related configuration from', setup_tk, '...',
++    configs = extract_config(setup_tk, configs)
++    print 'done'                        
+ 
+     configure_tkinter(configs, flags)
+     #if not configs.has_key('_tkinter'):
diff --git a/graphics/sketch/pkg/PLIST b/graphics/sketch/pkg/PLIST
index 283368b574d..46a249f8cab 100644
--- a/graphics/sketch/pkg/PLIST
+++ b/graphics/sketch/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/12/02 03:03:32 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/07/19 00:06:52 wiz Exp $
 bin/sk2ps
 bin/sketch
 share/doc/sketch/BUGS
@@ -66,7 +66,6 @@ share/doc/sketch/Doc/devguide-24.html
 share/doc/sketch/Doc/devguide-25.html
 share/doc/sketch/Doc/devguide-26.html
 share/doc/sketch/Doc/devguide-27.html
-share/doc/sketch/Doc/devguide-28.html
 share/doc/sketch/Doc/devguide-3.html
 share/doc/sketch/Doc/devguide-4.html
 share/doc/sketch/Doc/devguide-5.html
@@ -79,7 +78,6 @@ share/doc/sketch/Doc/fonts.alias
 share/doc/sketch/Doc/fonts.scale
 share/doc/sketch/Doc/usersguide-1.html
 share/doc/sketch/Doc/usersguide-10.html
-share/doc/sketch/Doc/usersguide-11.html
 share/doc/sketch/Doc/usersguide-2.html
 share/doc/sketch/Doc/usersguide-3.html
 share/doc/sketch/Doc/usersguide-4.html
@@ -119,10 +117,14 @@ share/sketch/Plugins/Filters/ailoader.py
 share/sketch/Plugins/Filters/ailoader.pyc
 share/sketch/Plugins/Filters/aisaver.py
 share/sketch/Plugins/Filters/aisaver.pyc
+share/sketch/Plugins/Filters/bziploader.py
+share/sketch/Plugins/Filters/bziploader.pyc
 share/sketch/Plugins/Filters/cmxloader.py
 share/sketch/Plugins/Filters/cmxloader.pyc
 share/sketch/Plugins/Filters/gziploader.py
 share/sketch/Plugins/Filters/gziploader.pyc
+share/sketch/Plugins/Filters/pdfgensaver.py
+share/sketch/Plugins/Filters/pdfgensaver.pyc
 share/sketch/Plugins/Filters/skloader.py
 share/sketch/Plugins/Filters/skloader.pyc
 share/sketch/Plugins/Filters/sksaver.py
@@ -184,6 +186,8 @@ share/sketch/Resources/Fontmetrics/pzdr.afm
 share/sketch/Resources/Fontmetrics/std.sfd
 share/sketch/Resources/Messages/de/LC_MESSAGES/sketch.mo
 share/sketch/Resources/Messages/es/LC_MESSAGES/sketch.mo
+share/sketch/Resources/Messages/fr/LC_MESSAGES/sketch.mo
+share/sketch/Resources/Messages/it/LC_MESSAGES/sketch.mo
 share/sketch/Resources/Misc/gamma.spl
 share/sketch/Resources/Misc/mini.spl
 share/sketch/Resources/Misc/pattern.ppm
@@ -196,10 +200,18 @@ share/sketch/Resources/Misc/www.spl
 share/sketch/Script/__init__.py
 share/sketch/Script/abut_horizontal.py
 share/sketch/Script/abut_vertical.py
+share/sketch/Script/average_points.py
+share/sketch/Script/create_spiral.py
 share/sketch/Script/create_star.py
+share/sketch/Script/create_star_outline.py
 share/sketch/Script/create_text.py
+share/sketch/Script/export_raster.py
+share/sketch/Script/save_selection.py
+share/sketch/Script/inspect_beziers.py
 share/sketch/Script/select_same_fill_color.py
 share/sketch/Script/select_same_line_color.py
+share/sketch/Script/spread.py
+share/sketch/Script/unit.py
 share/sketch/Script/usersguide.py
 share/sketch/Sketch/Base/config.py
 share/sketch/Sketch/Base/config.pyc
@@ -243,6 +255,8 @@ share/sketch/Sketch/Graphics/color.py
 share/sketch/Sketch/Graphics/color.pyc
 share/sketch/Sketch/Graphics/compound.py
 share/sketch/Sketch/Graphics/compound.pyc
+share/sketch/Sketch/Graphics/curveop.py
+share/sketch/Sketch/Graphics/curveop.pyc
 share/sketch/Sketch/Graphics/dashes.py
 share/sketch/Sketch/Graphics/dashes.pyc
 share/sketch/Sketch/Graphics/document.py
@@ -311,11 +325,17 @@ share/sketch/Sketch/Modules/_sketchmodule.so
 share/sketch/Sketch/Modules/_type1module.so
 share/sketch/Sketch/Modules/pstokenize.so
 share/sketch/Sketch/Modules/skreadmodule.so
+share/sketch/Sketch/Pixmaps/AlignBottom.gif
 share/sketch/Sketch/Pixmaps/AlignBottom.xbm
+share/sketch/Sketch/Pixmaps/AlignCenterX.gif
 share/sketch/Sketch/Pixmaps/AlignCenterX.xbm
+share/sketch/Sketch/Pixmaps/AlignCenterY.gif
 share/sketch/Sketch/Pixmaps/AlignCenterY.xbm
+share/sketch/Sketch/Pixmaps/AlignLeft.gif
 share/sketch/Sketch/Pixmaps/AlignLeft.xbm
+share/sketch/Sketch/Pixmaps/AlignRight.gif
 share/sketch/Sketch/Pixmaps/AlignRight.xbm
+share/sketch/Sketch/Pixmaps/AlignTop.gif
 share/sketch/Sketch/Pixmaps/AlignTop.xbm
 share/sketch/Sketch/Pixmaps/ArrArrLeft.xbm
 share/sketch/Sketch/Pixmaps/ArrArrRight.xbm
@@ -363,12 +383,17 @@ share/sketch/Sketch/Pixmaps/CurZoom.xbm
 share/sketch/Sketch/Pixmaps/CurZoom_mask.xbm
 share/sketch/Sketch/Pixmaps/Delete.gif
 share/sketch/Sketch/Pixmaps/Delete.xbm
+share/sketch/Sketch/Pixmaps/Duplicate.gif
 share/sketch/Sketch/Pixmaps/Duplicate.xbm
 share/sketch/Sketch/Pixmaps/EditMode.xbm
+share/sketch/Sketch/Pixmaps/FlipHorizontal.gif
 share/sketch/Sketch/Pixmaps/FlipHorizontal.xbm
+share/sketch/Sketch/Pixmaps/FlipVertical.gif
 share/sketch/Sketch/Pixmaps/FlipVertical.xbm
 share/sketch/Sketch/Pixmaps/GridOn.xbm
+share/sketch/Sketch/Pixmaps/Group.gif
 share/sketch/Sketch/Pixmaps/Group.xbm
+share/sketch/Sketch/Pixmaps/Image.gif
 share/sketch/Sketch/Pixmaps/Image.xbm
 share/sketch/Sketch/Pixmaps/JoinBevel.xbm
 share/sketch/Sketch/Pixmaps/JoinMiter.xbm
@@ -399,6 +424,7 @@ share/sketch/Sketch/Pixmaps/Redo.gif
 share/sketch/Sketch/Pixmaps/Redo.xbm
 share/sketch/Sketch/Pixmaps/Save.gif
 share/sketch/Sketch/Pixmaps/Save.xbm
+share/sketch/Sketch/Pixmaps/SelectionMode.gif
 share/sketch/Sketch/Pixmaps/SelectionMode.xbm
 share/sketch/Sketch/Pixmaps/ShearLR.xbm
 share/sketch/Sketch/Pixmaps/ShearUD.xbm
@@ -410,6 +436,7 @@ share/sketch/Sketch/Pixmaps/TurnTL.xbm
 share/sketch/Sketch/Pixmaps/TurnTR.xbm
 share/sketch/Sketch/Pixmaps/Undo.gif
 share/sketch/Sketch/Pixmaps/Undo.xbm
+share/sketch/Sketch/Pixmaps/Ungroup.gif
 share/sketch/Sketch/Pixmaps/Ungroup.xbm
 share/sketch/Sketch/Pixmaps/Zoom.gif
 share/sketch/Sketch/Pixmaps/Zoom.xbm
@@ -529,6 +556,10 @@ share/sketch/sketch.py
 @dirrm share/sketch/Sketch
 @dirrm share/sketch/Script
 @dirrm share/sketch/Resources/Misc
+@dirrm share/sketch/Resources/Messages/it/LC_MESSAGES
+@dirrm share/sketch/Resources/Messages/it
+@dirrm share/sketch/Resources/Messages/fr/LC_MESSAGES
+@dirrm share/sketch/Resources/Messages/fr
 @dirrm share/sketch/Resources/Messages/es/LC_MESSAGES
 @dirrm share/sketch/Resources/Messages/es
 @dirrm share/sketch/Resources/Messages/de/LC_MESSAGES