6 files changed, 41 insertions, 14 deletions

diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 1a10e5fab8b7..035605e11868 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -13,11 +13,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
-RUN_DEPENDS=	${LOCALBASE}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${LOCALBASE}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging \
-		${LOCALBASE}/lib/python1.5/site-packages/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \
-		${LOCALBASE}/lib/python1.5/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
+BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \
+		${PYXML}
+
+USE_PYTHON=	yes
 
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
@@ -29,10 +31,10 @@ post-patch:
 	@${PERL} -pi -e "s;%%PORTSDIR%%;${PORTSDIR};" ${WRKSRC}/setup.py
 
 do-configure:
-	@(cd ${WRKSRC} && python setup.py configure)
+	@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py configure)
 
 do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} python setup.py build)
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
 
 do-install:
 	@${MKDIR} ${SKETCHDIR}
@@ -47,12 +49,15 @@ do-install:
 .endif
 	@${MKDIR} ${SKETCHEXDIR}
 	(cd ${WRKSRC}/Examples; ${TAR} cf - .) | (cd ${SKETCHEXDIR}; ${TAR} xf -)
-	(cd ${SKETCHDIR}; python finishinst.py)
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps
+	(cd ${SKETCHDIR}; ${PYTHON_CMD} finishinst.py)
+	${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" < ${FILESDIR}/sketch.in > ${PREFIX}/bin/sketch
+	${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" < ${FILESDIR}/skshow.in > ${PREFIX}/bin/skshow
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
+		< ${FILESDIR}/skshow.in > ${PREFIX}/bin/skshow
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/skshow
 
 .include <bsd.port.mk>
diff --git a/graphics/sketch/files/excludelist b/graphics/sketch/files/excludelist
index 7cacae600772..f1af7b3ca8a3 100644
--- a/graphics/sketch/files/excludelist
+++ b/graphics/sketch/files/excludelist
@@ -10,3 +10,4 @@ README
 *.c
 *.h
 *.o
+*.orig
diff --git a/graphics/sketch/files/patch-skcolor.c b/graphics/sketch/files/patch-skcolor.c
new file mode 100644
index 000000000000..95398f57aff9
--- /dev/null
+++ b/graphics/sketch/files/patch-skcolor.c
@@ -0,0 +1,21 @@
+--- Sketch/Modules/skcolor.c.orig	Wed Oct  6 23:46:00 1999
++++ Sketch/Modules/skcolor.c	Mon Sep 11 19:35:33 2000
+@@ -484,10 +484,14 @@
+ 	}
+ 	PyMem_DEL(self->dither_matrix);
+     }
+-    PyMem_XDEL(self->dither_red);
+-    PyMem_XDEL(self->dither_green);
+-    PyMem_XDEL(self->dither_blue);
+-    PyMem_XDEL(self->dither_gray);
++    if (self->dither_red)
++	PyMem_DEL(self->dither_red);
++    if (self->dither_green)
++	PyMem_DEL(self->dither_green);
++    if (self->dither_blue)
++	PyMem_DEL(self->dither_blue);
++    if (self->dither_gray)
++	PyMem_DEL(self->dither_gray);
+ }
+ 
+ static int
diff --git a/graphics/sketch/files/sk2ps.in b/graphics/sketch/files/sk2ps.in
index 46a48ca86953..1f7514e8b714 100644
--- a/graphics/sketch/files/sk2ps.in
+++ b/graphics/sketch/files/sk2ps.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec @PREFIX@/bin/python @PREFIX@/share/sketch/sk2ps.py $@
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/sk2ps.py $@
diff --git a/graphics/sketch/files/sketch.in b/graphics/sketch/files/sketch.in
index 68d9f715af23..9b4b96925a56 100644
--- a/graphics/sketch/files/sketch.in
+++ b/graphics/sketch/files/sketch.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec @PREFIX@/bin/python @PREFIX@/share/sketch/sketch.py $@
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/sketch.py $@
diff --git a/graphics/sketch/files/skshow.in b/graphics/sketch/files/skshow.in
index 12beb1ba397e..9d3eacabdbf4 100644
--- a/graphics/sketch/files/skshow.in
+++ b/graphics/sketch/files/skshow.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec @PREFIX@/bin/python @PREFIX@/share/sketch/skshow.py $@
+exec @PYTHON_CMD@ @PREFIX@/share/sketch/skshow.py $@