Upgrade to 0.6.13.

10 files changed, 86 insertions, 6 deletions

diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index e064b59d2fff..e9df51b3c9a1 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.12
+PORTVERSION=	0.6.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,8 @@ 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
+SKETCHSCRIPTS=	finishinst.py sk2ppm.py sk2ps.py skconvert.py sketch.py \
+		skshow.py
 
 do-configure:
 	@(cd ${WRKSRC} && \
@@ -53,9 +54,15 @@ do-install:
 	(cd ${WRKSRC}/Examples; ${TAR} cf - .) | (cd ${SKETCHEXDIR}; ${TAR} xf -)
 	(cd ${SKETCHDIR}; ${PYTHON_CMD} finishinst.py)
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
+		< ${FILESDIR}/sk2ppm.in > ${PREFIX}/bin/sk2ppm
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/sk2ppm
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
 		< ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/sk2ps
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
+		< ${FILESDIR}/skconvert.in > ${PREFIX}/bin/skconvert
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/skconvert
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
 		< ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/sketch
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
diff --git a/graphics/skencil/distinfo b/graphics/skencil/distinfo
index c28fa2daad16..363355699f83 100644
--- a/graphics/skencil/distinfo
+++ b/graphics/skencil/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.12.tar.gz) = 4803e2ce7e2bcd01896471b4a4ba5ed4
+MD5 (sketch-0.6.13.tar.gz) = c9cb61c8dd4116f4466ba60887631b26
diff --git a/graphics/skencil/files/sk2ppm.in b/graphics/skencil/files/sk2ppm.in
new file mode 100644
index 000000000000..fa9c561829c3
--- /dev/null
+++ b/graphics/skencil/files/sk2ppm.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/sk2ppm.py $@
diff --git a/graphics/skencil/files/skconvert.in b/graphics/skencil/files/skconvert.in
new file mode 100644
index 000000000000..ffbcf696f71e
--- /dev/null
+++ b/graphics/skencil/files/skconvert.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/skconvert.py $@
diff --git a/graphics/skencil/pkg-plist b/graphics/skencil/pkg-plist
index 54dffe14394e..8581fb7d61d1 100644
--- a/graphics/skencil/pkg-plist
+++ b/graphics/skencil/pkg-plist
@@ -1,4 +1,6 @@
+bin/sk2ppm
 bin/sk2ps
+bin/skconvert
 bin/sketch
 bin/skshow
 %%PORTDOCS%%share/doc/sketch/BUGS
@@ -113,6 +115,10 @@ share/sketch/Pax/X.py
 share/sketch/Pax/X.pyc
 share/sketch/Pax/paxmodule.so
 share/sketch/Pax/paxtkinter.so
+share/sketch/Plugins/Filters/Lib/drawfile.py
+share/sketch/Plugins/Filters/Lib/drawfile.pyc
+share/sketch/Plugins/Filters/Lib/spritefile.py
+share/sketch/Plugins/Filters/Lib/spritefile.pyc
 share/sketch/Plugins/Filters/ailoader.py
 share/sketch/Plugins/Filters/ailoader.pyc
 share/sketch/Plugins/Filters/aisaver.py
@@ -121,6 +127,8 @@ 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/drawinput.py
+share/sketch/Plugins/Filters/drawinput.pyc
 share/sketch/Plugins/Filters/gziploader.py
 share/sketch/Plugins/Filters/gziploader.pyc
 share/sketch/Plugins/Filters/pdfgensaver.py
@@ -137,8 +145,20 @@ share/sketch/Plugins/Filters/wmfloader.py
 share/sketch/Plugins/Filters/wmfloader.pyc
 share/sketch/Plugins/Filters/xfigloader.py
 share/sketch/Plugins/Filters/xfigloader.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/TextEditor.py
+share/sketch/Plugins/Objects/Lib/multilinetext/TextEditor.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/__init__.py
+share/sketch/Plugins/Objects/Lib/multilinetext/__init__.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/chunker.py
+share/sketch/Plugins/Objects/Lib/multilinetext/chunker.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/iterator.py
+share/sketch/Plugins/Objects/Lib/multilinetext/iterator.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/styletext.py
+share/sketch/Plugins/Objects/Lib/multilinetext/styletext.pyc
 share/sketch/Plugins/Objects/lcdtext.py
 share/sketch/Plugins/Objects/lcdtext.pyc
+share/sketch/Plugins/Objects/multilinetext.py
+share/sketch/Plugins/Objects/multilinetext.pyc
 share/sketch/Plugins/Objects/regpoly.py
 share/sketch/Plugins/Objects/regpoly.pyc
 share/sketch/Resources/Fontmetrics/alias.sfd
@@ -211,6 +231,8 @@ 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/reload_image.py
+share/sketch/Script/simple_separation.py
 share/sketch/Script/spread.py
 share/sketch/Script/unit.py
 share/sketch/Script/usersguide.py
@@ -544,7 +566,9 @@ share/sketch/Sketch/VERSION
 share/sketch/Sketch/__init__.py
 share/sketch/Sketch/__init__.pyc
 share/sketch/finishinst.py
+share/sketch/sk2ppm.py
 share/sketch/sk2ps.py
+share/sketch/skconvert.py
 share/sketch/sketch.py
 share/sketch/skshow.py
 @dirrm share/sketch/Sketch/UI
@@ -571,7 +595,10 @@ share/sketch/skshow.py
 @dirrm share/sketch/Resources/Messages
 @dirrm share/sketch/Resources/Fontmetrics
 @dirrm share/sketch/Resources
+@dirrm share/sketch/Plugins/Objects/Lib/multilinetext
+@dirrm share/sketch/Plugins/Objects/Lib
 @dirrm share/sketch/Plugins/Objects
+@dirrm share/sketch/Plugins/Filters/Lib
 @dirrm share/sketch/Plugins/Filters
 @dirrm share/sketch/Plugins
 @dirrm share/sketch/Pax/Generate
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index e064b59d2fff..e9df51b3c9a1 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.12
+PORTVERSION=	0.6.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,8 @@ 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
+SKETCHSCRIPTS=	finishinst.py sk2ppm.py sk2ps.py skconvert.py sketch.py \
+		skshow.py
 
 do-configure:
 	@(cd ${WRKSRC} && \
@@ -53,9 +54,15 @@ do-install:
 	(cd ${WRKSRC}/Examples; ${TAR} cf - .) | (cd ${SKETCHEXDIR}; ${TAR} xf -)
 	(cd ${SKETCHDIR}; ${PYTHON_CMD} finishinst.py)
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
+		< ${FILESDIR}/sk2ppm.in > ${PREFIX}/bin/sk2ppm
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/sk2ppm
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
 		< ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/sk2ps
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
+		< ${FILESDIR}/skconvert.in > ${PREFIX}/bin/skconvert
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/skconvert
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
 		< ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/sketch
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index c28fa2daad16..363355699f83 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.12.tar.gz) = 4803e2ce7e2bcd01896471b4a4ba5ed4
+MD5 (sketch-0.6.13.tar.gz) = c9cb61c8dd4116f4466ba60887631b26
diff --git a/graphics/sketch/files/sk2ppm.in b/graphics/sketch/files/sk2ppm.in
new file mode 100644
index 000000000000..fa9c561829c3
--- /dev/null
+++ b/graphics/sketch/files/sk2ppm.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/sk2ppm.py $@
diff --git a/graphics/sketch/files/skconvert.in b/graphics/sketch/files/skconvert.in
new file mode 100644
index 000000000000..ffbcf696f71e
--- /dev/null
+++ b/graphics/sketch/files/skconvert.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/skconvert.py $@
diff --git a/graphics/sketch/pkg-plist b/graphics/sketch/pkg-plist
index 54dffe14394e..8581fb7d61d1 100644
--- a/graphics/sketch/pkg-plist
+++ b/graphics/sketch/pkg-plist
@@ -1,4 +1,6 @@
+bin/sk2ppm
 bin/sk2ps
+bin/skconvert
 bin/sketch
 bin/skshow
 %%PORTDOCS%%share/doc/sketch/BUGS
@@ -113,6 +115,10 @@ share/sketch/Pax/X.py
 share/sketch/Pax/X.pyc
 share/sketch/Pax/paxmodule.so
 share/sketch/Pax/paxtkinter.so
+share/sketch/Plugins/Filters/Lib/drawfile.py
+share/sketch/Plugins/Filters/Lib/drawfile.pyc
+share/sketch/Plugins/Filters/Lib/spritefile.py
+share/sketch/Plugins/Filters/Lib/spritefile.pyc
 share/sketch/Plugins/Filters/ailoader.py
 share/sketch/Plugins/Filters/ailoader.pyc
 share/sketch/Plugins/Filters/aisaver.py
@@ -121,6 +127,8 @@ 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/drawinput.py
+share/sketch/Plugins/Filters/drawinput.pyc
 share/sketch/Plugins/Filters/gziploader.py
 share/sketch/Plugins/Filters/gziploader.pyc
 share/sketch/Plugins/Filters/pdfgensaver.py
@@ -137,8 +145,20 @@ share/sketch/Plugins/Filters/wmfloader.py
 share/sketch/Plugins/Filters/wmfloader.pyc
 share/sketch/Plugins/Filters/xfigloader.py
 share/sketch/Plugins/Filters/xfigloader.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/TextEditor.py
+share/sketch/Plugins/Objects/Lib/multilinetext/TextEditor.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/__init__.py
+share/sketch/Plugins/Objects/Lib/multilinetext/__init__.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/chunker.py
+share/sketch/Plugins/Objects/Lib/multilinetext/chunker.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/iterator.py
+share/sketch/Plugins/Objects/Lib/multilinetext/iterator.pyc
+share/sketch/Plugins/Objects/Lib/multilinetext/styletext.py
+share/sketch/Plugins/Objects/Lib/multilinetext/styletext.pyc
 share/sketch/Plugins/Objects/lcdtext.py
 share/sketch/Plugins/Objects/lcdtext.pyc
+share/sketch/Plugins/Objects/multilinetext.py
+share/sketch/Plugins/Objects/multilinetext.pyc
 share/sketch/Plugins/Objects/regpoly.py
 share/sketch/Plugins/Objects/regpoly.pyc
 share/sketch/Resources/Fontmetrics/alias.sfd
@@ -211,6 +231,8 @@ 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/reload_image.py
+share/sketch/Script/simple_separation.py
 share/sketch/Script/spread.py
 share/sketch/Script/unit.py
 share/sketch/Script/usersguide.py
@@ -544,7 +566,9 @@ share/sketch/Sketch/VERSION
 share/sketch/Sketch/__init__.py
 share/sketch/Sketch/__init__.pyc
 share/sketch/finishinst.py
+share/sketch/sk2ppm.py
 share/sketch/sk2ps.py
+share/sketch/skconvert.py
 share/sketch/sketch.py
 share/sketch/skshow.py
 @dirrm share/sketch/Sketch/UI
@@ -571,7 +595,10 @@ share/sketch/skshow.py
 @dirrm share/sketch/Resources/Messages
 @dirrm share/sketch/Resources/Fontmetrics
 @dirrm share/sketch/Resources
+@dirrm share/sketch/Plugins/Objects/Lib/multilinetext
+@dirrm share/sketch/Plugins/Objects/Lib
 @dirrm share/sketch/Plugins/Objects
+@dirrm share/sketch/Plugins/Filters/Lib
 @dirrm share/sketch/Plugins/Filters
 @dirrm share/sketch/Plugins
 @dirrm share/sketch/Pax/Generate