3 files changed, 132 insertions, 224 deletions

diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 716b8046b33c..819a913a4b97 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -6,40 +6,36 @@
 #
 
 PORTNAME=	py-pmw
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 DISTNAME=	Pmw.${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-RUN_DEPENDS=	${SITEPYDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 PLIST_SUB=	PMWVERSION="${PMWVERSION}"
+USE_PYTHON=	yes
 
-PYTHONSCRIPTDIR=${PREFIX}/lib/python1.5
-SITEPYDIR=	${PYTHONSCRIPTDIR}/site-packages
 DOCDIR=		${PREFIX}/share/doc/Pmw
 EXAMPLEDIR=	${PREFIX}/share/examples/Pmw
-PMWVERSION=	Pmw_0_8_3
+PMWVERSION=	Pmw_${PORTVERSION:S/./_/g}
 
 do-build:
 	@${ECHO_MSG} "Do a \`make install' as root."
 
 do-install:
-	@${MKDIR} ${SITEPYDIR}
 	@(cd ${WRKDIR}; tar cf - Pmw/__init__.py Pmw/${PMWVERSION}/__init__.py Pmw/${PMWVERSION}/lib) | \
-	    (cd ${SITEPYDIR}; tar xf -)
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${SITEPYDIR}/Pmw
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${SITEPYDIR}/Pmw
+	    (cd ${PYTHON_SITELIBDIR}; tar xf -)
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Pmw
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Pmw
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR} ${EXAMPLEDIR}
 	@(cd ${WRKDIR}/Pmw/${PMWVERSION}/doc; tar cf - .) | \
 		(cd ${DOCDIR}; tar xf -)
 	@(cd ${WRKDIR}/Pmw/${PMWVERSION}/demos; tar cf - .) | \
 		(cd ${EXAMPLEDIR}; tar xf -)
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${EXAMPLEDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${EXAMPLEDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-Pmw/distinfo b/x11-toolkits/py-Pmw/distinfo
index b312301834a8..04f1847b1628 100644
--- a/x11-toolkits/py-Pmw/distinfo
+++ b/x11-toolkits/py-Pmw/distinfo
@@ -1 +1 @@
-MD5 (Pmw.0.8.3.tar.gz) = 1037624ec72132eb4890f57d8b2caddc
+MD5 (Pmw.0.8.4.tar.gz) = 5df55a9a11ac2565c22f5048fadfc874
diff --git a/x11-toolkits/py-Pmw/pkg-plist b/x11-toolkits/py-Pmw/pkg-plist
index 588028ea1866..9eb37ce92dda 100644
--- a/x11-toolkits/py-Pmw/pkg-plist
+++ b/x11-toolkits/py-Pmw/pkg-plist
@@ -1,112 +1,118 @@
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/__init__.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/__init__.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/__init__.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/Pmw.def
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.pyo
-lib/python1.5/site-packages/Pmw/__init__.py
-lib/python1.5/site-packages/Pmw/__init__.pyc
-lib/python1.5/site-packages/Pmw/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/Pmw.def
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBalloon.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwBlt.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwButtonBox.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwColor.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBox.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwComboBoxDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwCounterDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwEntryField.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwGroup.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwHistoryText.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwHistoryText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwHistoryText.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLabeledWidget.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLoader.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwLogicalFont.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMainMenuBar.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMainMenuBar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMainMenuBar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMenuBar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageBar.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwMessageDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBook.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwOptionMenu.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPanedWidget.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwPromptDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwRadioSelect.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledCanvas.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledField.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledFrame.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledListBox.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwScrolledText.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwSelectionDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTextDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeCounter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTimeFuncs.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/__init__.pyo
 share/doc/Pmw/AboutDialog.gif
 share/doc/Pmw/AboutDialog.html
 share/doc/Pmw/Balloon.html
@@ -129,8 +135,11 @@ share/doc/Pmw/EntryField.html
 share/doc/Pmw/ExampleDemo.py
 share/doc/Pmw/Group.gif
 share/doc/Pmw/Group.html
+share/doc/Pmw/HistoryText.html
 share/doc/Pmw/LabeledWidget.gif
 share/doc/Pmw/LabeledWidget.html
+share/doc/Pmw/MainMenuBar.gif
+share/doc/Pmw/MainMenuBar.html
 share/doc/Pmw/MegaArchetype.html
 share/doc/Pmw/MegaToplevel.html
 share/doc/Pmw/MegaWidget.html
@@ -194,157 +203,60 @@ share/doc/Pmw/starting.html
 share/doc/Pmw/todo.html
 share/doc/Pmw/transdove.gif
 share/examples/Pmw/AboutDialog.py
-share/examples/Pmw/AboutDialog.pyc
-share/examples/Pmw/AboutDialog.pyo
 share/examples/Pmw/All.py
-share/examples/Pmw/All.pyc
-share/examples/Pmw/All.pyo
 share/examples/Pmw/Balloon.py
-share/examples/Pmw/Balloon.pyc
-share/examples/Pmw/Balloon.pyo
 share/examples/Pmw/BltGraph.py
-share/examples/Pmw/BltGraph.pyc
-share/examples/Pmw/BltGraph.pyo
 share/examples/Pmw/BltTabset.py
-share/examples/Pmw/BltTabset.pyc
-share/examples/Pmw/BltTabset.pyo
 share/examples/Pmw/ButtonBox.py
-share/examples/Pmw/ButtonBox.pyc
-share/examples/Pmw/ButtonBox.pyo
 share/examples/Pmw/Colors.py
-share/examples/Pmw/Colors.pyc
-share/examples/Pmw/Colors.pyo
 share/examples/Pmw/ComboBox.py
-share/examples/Pmw/ComboBox.pyc
-share/examples/Pmw/ComboBox.pyo
 share/examples/Pmw/ComboBoxDialog.py
-share/examples/Pmw/ComboBoxDialog.pyc
-share/examples/Pmw/ComboBoxDialog.pyo
 share/examples/Pmw/ConfigClass.py
-share/examples/Pmw/ConfigClass.pyc
-share/examples/Pmw/ConfigClass.pyo
 share/examples/Pmw/Counter.py
-share/examples/Pmw/Counter.pyc
-share/examples/Pmw/Counter.pyo
 share/examples/Pmw/CounterDialog.py
-share/examples/Pmw/CounterDialog.pyc
-share/examples/Pmw/CounterDialog.pyo
 share/examples/Pmw/DemoVersion.py
-share/examples/Pmw/DemoVersion.pyc
-share/examples/Pmw/DemoVersion.pyo
 share/examples/Pmw/Dialog.py
-share/examples/Pmw/Dialog.pyc
-share/examples/Pmw/Dialog.pyo
 share/examples/Pmw/EntryField.py
-share/examples/Pmw/EntryField.pyc
-share/examples/Pmw/EntryField.pyo
 share/examples/Pmw/ErrorHandling.py
-share/examples/Pmw/ErrorHandling.pyc
-share/examples/Pmw/ErrorHandling.pyo
 share/examples/Pmw/ExampleDemo.py
-share/examples/Pmw/ExampleDemo.pyc
-share/examples/Pmw/ExampleDemo.pyo
 share/examples/Pmw/FontText.py
-share/examples/Pmw/FontText.pyc
-share/examples/Pmw/FontText.pyo
 share/examples/Pmw/Grid.py
-share/examples/Pmw/Grid.pyc
-share/examples/Pmw/Grid.pyo
 share/examples/Pmw/Group.py
-share/examples/Pmw/Group.pyc
-share/examples/Pmw/Group.pyo
+share/examples/Pmw/HistoryText.py
 share/examples/Pmw/LabeledWidget.py
-share/examples/Pmw/LabeledWidget.pyc
-share/examples/Pmw/LabeledWidget.pyo
 share/examples/Pmw/LogicalFont.py
-share/examples/Pmw/LogicalFont.pyc
-share/examples/Pmw/LogicalFont.pyo
+share/examples/Pmw/MainMenuBar.py
 share/examples/Pmw/MenuBar.py
-share/examples/Pmw/MenuBar.pyc
-share/examples/Pmw/MenuBar.pyo
 share/examples/Pmw/MessageBar.py
-share/examples/Pmw/MessageBar.pyc
-share/examples/Pmw/MessageBar.pyo
 share/examples/Pmw/MessageDialog.py
-share/examples/Pmw/MessageDialog.pyc
-share/examples/Pmw/MessageDialog.pyo
 share/examples/Pmw/MessageInfo.py
-share/examples/Pmw/MessageInfo.pyc
-share/examples/Pmw/MessageInfo.pyo
 share/examples/Pmw/NestedDialogs.py
-share/examples/Pmw/NestedDialogs.pyc
-share/examples/Pmw/NestedDialogs.pyo
 share/examples/Pmw/NoteBook.py
-share/examples/Pmw/NoteBook.pyc
-share/examples/Pmw/NoteBook.pyo
 share/examples/Pmw/NoteBook_2.py
-share/examples/Pmw/NoteBook_2.pyc
-share/examples/Pmw/NoteBook_2.pyo
 share/examples/Pmw/NoteBook_3.py
-share/examples/Pmw/NoteBook_3.pyc
-share/examples/Pmw/NoteBook_3.pyo
 share/examples/Pmw/OptionMenu.py
-share/examples/Pmw/OptionMenu.pyc
-share/examples/Pmw/OptionMenu.pyo
 share/examples/Pmw/PanedWidget.py
-share/examples/Pmw/PanedWidget.pyc
-share/examples/Pmw/PanedWidget.pyo
 share/examples/Pmw/PromptDialog.py
-share/examples/Pmw/PromptDialog.pyc
-share/examples/Pmw/PromptDialog.pyo
 share/examples/Pmw/RadioSelect.py
-share/examples/Pmw/RadioSelect.pyc
-share/examples/Pmw/RadioSelect.pyo
 share/examples/Pmw/Resources.py
-share/examples/Pmw/Resources.pyc
-share/examples/Pmw/Resources.pyo
 share/examples/Pmw/Resources_Pmw.py
-share/examples/Pmw/Resources_Pmw.pyc
-share/examples/Pmw/Resources_Pmw.pyo
 share/examples/Pmw/ScrolledCanvas.py
-share/examples/Pmw/ScrolledCanvas.pyc
-share/examples/Pmw/ScrolledCanvas.pyo
 share/examples/Pmw/ScrolledField.py
-share/examples/Pmw/ScrolledField.pyc
-share/examples/Pmw/ScrolledField.pyo
 share/examples/Pmw/ScrolledFrame.py
-share/examples/Pmw/ScrolledFrame.pyc
-share/examples/Pmw/ScrolledFrame.pyo
 share/examples/Pmw/ScrolledListBox.py
-share/examples/Pmw/ScrolledListBox.pyc
-share/examples/Pmw/ScrolledListBox.pyo
 share/examples/Pmw/ScrolledText.py
-share/examples/Pmw/ScrolledText.pyc
-share/examples/Pmw/ScrolledText.pyo
 share/examples/Pmw/SelectionDialog.py
-share/examples/Pmw/SelectionDialog.pyc
-share/examples/Pmw/SelectionDialog.pyo
 share/examples/Pmw/ShowBusy.py
-share/examples/Pmw/ShowBusy.pyc
-share/examples/Pmw/ShowBusy.pyo
+share/examples/Pmw/SpecialCounter.py
 share/examples/Pmw/SpecialEntry.py
-share/examples/Pmw/SpecialEntry.pyc
-share/examples/Pmw/SpecialEntry.pyo
 share/examples/Pmw/Spectrum.py
-share/examples/Pmw/Spectrum.pyc
-share/examples/Pmw/Spectrum.pyo
 share/examples/Pmw/SpeedTest.py
-share/examples/Pmw/SpeedTest.pyc
-share/examples/Pmw/SpeedTest.pyo
 share/examples/Pmw/TextDialog.py
-share/examples/Pmw/TextDialog.pyc
-share/examples/Pmw/TextDialog.pyo
 share/examples/Pmw/TextDisplay.py
-share/examples/Pmw/TextDisplay.pyc
-share/examples/Pmw/TextDisplay.pyo
 share/examples/Pmw/TimeCounter.py
-share/examples/Pmw/TimeCounter.pyc
-share/examples/Pmw/TimeCounter.pyo
 share/examples/Pmw/WidgetDestroy.py
-share/examples/Pmw/WidgetDestroy.pyc
-share/examples/Pmw/WidgetDestroy.pyo
 @dirrm share/examples/Pmw
 @dirrm share/doc/Pmw
-@dirrm lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib
-@dirrm lib/python1.5/site-packages/Pmw/%%PMWVERSION%%
-@dirrm lib/python1.5/site-packages/Pmw
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Pmw