Use PYTHON_CMD with the -m flag to run compileall (avoid referencing PYTHON_SITELIBDIR).

10 files changed, 24 insertions, 17 deletions

diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index f80e703620b1..0455dec30f92 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -25,8 +25,8 @@ post-patch:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index b41a3b9b8bb4..fe4d6c3c7ab9 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index 0b54e169c2b7..8e7814015753 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -24,8 +24,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 	@cd ${WRKSRC}/ROX-Lib2/python && ${PYTHON_CMD} make_docs.py
 
 do-install:
diff --git a/devel/py_otp_interface/Makefile b/devel/py_otp_interface/Makefile
index bc7d77769b4c..5488127d8ce7 100644
--- a/devel/py_otp_interface/Makefile
+++ b/devel/py_otp_interface/Makefile
@@ -23,8 +23,8 @@ OTP_LIBS=	__init__.py erl_async_conn.py erl_common.py erl_epmd.py \
 OTP_DOCS=	COPYING.LIB README
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PYTHON_SITELIBDIR}/py_interface
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 3518bb5c85f2..690764437170 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -27,8 +27,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile
index d648fc48e0d7..e87aec559baf 100644
--- a/multimedia/rox-videothumbnail/Makefile
+++ b/multimedia/rox-videothumbnail/Makefile
@@ -22,7 +22,8 @@ WRKSRC=		${WRKDIR}/VideoThumbnail
 USE_PYTHON=	yes
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/multimedia/rox-videothumbnail/pkg-plist b/multimedia/rox-videothumbnail/pkg-plist
index 98842c7217bb..c451597fbbcd 100644
--- a/multimedia/rox-videothumbnail/pkg-plist
+++ b/multimedia/rox-videothumbnail/pkg-plist
@@ -11,16 +11,22 @@ apps/VideoThumbnail/Options.xml
 apps/VideoThumbnail/VideoThumbnail.xml
 apps/VideoThumbnail/extopts.py
 apps/VideoThumbnail/extopts.pyc
+apps/VideoThumbnail/extopts.pyo
 apps/VideoThumbnail/findrox.py
 apps/VideoThumbnail/findrox.pyc
+apps/VideoThumbnail/findrox.pyo
 apps/VideoThumbnail/manage.py
 apps/VideoThumbnail/manage.pyc
+apps/VideoThumbnail/manage.pyo
 apps/VideoThumbnail/options.py
 apps/VideoThumbnail/options.pyc
+apps/VideoThumbnail/options.pyo
 apps/VideoThumbnail/thumb.py
 apps/VideoThumbnail/thumb.pyc
+apps/VideoThumbnail/thumb.pyo
 apps/VideoThumbnail/vidthumb.py
 apps/VideoThumbnail/vidthumb.pyc
+apps/VideoThumbnail/vidthumb.pyo
 @dirrm apps/VideoThumbnail/Messages
 @dirrm apps/VideoThumbnail/Help
 @dirrm apps/VideoThumbnail
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 5cabc807ccf8..3b356dbe97e4 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 USE_PYTHON=	yes
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 785cf3b5fa8d..540a11af6b77 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -40,8 +40,8 @@ post-patch:
 	@${FIND} ${WRKSRC} -name *.orig | ${XARGS} ${RM}
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 0a0c316d1e9a..0cba659b546f 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps