aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/py-mxDateTime/Makefile15
-rw-r--r--devel/py-mxDateTime/pkg-plist86
-rw-r--r--devel/py-mxStack/Makefile15
-rw-r--r--devel/py-mxStack/pkg-plist30
-rw-r--r--devel/py-mxTools/Makefile15
-rw-r--r--devel/py-mxTools/pkg-plist28
-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
-rw-r--r--lang/py-mx-base/Makefile15
-rw-r--r--lang/py-mx-base/pkg-plist46
-rw-r--r--print/py-reportlab/Makefile14
-rw-r--r--print/py-reportlab/pkg-plist172
-rw-r--r--textproc/py-mxTextTools/Makefile15
-rw-r--r--textproc/py-mxTextTools/pkg-plist46
27 files changed, 523 insertions, 478 deletions
diff --git a/devel/py-mxDateTime/Makefile b/devel/py-mxDateTime/Makefile
index c85ca79f26e7..ef8b3f92174c 100644
--- a/devel/py-mxDateTime/Makefile
+++ b/devel/py-mxDateTime/Makefile
@@ -13,24 +13,23 @@ PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aq
WRKSRC= ${WRKDIR}/DateTime/mxDateTime
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
ALL_TARGET= sharedmods
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-DATETIMEDIR= ${PYTHONSCRIPTDIR}/site-packages/DateTime
+DATETIMEDIR= ${PYTHON_SITELIBDIR}/DateTime
DOCDIR= ${PREFIX}/share/doc/py-mxDateTime
EXAMPLEDIR= ${PREFIX}/share/examples/py-mxDateTime
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
do-configure:
- @(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
do-install:
@${MKDIR} ${DATETIMEDIR}
@@ -39,8 +38,8 @@ do-install:
.for file in __init__.py mxDateTime.so
${INSTALL_DATA} ${WRKDIR}/DateTime/mxDateTime/${file} ${DATETIMEDIR}/mxDateTime
.endfor
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${DATETIMEDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${DATETIMEDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATETIMEDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATETIMEDIR}
@${MKDIR} ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/DateTime/Examples/* ${EXAMPLEDIR}
.if !defined(NOPORTDOCS)
diff --git a/devel/py-mxDateTime/pkg-plist b/devel/py-mxDateTime/pkg-plist
index 8d059e4306b1..63317980fb51 100644
--- a/devel/py-mxDateTime/pkg-plist
+++ b/devel/py-mxDateTime/pkg-plist
@@ -1,48 +1,45 @@
-lib/python1.5/site-packages/DateTime/ARPA.py
-lib/python1.5/site-packages/DateTime/ARPA.pyc
-lib/python1.5/site-packages/DateTime/ARPA.pyo
-lib/python1.5/site-packages/DateTime/DateTime.py
-lib/python1.5/site-packages/DateTime/DateTime.pyc
-lib/python1.5/site-packages/DateTime/DateTime.pyo
-lib/python1.5/site-packages/DateTime/Feasts.py
-lib/python1.5/site-packages/DateTime/Feasts.pyc
-lib/python1.5/site-packages/DateTime/Feasts.pyo
-lib/python1.5/site-packages/DateTime/ISO.py
-lib/python1.5/site-packages/DateTime/ISO.pyc
-lib/python1.5/site-packages/DateTime/ISO.pyo
-lib/python1.5/site-packages/DateTime/LazyModule.py
-lib/python1.5/site-packages/DateTime/LazyModule.pyc
-lib/python1.5/site-packages/DateTime/LazyModule.pyo
-lib/python1.5/site-packages/DateTime/Locale.py
-lib/python1.5/site-packages/DateTime/Locale.pyc
-lib/python1.5/site-packages/DateTime/Locale.pyo
-lib/python1.5/site-packages/DateTime/NIST.py
-lib/python1.5/site-packages/DateTime/NIST.pyc
-lib/python1.5/site-packages/DateTime/NIST.pyo
-lib/python1.5/site-packages/DateTime/ODMG.py
-lib/python1.5/site-packages/DateTime/ODMG.pyc
-lib/python1.5/site-packages/DateTime/ODMG.pyo
-lib/python1.5/site-packages/DateTime/Parser.py
-lib/python1.5/site-packages/DateTime/Parser.pyc
-lib/python1.5/site-packages/DateTime/Parser.pyo
-lib/python1.5/site-packages/DateTime/Timezone.py
-lib/python1.5/site-packages/DateTime/Timezone.pyc
-lib/python1.5/site-packages/DateTime/Timezone.pyo
-lib/python1.5/site-packages/DateTime/__init__.py
-lib/python1.5/site-packages/DateTime/__init__.pyc
-lib/python1.5/site-packages/DateTime/__init__.pyo
-lib/python1.5/site-packages/DateTime/mxDateTime/__init__.py
-lib/python1.5/site-packages/DateTime/mxDateTime/__init__.pyc
-lib/python1.5/site-packages/DateTime/mxDateTime/__init__.pyo
-lib/python1.5/site-packages/DateTime/mxDateTime/mxDateTime.so
-@dirrm lib/python1.5/site-packages/DateTime/mxDateTime
-lib/python1.5/site-packages/DateTime/timegm.py
-lib/python1.5/site-packages/DateTime/timegm.pyc
-lib/python1.5/site-packages/DateTime/timegm.pyo
-@dirrm lib/python1.5/site-packages/DateTime
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ARPA.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ARPA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ARPA.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/DateTime.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/DateTime.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/DateTime.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Feasts.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Feasts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Feasts.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ISO.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ISO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ISO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/LazyModule.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/LazyModule.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/LazyModule.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Locale.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Locale.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Locale.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/NIST.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/NIST.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/NIST.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ODMG.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ODMG.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/ODMG.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Parser.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Parser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Parser.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Timezone.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Timezone.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/Timezone.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/mxDateTime/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/mxDateTime/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/mxDateTime/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/mxDateTime/mxDateTime.so
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/timegm.py
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/timegm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/DateTime/timegm.pyo
share/doc/py-mxDateTime/mxDateTime-History.html
share/doc/py-mxDateTime/mxDateTime.html
-@dirrm share/doc/py-mxDateTime
share/examples/py-mxDateTime/AtomicClock.py
share/examples/py-mxDateTime/CommandLine.py
share/examples/py-mxDateTime/Y2000.py
@@ -50,3 +47,6 @@ share/examples/py-mxDateTime/__init__.py
share/examples/py-mxDateTime/alarm.py
share/examples/py-mxDateTime/lifespan.py
@dirrm share/examples/py-mxDateTime
+@dirrm share/doc/py-mxDateTime
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/DateTime/mxDateTime
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/DateTime
diff --git a/devel/py-mxStack/Makefile b/devel/py-mxStack/Makefile
index ddb18f79f136..51923ccc4af0 100644
--- a/devel/py-mxStack/Makefile
+++ b/devel/py-mxStack/Makefile
@@ -13,24 +13,23 @@ PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aq
WRKSRC= ${WRKDIR}/Stack/mxStack
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
ALL_TARGET= sharedmods
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-STACKDIR= ${PYTHONSCRIPTDIR}/site-packages/Stack
+STACKDIR= ${PYTHON_SITELIBDIR}/Stack
DOCDIR= ${PREFIX}/share/doc/py-mxStack
EXAMPLEDIR= ${PREFIX}/share/examples/py-mxStack
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
do-configure:
- @(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
do-install:
@${MKDIR} ${STACKDIR}
@@ -39,8 +38,8 @@ do-install:
.for file in __init__.py mxStack.so
${INSTALL_DATA} ${WRKDIR}/Stack/mxStack/${file} ${STACKDIR}/mxStack
.endfor
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${STACKDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${STACKDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${STACKDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${STACKDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCDIR}
${INSTALL_DATA} ${WRKDIR}/Stack/Doc/* ${DOCDIR}
diff --git a/devel/py-mxStack/pkg-plist b/devel/py-mxStack/pkg-plist
index 39006591adba..565b2a9b705c 100644
--- a/devel/py-mxStack/pkg-plist
+++ b/devel/py-mxStack/pkg-plist
@@ -1,17 +1,17 @@
-lib/python1.5/site-packages/Stack/UserStack.py
-lib/python1.5/site-packages/Stack/UserStack.pyc
-lib/python1.5/site-packages/Stack/UserStack.pyo
-lib/python1.5/site-packages/Stack/__init__.py
-lib/python1.5/site-packages/Stack/__init__.pyc
-lib/python1.5/site-packages/Stack/__init__.pyo
-lib/python1.5/site-packages/Stack/mxStack/__init__.py
-lib/python1.5/site-packages/Stack/mxStack/__init__.pyc
-lib/python1.5/site-packages/Stack/mxStack/__init__.pyo
-lib/python1.5/site-packages/Stack/mxStack/mxStack.so
-@dirrm lib/python1.5/site-packages/Stack/mxStack
-lib/python1.5/site-packages/Stack/stackbench.py
-lib/python1.5/site-packages/Stack/stackbench.pyc
-lib/python1.5/site-packages/Stack/stackbench.pyo
-@dirrm lib/python1.5/site-packages/Stack
+lib/%%PYTHON_VERSION%%/site-packages/Stack/UserStack.py
+lib/%%PYTHON_VERSION%%/site-packages/Stack/UserStack.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Stack/UserStack.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Stack/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Stack/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Stack/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Stack/mxStack/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Stack/mxStack/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Stack/mxStack/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Stack/mxStack/mxStack.so
+lib/%%PYTHON_VERSION%%/site-packages/Stack/stackbench.py
+lib/%%PYTHON_VERSION%%/site-packages/Stack/stackbench.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Stack/stackbench.pyo
share/doc/py-mxStack/mxStack.html
@dirrm share/doc/py-mxStack
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Stack/mxStack
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Stack
diff --git a/devel/py-mxTools/Makefile b/devel/py-mxTools/Makefile
index 3509a8824ba5..f092ad264ed1 100644
--- a/devel/py-mxTools/Makefile
+++ b/devel/py-mxTools/Makefile
@@ -13,24 +13,23 @@ PKGNAMEPREFIX= py-
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aq
WRKSRC= ${WRKDIR}/NewBuiltins/mxTools
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
ALL_TARGET= sharedmods
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-TOOLSDIR= ${PYTHONSCRIPTDIR}/site-packages/NewBuiltins
+TOOLSDIR= ${PYTHON_SITELIBDIR}/NewBuiltins
DOCDIR= ${PREFIX}/share/doc/py-mxTools
EXAMPLEDIR= ${PREFIX}/share/examples/py-mxTools
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
do-configure:
- @(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
do-install:
@${MKDIR} ${TOOLSDIR}
@@ -39,8 +38,8 @@ do-install:
.for file in __init__.py mxTools.so xmap.so
${INSTALL_DATA} ${WRKDIR}/NewBuiltins/mxTools/${file} ${TOOLSDIR}/mxTools
.endfor
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${TOOLSDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${TOOLSDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${TOOLSDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${TOOLSDIR}
@${MKDIR} ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/NewBuiltins/Examples/* ${EXAMPLEDIR}
.if !defined(NOPORTDOCS)
diff --git a/devel/py-mxTools/pkg-plist b/devel/py-mxTools/pkg-plist
index e35bd317d379..b229cbafcc44 100644
--- a/devel/py-mxTools/pkg-plist
+++ b/devel/py-mxTools/pkg-plist
@@ -1,18 +1,18 @@
-lib/python1.5/site-packages/NewBuiltins/NewBuiltins.py
-lib/python1.5/site-packages/NewBuiltins/NewBuiltins.pyc
-lib/python1.5/site-packages/NewBuiltins/NewBuiltins.pyo
-lib/python1.5/site-packages/NewBuiltins/__init__.py
-lib/python1.5/site-packages/NewBuiltins/__init__.pyc
-lib/python1.5/site-packages/NewBuiltins/__init__.pyo
-lib/python1.5/site-packages/NewBuiltins/mxTools/__init__.py
-lib/python1.5/site-packages/NewBuiltins/mxTools/__init__.pyc
-lib/python1.5/site-packages/NewBuiltins/mxTools/__init__.pyo
-lib/python1.5/site-packages/NewBuiltins/mxTools/mxTools.so
-lib/python1.5/site-packages/NewBuiltins/mxTools/xmap.so
-@dirrm lib/python1.5/site-packages/NewBuiltins/mxTools
-@dirrm lib/python1.5/site-packages/NewBuiltins
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/NewBuiltins.py
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/NewBuiltins.pyc
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/NewBuiltins.pyo
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools/mxTools.so
+lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools/xmap.so
share/doc/py-mxTools/mxTools.html
-@dirrm share/doc/py-mxTools
share/examples/py-mxTools/Acquisition.py
share/examples/py-mxTools/__init__.py
@dirrm share/examples/py-mxTools
+@dirrm share/doc/py-mxTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins/mxTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/NewBuiltins
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 $@
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index ed19b4ed4077..f45ccc363832 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -13,24 +13,23 @@ DISTNAME= mxTextTools-1.1.1
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aq
WRKSRC= ${WRKDIR}/TextTools/mxTextTools
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
ALL_TARGET= sharedmods
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-TEXTTOOLSDIR= ${PYTHONSCRIPTDIR}/site-packages/TextTools
+TEXTTOOLSDIR= ${PYTHON_SITELIBDIR}/TextTools
DOCDIR= ${PREFIX}/share/doc/py-mxTextTools
EXAMPLEDIR= ${PREFIX}/share/examples/py-mxTextTools
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
do-configure:
- @(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
do-install:
@${MKDIR} ${TEXTTOOLSDIR}
@@ -41,8 +40,8 @@ do-install:
.for file in __init__.py mxTextTools.so
${INSTALL_DATA} ${WRKDIR}/TextTools/mxTextTools/${file} ${TEXTTOOLSDIR}/mxTextTools
.endfor
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${TEXTTOOLSDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${TEXTTOOLSDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${TEXTTOOLSDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${TEXTTOOLSDIR}
@${MKDIR} ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/TextTools/Examples/* ${EXAMPLEDIR}
.if !defined(NOPORTDOCS)
diff --git a/lang/py-mx-base/pkg-plist b/lang/py-mx-base/pkg-plist
index 32e485f4a072..bbc344a148e2 100644
--- a/lang/py-mx-base/pkg-plist
+++ b/lang/py-mx-base/pkg-plist
@@ -1,27 +1,23 @@
-lib/python1.5/site-packages/TextTools/Constants/Sets.py
-lib/python1.5/site-packages/TextTools/Constants/Sets.pyc
-lib/python1.5/site-packages/TextTools/Constants/Sets.pyo
-lib/python1.5/site-packages/TextTools/Constants/TagTables.py
-lib/python1.5/site-packages/TextTools/Constants/TagTables.pyc
-lib/python1.5/site-packages/TextTools/Constants/TagTables.pyo
-lib/python1.5/site-packages/TextTools/Constants/__init__.py
-lib/python1.5/site-packages/TextTools/Constants/__init__.pyc
-lib/python1.5/site-packages/TextTools/Constants/__init__.pyo
-@dirrm lib/python1.5/site-packages/TextTools/Constants
-lib/python1.5/site-packages/TextTools/TextTools.py
-lib/python1.5/site-packages/TextTools/TextTools.pyc
-lib/python1.5/site-packages/TextTools/TextTools.pyo
-lib/python1.5/site-packages/TextTools/__init__.py
-lib/python1.5/site-packages/TextTools/__init__.pyc
-lib/python1.5/site-packages/TextTools/__init__.pyo
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.py
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.pyc
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.pyo
-lib/python1.5/site-packages/TextTools/mxTextTools/mxTextTools.so
-@dirrm lib/python1.5/site-packages/TextTools/mxTextTools
-@dirrm lib/python1.5/site-packages/TextTools
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/mxTextTools.so
share/doc/py-mxTextTools/mxTextTools.html
-@dirrm share/doc/py-mxTextTools
share/examples/py-mxTextTools/HTML.py
share/examples/py-mxTextTools/Loop.py
share/examples/py-mxTextTools/Python.py
@@ -33,3 +29,7 @@ share/examples/py-mxTextTools/__init__.py
share/examples/py-mxTextTools/altRTF.py
share/examples/py-mxTextTools/pytag.py
@dirrm share/examples/py-mxTextTools
+@dirrm share/doc/py-mxTextTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 9cbd07d8706a..ba73dc4967a3 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -15,15 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= python:${PORTSDIR}/lang/python
-RUN_DEPENDS= python:${PORTSDIR}/lang/python
-
+USE_PYTHON= yes
NO_BUILD= yes
-PLIST_SUB= PYVERSION=${PYVERSION}
-PYVERSION= python1.5
-PYTHONSCRIPTDIR= ${PREFIX}/lib/${PYVERSION}
-REPORTLABDIR= ${PYTHONSCRIPTDIR}/site-packages/reportlab
+REPORTLABDIR= ${PYTHON_SITELIBDIR}/reportlab
DOCDIR= ${PREFIX}/share/doc/reportlab
EXAMPLEDIR= ${PREFIX}/share/examples/reportlab
@@ -33,9 +28,8 @@ do-install:
@${MKDIR} ${REPORTLABDIR}/${dir}
${INSTALL_DATA} ${WRKSRC}/${dir}/*.py ${REPORTLABDIR}/${dir}
.endfor
- ${ECHO} 'reportlab' > ${PYTHONSCRIPTDIR}/reportlab.pth
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${REPORTLABDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${REPORTLABDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${REPORTLABDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${REPORTLABDIR}
@${MKDIR} ${EXAMPLEDIR}
cd ${WRKSRC}/demos; tar cpf - * | (cd ${EXAMPLEDIR}; tar xpf -)
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index 804d14477cfd..e9b8cb83fd7d 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -1,84 +1,84 @@
-lib/%%PYVERSION%%/site-packages/reportlab/__init__.py
-lib/%%PYVERSION%%/site-packages/reportlab/__init__.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/__init__.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/__init__.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/__init__.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/__init__.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/colors.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/colors.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/colors.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/corp.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/corp.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/corp.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/enums.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/enums.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/enums.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/fonts.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/fonts.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/fonts.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/pagesizes.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/pagesizes.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/pagesizes.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/sequencer.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/sequencer.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/sequencer.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/styles.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/styles.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/styles.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/units.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/units.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/units.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/lib/xmllib.py
-lib/%%PYVERSION%%/site-packages/reportlab/lib/xmllib.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/lib/xmllib.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/__init__.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/__init__.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/__init__.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfdoc.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfdoc.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfdoc.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfutils.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfutils.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfbase/pdfutils.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/__init__.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/__init__.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/__init__.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/canvas.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/canvas.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/canvas.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pathobject.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pathobject.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pathobject.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pdfgeom.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pdfgeom.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/pdfgeom.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/textobject.py
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/textobject.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/pdfgen/textobject.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/__init__.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/__init__.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/__init__.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/doctemplate.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/doctemplate.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/doctemplate.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/flowables.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/flowables.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/flowables.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/frames.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/frames.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/frames.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paragraph.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paragraph.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paragraph.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paraparser.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paraparser.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/paraparser.pyo
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/tables.py
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/tables.pyc
-lib/%%PYVERSION%%/site-packages/reportlab/platypus/tables.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/colors.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/colors.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/colors.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/corp.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/corp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/corp.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/enums.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/enums.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/enums.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/fonts.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/fonts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/fonts.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/pagesizes.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/pagesizes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/pagesizes.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/sequencer.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/sequencer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/sequencer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/styles.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/styles.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/styles.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/units.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/units.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/units.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/xmllib.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/xmllib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib/xmllib.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfdoc.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfdoc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfdoc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfmetrics.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfutils.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase/pdfutils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/canvas.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/canvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/canvas.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pathobject.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pathobject.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pathobject.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pdfgeom.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pdfgeom.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/pdfgeom.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/textobject.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/textobject.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen/textobject.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/doctemplate.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/doctemplate.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/doctemplate.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/flowables.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/flowables.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/flowables.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/frames.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/frames.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/frames.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paragraph.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paragraph.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paragraph.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paraparser.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paraparser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/paraparser.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/tables.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/tables.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/tables.pyo
share/doc/reportlab/reference.pdf
share/doc/reportlab/userguide.pdf
share/examples/reportlab/colors/colortest.py
@@ -123,8 +123,8 @@ share/examples/reportlab/tests/testdemos.py
@dirrm share/examples/reportlab/colors
@dirrm share/examples/reportlab
@dirrm share/doc/reportlab
-@dirrm lib/%%PYVERSION%%/site-packages/reportlab/platypus
-@dirrm lib/%%PYVERSION%%/site-packages/reportlab/pdfgen
-@dirrm lib/%%PYVERSION%%/site-packages/reportlab/pdfbase
-@dirrm lib/%%PYVERSION%%/site-packages/reportlab/lib
-@dirrm lib/%%PYVERSION%%/site-packages/reportlab
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab
diff --git a/textproc/py-mxTextTools/Makefile b/textproc/py-mxTextTools/Makefile
index ed19b4ed4077..f45ccc363832 100644
--- a/textproc/py-mxTextTools/Makefile
+++ b/textproc/py-mxTextTools/Makefile
@@ -13,24 +13,23 @@ DISTNAME= mxTextTools-1.1.1
MAINTAINER= tg@FreeBSD.org
-BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aq
WRKSRC= ${WRKDIR}/TextTools/mxTextTools
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
ALL_TARGET= sharedmods
-PYTHONSCRIPTDIR= ${PREFIX}/lib/python1.5
-TEXTTOOLSDIR= ${PYTHONSCRIPTDIR}/site-packages/TextTools
+TEXTTOOLSDIR= ${PYTHON_SITELIBDIR}/TextTools
DOCDIR= ${PREFIX}/share/doc/py-mxTextTools
EXAMPLEDIR= ${PREFIX}/share/examples/py-mxTextTools
post-extract:
@${CP} ${FILESDIR}/Setup ${WRKSRC}
+ @${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
do-configure:
- @(cd ${WRKSRC} && ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+ @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
do-install:
@${MKDIR} ${TEXTTOOLSDIR}
@@ -41,8 +40,8 @@ do-install:
.for file in __init__.py mxTextTools.so
${INSTALL_DATA} ${WRKDIR}/TextTools/mxTextTools/${file} ${TEXTTOOLSDIR}/mxTextTools
.endfor
- @${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${TEXTTOOLSDIR}
- @${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${TEXTTOOLSDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${TEXTTOOLSDIR}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${TEXTTOOLSDIR}
@${MKDIR} ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/TextTools/Examples/* ${EXAMPLEDIR}
.if !defined(NOPORTDOCS)
diff --git a/textproc/py-mxTextTools/pkg-plist b/textproc/py-mxTextTools/pkg-plist
index 32e485f4a072..bbc344a148e2 100644
--- a/textproc/py-mxTextTools/pkg-plist
+++ b/textproc/py-mxTextTools/pkg-plist
@@ -1,27 +1,23 @@
-lib/python1.5/site-packages/TextTools/Constants/Sets.py
-lib/python1.5/site-packages/TextTools/Constants/Sets.pyc
-lib/python1.5/site-packages/TextTools/Constants/Sets.pyo
-lib/python1.5/site-packages/TextTools/Constants/TagTables.py
-lib/python1.5/site-packages/TextTools/Constants/TagTables.pyc
-lib/python1.5/site-packages/TextTools/Constants/TagTables.pyo
-lib/python1.5/site-packages/TextTools/Constants/__init__.py
-lib/python1.5/site-packages/TextTools/Constants/__init__.pyc
-lib/python1.5/site-packages/TextTools/Constants/__init__.pyo
-@dirrm lib/python1.5/site-packages/TextTools/Constants
-lib/python1.5/site-packages/TextTools/TextTools.py
-lib/python1.5/site-packages/TextTools/TextTools.pyc
-lib/python1.5/site-packages/TextTools/TextTools.pyo
-lib/python1.5/site-packages/TextTools/__init__.py
-lib/python1.5/site-packages/TextTools/__init__.pyc
-lib/python1.5/site-packages/TextTools/__init__.pyo
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.py
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.pyc
-lib/python1.5/site-packages/TextTools/mxTextTools/__init__.pyo
-lib/python1.5/site-packages/TextTools/mxTextTools/mxTextTools.so
-@dirrm lib/python1.5/site-packages/TextTools/mxTextTools
-@dirrm lib/python1.5/site-packages/TextTools
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/Sets.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/TagTables.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/TextTools.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools/mxTextTools.so
share/doc/py-mxTextTools/mxTextTools.html
-@dirrm share/doc/py-mxTextTools
share/examples/py-mxTextTools/HTML.py
share/examples/py-mxTextTools/Loop.py
share/examples/py-mxTextTools/Python.py
@@ -33,3 +29,7 @@ share/examples/py-mxTextTools/__init__.py
share/examples/py-mxTextTools/altRTF.py
share/examples/py-mxTextTools/pytag.py
@dirrm share/examples/py-mxTextTools
+@dirrm share/doc/py-mxTextTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools/mxTextTools
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools/Constants
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/TextTools