15 files changed, 79 insertions, 79 deletions

diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index 92fe5ed5f64b..1650b429cff6 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 DOCDIR=		${PREFIX}/share/doc/py-mx
-MXHDRDIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages/mx/stdlib
+MXHDRDIR=	${PYTHONPREFIX_SITELIBDIR}/mx/stdlib
 
 post-install:
 	@${MKDIR} ${DOCDIR}
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python/Makefile b/lang/python/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index f0ff3fc9c42f..fae0b0e986e5 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -93,9 +93,9 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/*                    \
-		${PYTHON_LIBDIR}/${platform}
+		${PYTHONPREFIX_LIBDIR}/${platform}
 .endfor
 	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist
 
@@ -105,9 +105,9 @@ post-install:
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 	@${MKDIR} ${PREFIX}/share/doc/${PYTHON_VERSION}
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/${PYTHON_VERSION}
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(WITHOUT_TOOLS)
-	@cd ${WRKSRC}; tar cf - Tools | (cd ${PYTHON_LIBDIR}; tar xf -)
+	@cd ${WRKSRC}; tar cf - Tools | (cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 9d218c9201d7..badff2a277e2 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -113,10 +113,10 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}
+		${PYTHONPREFIX_LIBDIR}/${platform}
 .endfor
 .endfor
 	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PKGDIR}/pkg-plist
@@ -125,10 +125,10 @@ post-install:
 	@${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 .endif
 .if !defined(WITHOUT_DEMO)
 	@${MKDIR} ${DEMODIR}
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 62925a785895..65a9181195c7 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -70,10 +70,10 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in FCNTL.py IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
@@ -81,10 +81,10 @@ post-install:
 	@${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index b37625756592..c0af2958abb7 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -76,20 +76,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 
 pre-install:
 .for platform in ${PLATFORMS}
-	${MKDIR} ${PYTHON_LIBDIR}/${platform}
+	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
-		${PYTHON_LIBDIR}/${platform}/
+		${PYTHONPREFIX_LIBDIR}/${platform}/
 .endfor
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
+		${PREFIX}/share/emacs/site-lisp
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PYTHON_LIBDIR}; tar xf -)
+		(cd ${PYTHONPREFIX_LIBDIR}; tar xf -)
 	@${MKDIR} ${DEMODIR}
 	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
 		(cd ${DEMODIR}; tar xf -)