aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authortg <tg@FreeBSD.org>2000-09-12 19:54:11 +0800
committertg <tg@FreeBSD.org>2000-09-12 19:54:11 +0800
commit0caafb3a6c9d91f7737addb392f2fbd749edffbb (patch)
tree3bd77773d5709e6b5c4dc4c2fc5531210285ce26 /graphics
parent54d1e69edb725b40cbb7f9314fcfeb1db0528d4f (diff)
downloadfreebsd-ports-gnome-0caafb3a6c9d91f7737addb392f2fbd749edffbb.tar.gz
freebsd-ports-gnome-0caafb3a6c9d91f7737addb392f2fbd749edffbb.tar.zst
freebsd-ports-gnome-0caafb3a6c9d91f7737addb392f2fbd749edffbb.zip
Use bsd.python.mk.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/py-imaging/Makefile18
-rw-r--r--graphics/py-imaging/files/Setup2
-rw-r--r--graphics/py-imaging/pkg-plist374
-rw-r--r--graphics/skencil/Makefile27
-rw-r--r--graphics/skencil/files/excludelist1
-rw-r--r--graphics/skencil/files/patch-skcolor.c21
-rw-r--r--graphics/skencil/files/sk2ps.in2
-rw-r--r--graphics/skencil/files/sketch.in2
-rw-r--r--graphics/skencil/files/skshow.in2
-rw-r--r--graphics/sketch/Makefile27
-rw-r--r--graphics/sketch/files/excludelist1
-rw-r--r--graphics/sketch/files/patch-skcolor.c21
-rw-r--r--graphics/sketch/files/sk2ps.in2
-rw-r--r--graphics/sketch/files/sketch.in2
-rw-r--r--graphics/sketch/files/skshow.in2
15 files changed, 280 insertions, 224 deletions
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index af59f245e0c2..76d8fc8e18c7 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -16,27 +16,29 @@ DISTNAME= Imaging-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= ${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS= ${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
DIST_SUBDIR= python
+USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/libImaging
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-jpeg=${PREFIX}/lib
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
MAKE_FLAGS= OPT="${CFLAGS}"
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-PILDIR= ${PYTHONSCRIPTDIR}/site-packages/PIL
+PILDIR= ${PYTHON_SITELIBDIR}/PIL
PILDOCDIR= ${PREFIX}/share/doc/PIL
PILEXDIR= ${PREFIX}/share/examples/PIL
-PILINCDIR= ${PREFIX}/include/python1.5
+PILINCDIR= ${PREFIX}/include/${PYTHON_VERSION}
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}/..
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}/..
post-configure:
- @(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC}/..; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
post-build:
@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} sharedmods)
@@ -46,8 +48,8 @@ do-install:
@${MKDIR} ${PILDIR}
${INSTALL_DATA} ${WRKSRC}/../PIL/* ${PILDIR}
${INSTALL_DATA} ${WRKSRC}/../PIL.pth ${PILDIR}/..
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${PILDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${PILDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
@${MKDIR} ${PILDOCDIR}
${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
${INSTALL_DATA} ${WRKSRC}/../FORMATS ${PILDOCDIR}
diff --git a/graphics/py-imaging/files/Setup b/graphics/py-imaging/files/Setup
index 17221d410e39..7e7f2cbb62cb 100644
--- a/graphics/py-imaging/files/Setup
+++ b/graphics/py-imaging/files/Setup
@@ -1,4 +1,4 @@
*shared*
_imaging _imaging.c decode.c encode.c map.c display.c outline.c path.c -IlibImaging libImaging/libImaging.a -I${PREFIX}/include -L${PREFIX}/lib -ljpeg -lz
-_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 -L${PREFIX}/lib -ltk82 -ltcl82 -L${X11BASE}/lib -lX11
+_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3 -L${PREFIX}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11
diff --git a/graphics/py-imaging/pkg-plist b/graphics/py-imaging/pkg-plist
index 53d73ed38dd5..a6f115a7d8f5 100644
--- a/graphics/py-imaging/pkg-plist
+++ b/graphics/py-imaging/pkg-plist
@@ -1,189 +1,189 @@
-include/python1.5/ImConfig.h
-include/python1.5/ImPlatform.h
-include/python1.5/Imaging.h
-lib/python1.5/site-packages/PIL/ArgImagePlugin.py
-lib/python1.5/site-packages/PIL/ArgImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ArgImagePlugin.pyo
-lib/python1.5/site-packages/PIL/BdfFontFile.py
-lib/python1.5/site-packages/PIL/BdfFontFile.pyc
-lib/python1.5/site-packages/PIL/BdfFontFile.pyo
-lib/python1.5/site-packages/PIL/BmpImagePlugin.py
-lib/python1.5/site-packages/PIL/BmpImagePlugin.pyc
-lib/python1.5/site-packages/PIL/BmpImagePlugin.pyo
-lib/python1.5/site-packages/PIL/ContainerIO.py
-lib/python1.5/site-packages/PIL/ContainerIO.pyc
-lib/python1.5/site-packages/PIL/ContainerIO.pyo
-lib/python1.5/site-packages/PIL/CurImagePlugin.py
-lib/python1.5/site-packages/PIL/CurImagePlugin.pyc
-lib/python1.5/site-packages/PIL/CurImagePlugin.pyo
-lib/python1.5/site-packages/PIL/DcxImagePlugin.py
-lib/python1.5/site-packages/PIL/DcxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/DcxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/EpsImagePlugin.py
-lib/python1.5/site-packages/PIL/EpsImagePlugin.pyc
-lib/python1.5/site-packages/PIL/EpsImagePlugin.pyo
-lib/python1.5/site-packages/PIL/FliImagePlugin.py
-lib/python1.5/site-packages/PIL/FliImagePlugin.pyc
-lib/python1.5/site-packages/PIL/FliImagePlugin.pyo
-lib/python1.5/site-packages/PIL/FontFile.py
-lib/python1.5/site-packages/PIL/FontFile.pyc
-lib/python1.5/site-packages/PIL/FontFile.pyo
-lib/python1.5/site-packages/PIL/FpxImagePlugin.py
-lib/python1.5/site-packages/PIL/FpxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/FpxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GbrImagePlugin.py
-lib/python1.5/site-packages/PIL/GbrImagePlugin.pyc
-lib/python1.5/site-packages/PIL/GbrImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GdImageFile.py
-lib/python1.5/site-packages/PIL/GdImageFile.pyc
-lib/python1.5/site-packages/PIL/GdImageFile.pyo
-lib/python1.5/site-packages/PIL/GifImagePlugin.py
-lib/python1.5/site-packages/PIL/GifImagePlugin.pyc
-lib/python1.5/site-packages/PIL/GifImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GimpGradientFile.py
-lib/python1.5/site-packages/PIL/GimpGradientFile.pyc
-lib/python1.5/site-packages/PIL/GimpGradientFile.pyo
-lib/python1.5/site-packages/PIL/GimpPaletteFile.py
-lib/python1.5/site-packages/PIL/GimpPaletteFile.pyc
-lib/python1.5/site-packages/PIL/GimpPaletteFile.pyo
-lib/python1.5/site-packages/PIL/IcoImagePlugin.py
-lib/python1.5/site-packages/PIL/IcoImagePlugin.pyc
-lib/python1.5/site-packages/PIL/IcoImagePlugin.pyo
-lib/python1.5/site-packages/PIL/ImImagePlugin.py
-lib/python1.5/site-packages/PIL/ImImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ImImagePlugin.pyo
-lib/python1.5/site-packages/PIL/Image.py
-lib/python1.5/site-packages/PIL/Image.pyc
-lib/python1.5/site-packages/PIL/Image.pyo
-lib/python1.5/site-packages/PIL/ImageChops.py
-lib/python1.5/site-packages/PIL/ImageChops.pyc
-lib/python1.5/site-packages/PIL/ImageChops.pyo
-lib/python1.5/site-packages/PIL/ImageDraw.py
-lib/python1.5/site-packages/PIL/ImageDraw.pyc
-lib/python1.5/site-packages/PIL/ImageDraw.pyo
-lib/python1.5/site-packages/PIL/ImageEnhance.py
-lib/python1.5/site-packages/PIL/ImageEnhance.pyc
-lib/python1.5/site-packages/PIL/ImageEnhance.pyo
-lib/python1.5/site-packages/PIL/ImageFile.py
-lib/python1.5/site-packages/PIL/ImageFile.pyc
-lib/python1.5/site-packages/PIL/ImageFile.pyo
-lib/python1.5/site-packages/PIL/ImageFileIO.py
-lib/python1.5/site-packages/PIL/ImageFileIO.pyc
-lib/python1.5/site-packages/PIL/ImageFileIO.pyo
-lib/python1.5/site-packages/PIL/ImageFilter.py
-lib/python1.5/site-packages/PIL/ImageFilter.pyc
-lib/python1.5/site-packages/PIL/ImageFilter.pyo
-lib/python1.5/site-packages/PIL/ImageFont.py
-lib/python1.5/site-packages/PIL/ImageFont.pyc
-lib/python1.5/site-packages/PIL/ImageFont.pyo
-lib/python1.5/site-packages/PIL/ImagePalette.py
-lib/python1.5/site-packages/PIL/ImagePalette.pyc
-lib/python1.5/site-packages/PIL/ImagePalette.pyo
-lib/python1.5/site-packages/PIL/ImagePath.py
-lib/python1.5/site-packages/PIL/ImagePath.pyc
-lib/python1.5/site-packages/PIL/ImagePath.pyo
-lib/python1.5/site-packages/PIL/ImageSequence.py
-lib/python1.5/site-packages/PIL/ImageSequence.pyc
-lib/python1.5/site-packages/PIL/ImageSequence.pyo
-lib/python1.5/site-packages/PIL/ImageStat.py
-lib/python1.5/site-packages/PIL/ImageStat.pyc
-lib/python1.5/site-packages/PIL/ImageStat.pyo
-lib/python1.5/site-packages/PIL/ImageTk.py
-lib/python1.5/site-packages/PIL/ImageTk.pyc
-lib/python1.5/site-packages/PIL/ImageTk.pyo
-lib/python1.5/site-packages/PIL/ImageWin.py
-lib/python1.5/site-packages/PIL/ImageWin.pyc
-lib/python1.5/site-packages/PIL/ImageWin.pyo
-lib/python1.5/site-packages/PIL/ImtImagePlugin.py
-lib/python1.5/site-packages/PIL/ImtImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ImtImagePlugin.pyo
-lib/python1.5/site-packages/PIL/IptcImagePlugin.py
-lib/python1.5/site-packages/PIL/IptcImagePlugin.pyc
-lib/python1.5/site-packages/PIL/IptcImagePlugin.pyo
-lib/python1.5/site-packages/PIL/JpegImagePlugin.py
-lib/python1.5/site-packages/PIL/JpegImagePlugin.pyc
-lib/python1.5/site-packages/PIL/JpegImagePlugin.pyo
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.py
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.pyc
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MicImagePlugin.py
-lib/python1.5/site-packages/PIL/MicImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MicImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MpegImagePlugin.py
-lib/python1.5/site-packages/PIL/MpegImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MpegImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MspImagePlugin.py
-lib/python1.5/site-packages/PIL/MspImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MspImagePlugin.pyo
-lib/python1.5/site-packages/PIL/OleFileIO.py
-lib/python1.5/site-packages/PIL/OleFileIO.pyc
-lib/python1.5/site-packages/PIL/OleFileIO.pyo
-lib/python1.5/site-packages/PIL/PSDraw.py
-lib/python1.5/site-packages/PIL/PSDraw.pyc
-lib/python1.5/site-packages/PIL/PSDraw.pyo
-lib/python1.5/site-packages/PIL/PaletteFile.py
-lib/python1.5/site-packages/PIL/PaletteFile.pyc
-lib/python1.5/site-packages/PIL/PaletteFile.pyo
-lib/python1.5/site-packages/PIL/PcdImagePlugin.py
-lib/python1.5/site-packages/PIL/PcdImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PcdImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PcfFontFile.py
-lib/python1.5/site-packages/PIL/PcfFontFile.pyc
-lib/python1.5/site-packages/PIL/PcfFontFile.pyo
-lib/python1.5/site-packages/PIL/PcxImagePlugin.py
-lib/python1.5/site-packages/PIL/PcxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PcxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PdfImagePlugin.py
-lib/python1.5/site-packages/PIL/PdfImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PdfImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PixarImagePlugin.py
-lib/python1.5/site-packages/PIL/PixarImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PixarImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PngImagePlugin.py
-lib/python1.5/site-packages/PIL/PngImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PngImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PpmImagePlugin.py
-lib/python1.5/site-packages/PIL/PpmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PpmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PsdImagePlugin.py
-lib/python1.5/site-packages/PIL/PsdImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PsdImagePlugin.pyo
-lib/python1.5/site-packages/PIL/SgiImagePlugin.py
-lib/python1.5/site-packages/PIL/SgiImagePlugin.pyc
-lib/python1.5/site-packages/PIL/SgiImagePlugin.pyo
-lib/python1.5/site-packages/PIL/SunImagePlugin.py
-lib/python1.5/site-packages/PIL/SunImagePlugin.pyc
-lib/python1.5/site-packages/PIL/SunImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TarIO.py
-lib/python1.5/site-packages/PIL/TarIO.pyc
-lib/python1.5/site-packages/PIL/TarIO.pyo
-lib/python1.5/site-packages/PIL/TgaImagePlugin.py
-lib/python1.5/site-packages/PIL/TgaImagePlugin.pyc
-lib/python1.5/site-packages/PIL/TgaImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TiffImagePlugin.py
-lib/python1.5/site-packages/PIL/TiffImagePlugin.pyc
-lib/python1.5/site-packages/PIL/TiffImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TiffTags.py
-lib/python1.5/site-packages/PIL/TiffTags.pyc
-lib/python1.5/site-packages/PIL/TiffTags.pyo
-lib/python1.5/site-packages/PIL/WmfImagePlugin.py
-lib/python1.5/site-packages/PIL/WmfImagePlugin.pyc
-lib/python1.5/site-packages/PIL/WmfImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XbmImagePlugin.py
-lib/python1.5/site-packages/PIL/XbmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XbmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XpmImagePlugin.py
-lib/python1.5/site-packages/PIL/XpmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XpmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.py
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.pyo
-lib/python1.5/site-packages/PIL/__init__.py
-lib/python1.5/site-packages/PIL/__init__.pyc
-lib/python1.5/site-packages/PIL/__init__.pyo
-lib/python1.5/site-packages/PIL.pth
-lib/python1.5/site-packages/_imaging.so
-lib/python1.5/site-packages/_imagingtk.so
+include/%%PYTHON_VERSION%%/ImConfig.h
+include/%%PYTHON_VERSION%%/ImPlatform.h
+include/%%PYTHON_VERSION%%/Imaging.h
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL.pth
+lib/%%PYTHON_VERSION%%/site-packages/_imaging.so
+lib/%%PYTHON_VERSION%%/site-packages/_imagingtk.so
share/doc/PIL/FORMATS
share/doc/PIL/README
share/examples/PIL/README
@@ -201,6 +201,6 @@ share/examples/PIL/pilprint.py
share/examples/PIL/player.py
share/examples/PIL/thresholder.py
share/examples/PIL/viewer.py
-@dirrm lib/python1.5/site-packages/PIL
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/PIL
@dirrm share/doc/PIL
@dirrm share/examples/PIL
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 1a10e5fab8b7..035605e11868 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/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/skencil/files/excludelist b/graphics/skencil/files/excludelist
index 7cacae600772..f1af7b3ca8a3 100644
--- a/graphics/skencil/files/excludelist
+++ b/graphics/skencil/files/excludelist
@@ -10,3 +10,4 @@ README
*.c
*.h
*.o
+*.orig
diff --git a/graphics/skencil/files/patch-skcolor.c b/graphics/skencil/files/patch-skcolor.c
new file mode 100644
index 000000000000..95398f57aff9
--- /dev/null
+++ b/graphics/skencil/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/skencil/files/sk2ps.in b/graphics/skencil/files/sk2ps.in
index 46a48ca86953..1f7514e8b714 100644
--- a/graphics/skencil/files/sk2ps.in
+++ b/graphics/skencil/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/skencil/files/sketch.in b/graphics/skencil/files/sketch.in
index 68d9f715af23..9b4b96925a56 100644
--- a/graphics/skencil/files/sketch.in
+++ b/graphics/skencil/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/skencil/files/skshow.in b/graphics/skencil/files/skshow.in
index 12beb1ba397e..9d3eacabdbf4 100644
--- a/graphics/skencil/files/skshow.in
+++ b/graphics/skencil/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 $@
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 $@