Update sketch to 0.6.2.

Fix elf rpath.

New stable version, 0.6.2.
	SVG import/export filters.
	Improved AI import filter
	more details: http://www.online.de/home/sketch/relnotes.html

5 files changed, 78 insertions, 96 deletions

diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index b904b9a3699..c3a60638198 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/08/06 00:32:16 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 1999/09/20 05:04:03 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.4 1999/05/19 09:41:06 tg Exp $
 
-DISTNAME=	sketch-0.6.1
+DISTNAME=	sketch-0.6.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.online.de/home/sketch/
 
@@ -11,13 +11,18 @@ HOMEPAGE=	http://www.online.de/home/sketch/
 DEPENDS+=	py-imaging-1.0b1:../../graphics/py-imaging
 DEPENDS+=	py-Tk-1.5.2:../../x11/py-Tk
 
+USE_X11=	YES
+
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 
+echo:
+	echo ${LIBS}
+
 do-configure:
-	@(cd ${WRKSRC} && \
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 	    python setup.py configure --imaging-include=${PREFIX}/include/PIL)
 
 do-build:
@@ -26,18 +31,18 @@ do-build:
 do-install:
 	${MKDIR} ${SKETCHDIR}
 .for dir in Filter Pax Plugins Resources Script Sketch
-	(cd ${WRKSRC}; tar -c -f - --exclude-from=${FILESDIR}/excludelist ${dir}) | \
-	    (cd ${SKETCHDIR}/; tar xf -)
+	(cd ${WRKSRC}; ${GTAR} -c -f - --exclude-from=${FILESDIR}/excludelist ${dir}) | \
+	    (cd ${SKETCHDIR}/; ${GTAR} xf -)
 .endfor
 	(cd ${WRKSRC}; ${INSTALL_SCRIPT} finishinst.py sk2ps.py sketch.py ${SKETCHDIR})
 	${MKDIR} ${SKETCHDOCDIR}
-	(cd ${WRKSRC}; tar cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; tar xf -)
+	(cd ${WRKSRC}; ${GTAR} cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; ${GTAR} xf -)
 	${MKDIR} ${SKETCHEXDIR}
-	(cd ${WRKSRC}/Examples; tar cf - .) | (cd ${SKETCHEXDIR}; tar xf -)
+	(cd ${WRKSRC}/Examples; ${GTAR} cf - .) | (cd ${SKETCHEXDIR}; ${GTAR} xf -)
 	(cd ${SKETCHDIR}; python finishinst.py)
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
-	chmod +x ${PREFIX}/bin/sketch
+	${CHMOD} +x ${PREFIX}/bin/sketch
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps
-	chmod +x ${PREFIX}/bin/sk2ps
+	${CHMOD} +x ${PREFIX}/bin/sk2ps
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sketch/files/md5 b/graphics/sketch/files/md5
index 6b23e92ef6d..ce6ff063f78 100644
--- a/graphics/sketch/files/md5
+++ b/graphics/sketch/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/08/06 00:32:17 sakamoto Exp $
+$NetBSD: md5,v 1.4 1999/09/20 05:04:05 sakamoto Exp $
 
-MD5 (sketch-0.6.1.tar.gz) = 5590736bbd7ad8ef73f2b5d4076af4ad
+MD5 (sketch-0.6.2.tar.gz) = 46df44ab440cf270ca83b41e521c4dd9
diff --git a/graphics/sketch/files/patch-sum b/graphics/sketch/files/patch-sum
index 524f5d6582a..7c1909472b6 100644
--- a/graphics/sketch/files/patch-sum
+++ b/graphics/sketch/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/08/06 00:32:17 sakamoto Exp $
+$NetBSD: patch-sum,v 1.3 1999/09/20 05:04:05 sakamoto Exp $
 
-MD5 (patch-aa) = e626ba4eae3d1f906a2172fd77e0d213
+MD5 (patch-aa) = fcca2ae0e607a9d377232fd987554263
diff --git a/graphics/sketch/patches/patch-aa b/graphics/sketch/patches/patch-aa
index 96cccccbf8e..270a2d15a81 100644
--- a/graphics/sketch/patches/patch-aa
+++ b/graphics/sketch/patches/patch-aa
@@ -1,8 +1,15 @@
-$NetBSD: patch-aa,v 1.3 1999/08/06 00:32:17 sakamoto Exp $
+$NetBSD: patch-aa,v 1.4 1999/09/20 05:04:06 sakamoto Exp $
 
---- ./setup.py.orig	Mon Jul 19 02:25:31 1999
-+++ ./setup.py	Fri Aug  6 09:02:10 1999
-@@ -213,5 +213,5 @@
+--- ./setup.py.orig	Fri Aug 20 01:37:29 1999
++++ ./setup.py	Mon Sep 20 12:38:14 1999
+@@ -64,4 +64,6 @@
+         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')
diff --git a/graphics/sketch/pkg/PLIST b/graphics/sketch/pkg/PLIST
index 87005728618..0cfd95b5108 100644
--- a/graphics/sketch/pkg/PLIST
+++ b/graphics/sketch/pkg/PLIST
@@ -1,51 +1,51 @@
-@comment $NetBSD: PLIST,v 1.3 1999/08/06 00:32:17 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/09/20 05:04:06 sakamoto Exp $
 bin/sk2ps
 bin/sketch
 share/doc/sketch/BUGS
-share/doc/sketch/Doc/Images/CreateCurve.gif
-share/doc/sketch/Doc/Images/CreateEllipse.gif
-share/doc/sketch/Doc/Images/CreatePoly.gif
-share/doc/sketch/Doc/Images/CreateRect.gif
-share/doc/sketch/Doc/Images/Delete.gif
-share/doc/sketch/Doc/Images/Duplicate.gif
-share/doc/sketch/Doc/Images/EditMode.gif
-share/doc/sketch/Doc/Images/FlipHorizontal.gif
-share/doc/sketch/Doc/Images/FlipVertical.gif
-share/doc/sketch/Doc/Images/GridOff.gif
-share/doc/sketch/Doc/Images/GridOn.gif
-share/doc/sketch/Doc/Images/Group.gif
-share/doc/sketch/Doc/Images/Image.gif
-share/doc/sketch/Doc/Images/MiniEyeClosed.gif
-share/doc/sketch/Doc/Images/MiniEyeOpen.gif
-share/doc/sketch/Doc/Images/MiniPrintOff.gif
-share/doc/sketch/Doc/Images/MiniPrintOn.gif
-share/doc/sketch/Doc/Images/MoveOneDown.gif
-share/doc/sketch/Doc/Images/MoveOneUp.gif
-share/doc/sketch/Doc/Images/MoveToBottom.gif
-share/doc/sketch/Doc/Images/MoveToTop.gif
-share/doc/sketch/Doc/Images/NewDocument.gif
-share/doc/sketch/Doc/Images/Open.gif
-share/doc/sketch/Doc/Images/Redo.gif
-share/doc/sketch/Doc/Images/Save.gif
-share/doc/sketch/Doc/Images/SelectionMode.gif
-share/doc/sketch/Doc/Images/Text.gif
-share/doc/sketch/Doc/Images/Undo.gif
-share/doc/sketch/Doc/Images/Ungroup.gif
-share/doc/sketch/Doc/Images/Zoom.gif
-share/doc/sketch/Doc/Images/arrow-left.gif
-share/doc/sketch/Doc/Images/arrow-right.gif
-share/doc/sketch/Doc/Images/arrow-up.gif
-share/doc/sketch/Doc/Images/bullet.gif
-share/doc/sketch/Doc/Images/gradient-conical.gif
-share/doc/sketch/Doc/Images/gradient-linear.gif
-share/doc/sketch/Doc/Images/gradient-radial.gif
-share/doc/sketch/Doc/Images/layers.gif
-share/doc/sketch/Doc/Images/selsize.gif
-share/doc/sketch/Doc/Images/seltrafo.gif
-share/doc/sketch/Doc/Images/sketch-logo.gif
-share/doc/sketch/Doc/Images/textpath.gif
-share/doc/sketch/Doc/Images/textpathrot.gif
-share/doc/sketch/Doc/Images/textpathskew.gif
+share/doc/sketch/Doc/Images/CreateCurve.png
+share/doc/sketch/Doc/Images/CreateEllipse.png
+share/doc/sketch/Doc/Images/CreatePoly.png
+share/doc/sketch/Doc/Images/CreateRect.png
+share/doc/sketch/Doc/Images/Delete.png
+share/doc/sketch/Doc/Images/Duplicate.png
+share/doc/sketch/Doc/Images/EditMode.png
+share/doc/sketch/Doc/Images/FlipHorizontal.png
+share/doc/sketch/Doc/Images/FlipVertical.png
+share/doc/sketch/Doc/Images/GridOff.png
+share/doc/sketch/Doc/Images/GridOn.png
+share/doc/sketch/Doc/Images/Group.png
+share/doc/sketch/Doc/Images/Image.png
+share/doc/sketch/Doc/Images/MiniEyeClosed.png
+share/doc/sketch/Doc/Images/MiniEyeOpen.png
+share/doc/sketch/Doc/Images/MiniPrintOff.png
+share/doc/sketch/Doc/Images/MiniPrintOn.png
+share/doc/sketch/Doc/Images/MoveOneDown.png
+share/doc/sketch/Doc/Images/MoveOneUp.png
+share/doc/sketch/Doc/Images/MoveToBottom.png
+share/doc/sketch/Doc/Images/MoveToTop.png
+share/doc/sketch/Doc/Images/NewDocument.png
+share/doc/sketch/Doc/Images/Open.png
+share/doc/sketch/Doc/Images/Redo.png
+share/doc/sketch/Doc/Images/Save.png
+share/doc/sketch/Doc/Images/SelectionMode.png
+share/doc/sketch/Doc/Images/Text.png
+share/doc/sketch/Doc/Images/Undo.png
+share/doc/sketch/Doc/Images/Ungroup.png
+share/doc/sketch/Doc/Images/Zoom.png
+share/doc/sketch/Doc/Images/arrow-left.png
+share/doc/sketch/Doc/Images/arrow-right.png
+share/doc/sketch/Doc/Images/arrow-up.png
+share/doc/sketch/Doc/Images/bullet.png
+share/doc/sketch/Doc/Images/gradient-conical.png
+share/doc/sketch/Doc/Images/gradient-linear.png
+share/doc/sketch/Doc/Images/gradient-radial.png
+share/doc/sketch/Doc/Images/layers.png
+share/doc/sketch/Doc/Images/selsize.png
+share/doc/sketch/Doc/Images/seltrafo.png
+share/doc/sketch/Doc/Images/sketch-logo.png
+share/doc/sketch/Doc/Images/textpath.png
+share/doc/sketch/Doc/Images/textpathrot.png
+share/doc/sketch/Doc/Images/textpathskew.png
 share/doc/sketch/Doc/devguide-1.html
 share/doc/sketch/Doc/devguide-10.html
 share/doc/sketch/Doc/devguide-11.html
@@ -62,29 +62,8 @@ share/doc/sketch/Doc/devguide-20.html
 share/doc/sketch/Doc/devguide-21.html
 share/doc/sketch/Doc/devguide-22.html
 share/doc/sketch/Doc/devguide-23.html
-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-29.html
 share/doc/sketch/Doc/devguide-3.html
-share/doc/sketch/Doc/devguide-30.html
-share/doc/sketch/Doc/devguide-31.html
-share/doc/sketch/Doc/devguide-32.html
-share/doc/sketch/Doc/devguide-33.html
-share/doc/sketch/Doc/devguide-34.html
-share/doc/sketch/Doc/devguide-35.html
-share/doc/sketch/Doc/devguide-36.html
-share/doc/sketch/Doc/devguide-37.html
-share/doc/sketch/Doc/devguide-38.html
-share/doc/sketch/Doc/devguide-39.html
 share/doc/sketch/Doc/devguide-4.html
-share/doc/sketch/Doc/devguide-40.html
-share/doc/sketch/Doc/devguide-41.html
-share/doc/sketch/Doc/devguide-42.html
-share/doc/sketch/Doc/devguide-43.html
-share/doc/sketch/Doc/devguide-44.html
 share/doc/sketch/Doc/devguide-5.html
 share/doc/sketch/Doc/devguide-6.html
 share/doc/sketch/Doc/devguide-7.html
@@ -96,20 +75,7 @@ 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-12.html
-share/doc/sketch/Doc/usersguide-13.html
-share/doc/sketch/Doc/usersguide-14.html
-share/doc/sketch/Doc/usersguide-15.html
-share/doc/sketch/Doc/usersguide-16.html
-share/doc/sketch/Doc/usersguide-17.html
-share/doc/sketch/Doc/usersguide-18.html
-share/doc/sketch/Doc/usersguide-19.html
 share/doc/sketch/Doc/usersguide-2.html
-share/doc/sketch/Doc/usersguide-20.html
-share/doc/sketch/Doc/usersguide-21.html
-share/doc/sketch/Doc/usersguide-22.html
-share/doc/sketch/Doc/usersguide-23.html
-share/doc/sketch/Doc/usersguide-24.html
 share/doc/sketch/Doc/usersguide-3.html
 share/doc/sketch/Doc/usersguide-4.html
 share/doc/sketch/Doc/usersguide-5.html
@@ -156,6 +122,10 @@ share/sketch/Plugins/Filters/skloader.py
 share/sketch/Plugins/Filters/skloader.pyc
 share/sketch/Plugins/Filters/sksaver.py
 share/sketch/Plugins/Filters/sksaver.pyc
+share/sketch/Plugins/Filters/svgloader.py
+share/sketch/Plugins/Filters/svgloader.pyc
+share/sketch/Plugins/Filters/svgsaver.py
+share/sketch/Plugins/Filters/svgsaver.pyc
 share/sketch/Plugins/Filters/wmfloader.py
 share/sketch/Plugins/Filters/wmfloader.pyc
 share/sketch/Plugins/Filters/xfigloader.py