Upgrade to 0.6.7.

4 files changed, 123 insertions, 104 deletions

diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index a970fe23e855..46bcb9787af5 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/sketch/
 
@@ -21,6 +21,7 @@ SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
+SKETCHSCRIPTS=	finishinst.py sk2ps.py sketch.py skshow.py
 
 post-patch:
 	@${PERL} -pi -e "s;%%PORTSDIR%%;${PORTSDIR};" ${WRKSRC}/setup.py
@@ -37,7 +38,7 @@ do-install:
 	(cd ${WRKSRC}; ${TAR} -cf - -X ${FILESDIR}/excludelist ${dir}) | \
 	    (cd ${SKETCHDIR}; ${TAR} xf -)
 .endfor
-	(cd ${WRKSRC}; ${INSTALL_SCRIPT} finishinst.py sk2ps.py sketch.py ${SKETCHDIR})
+	(cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SKETCHSCRIPTS} ${SKETCHDIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${SKETCHDOCDIR}
 	(cd ${WRKSRC}; ${TAR} cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; ${TAR} xf -)
@@ -45,9 +46,11 @@ do-install:
 	@${MKDIR} ${SKETCHEXDIR}
 	(cd ${WRKSRC}/Examples; ${TAR} cf - .) | (cd ${SKETCHEXDIR}; ${TAR} xf -)
 	(cd ${SKETCHDIR}; python finishinst.py)
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
-	${CHMOD} ${BINMODE} ${PREFIX}/bin/sketch
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/sk2ps
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/sketch
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/skshow.in > ${PREFIX}/bin/skshow
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/skshow
 
 .include <bsd.port.mk>
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 9b3c8492d0c7..1ea895f37ed2 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.5.tar.gz) = 84de1215651a2466653fb373414a95d3
+MD5 (sketch-0.6.7.tar.gz) = 1f8ed8722ac7e7eae596393c49168034
diff --git a/graphics/sketch/files/skshow.in b/graphics/sketch/files/skshow.in
new file mode 100644
index 000000000000..12beb1ba397e
--- /dev/null
+++ b/graphics/sketch/files/skshow.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/bin/python @PREFIX@/share/sketch/skshow.py $@
diff --git a/graphics/sketch/pkg-plist b/graphics/sketch/pkg-plist
index 66b31313b883..17741b156e1b 100644
--- a/graphics/sketch/pkg-plist
+++ b/graphics/sketch/pkg-plist
@@ -1,5 +1,106 @@
-bin/sketch
 bin/sk2ps
+bin/sketch
+bin/skshow
+share/doc/sketch/BUGS
+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
+share/doc/sketch/Doc/devguide-12.html
+share/doc/sketch/Doc/devguide-13.html
+share/doc/sketch/Doc/devguide-14.html
+share/doc/sketch/Doc/devguide-15.html
+share/doc/sketch/Doc/devguide-16.html
+share/doc/sketch/Doc/devguide-17.html
+share/doc/sketch/Doc/devguide-18.html
+share/doc/sketch/Doc/devguide-19.html
+share/doc/sketch/Doc/devguide-2.html
+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-3.html
+share/doc/sketch/Doc/devguide-4.html
+share/doc/sketch/Doc/devguide-5.html
+share/doc/sketch/Doc/devguide-6.html
+share/doc/sketch/Doc/devguide-7.html
+share/doc/sketch/Doc/devguide-8.html
+share/doc/sketch/Doc/devguide-9.html
+share/doc/sketch/Doc/devguide.html
+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-2.html
+share/doc/sketch/Doc/usersguide-3.html
+share/doc/sketch/Doc/usersguide-4.html
+share/doc/sketch/Doc/usersguide-5.html
+share/doc/sketch/Doc/usersguide-6.html
+share/doc/sketch/Doc/usersguide-7.html
+share/doc/sketch/Doc/usersguide-8.html
+share/doc/sketch/Doc/usersguide-9.html
+share/doc/sketch/Doc/usersguide.html
+share/doc/sketch/NEWS
+share/doc/sketch/PROJECTS
+share/doc/sketch/README
+share/doc/sketch/TODO
+share/examples/sketch/ellipse.sk
+share/examples/sketch/face.sk
+share/examples/sketch/fill.sk
+share/examples/sketch/flags.sk
+share/examples/sketch/images.sk
+share/examples/sketch/lena.jpg
+share/examples/sketch/line.sk
+share/examples/sketch/pathtext.sk
+share/examples/sketch/pattern.ppm                    
+share/examples/sketch/text.sk
 share/sketch/Filter/streamfilter.so
 share/sketch/Pax/COPYING.xext
 share/sketch/Pax/Generate/mkgc.py
@@ -83,6 +184,7 @@ 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/Misc/gamma.spl
 share/sketch/Resources/Misc/mini.spl
 share/sketch/Resources/Misc/pattern.ppm
@@ -95,11 +197,17 @@ 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/save_selection.py
 share/sketch/Script/select_same_fill_color.py
 share/sketch/Script/select_same_line_color.py
+share/sketch/Script/inspect_beziers.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
@@ -431,104 +539,7 @@ share/sketch/Sketch/__init__.pyc
 share/sketch/finishinst.py
 share/sketch/sk2ps.py
 share/sketch/sketch.py
-share/doc/sketch/BUGS
-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
-share/doc/sketch/Doc/devguide-12.html
-share/doc/sketch/Doc/devguide-13.html
-share/doc/sketch/Doc/devguide-14.html
-share/doc/sketch/Doc/devguide-15.html
-share/doc/sketch/Doc/devguide-16.html
-share/doc/sketch/Doc/devguide-17.html
-share/doc/sketch/Doc/devguide-18.html
-share/doc/sketch/Doc/devguide-19.html
-share/doc/sketch/Doc/devguide-2.html
-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-3.html
-share/doc/sketch/Doc/devguide-4.html
-share/doc/sketch/Doc/devguide-5.html
-share/doc/sketch/Doc/devguide-6.html
-share/doc/sketch/Doc/devguide-7.html
-share/doc/sketch/Doc/devguide-8.html
-share/doc/sketch/Doc/devguide-9.html
-share/doc/sketch/Doc/devguide.html
-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-2.html
-share/doc/sketch/Doc/usersguide-3.html
-share/doc/sketch/Doc/usersguide-4.html
-share/doc/sketch/Doc/usersguide-5.html
-share/doc/sketch/Doc/usersguide-6.html
-share/doc/sketch/Doc/usersguide-7.html
-share/doc/sketch/Doc/usersguide-8.html
-share/doc/sketch/Doc/usersguide-9.html
-share/doc/sketch/Doc/usersguide.html
-share/doc/sketch/NEWS
-share/doc/sketch/PROJECTS
-share/doc/sketch/README
-share/doc/sketch/TODO
-share/examples/sketch/ellipse.sk
-share/examples/sketch/face.sk
-share/examples/sketch/fill.sk
-share/examples/sketch/flags.sk
-share/examples/sketch/images.sk
-share/examples/sketch/lena.jpg
-share/examples/sketch/line.sk
-share/examples/sketch/pathtext.sk
-share/examples/sketch/pattern.ppm                    
-share/examples/sketch/text.sk
+share/sketch/skshow.py
 @dirrm share/sketch/Sketch/UI
 @dirrm share/sketch/Sketch/Scripting
 @dirrm share/sketch/Sketch/Pixmaps/New12
@@ -540,6 +551,8 @@ share/examples/sketch/text.sk
 @dirrm share/sketch/Sketch
 @dirrm share/sketch/Script
 @dirrm share/sketch/Resources/Misc
+@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