3 files changed, 165 insertions, 149 deletions

diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index cf5073f63dcd..938830dfe218 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-pmw
-PORTVERSION=	0.8.4
+PORTNAME=	pmw
+PORTVERSION=	0.8.5
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	pmw
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pmw.${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
@@ -29,8 +31,11 @@ do-build:
 do-install:
 	@(cd ${WRKDIR}; tar cf - Pmw/__init__.py Pmw/${PMWVERSION}/__init__.py Pmw/${PMWVERSION}/lib) | \
 	    (cd ${PYTHON_SITELIBDIR}; tar xf -)
+	${INSTALL_DATA} ${WRKDIR}/Pmw/${PMWVERSION}/contrib/Pmw* \
+		${PYTHON_SITELIBDIR}/Pmw/${PMWVERSION}/lib
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Pmw
-	@${PYTHON_CMD} -O ${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 - .) | \
diff --git a/x11-toolkits/py-Pmw/distinfo b/x11-toolkits/py-Pmw/distinfo
index 04f1847b1628..4d64c211e0e9 100644
--- a/x11-toolkits/py-Pmw/distinfo
+++ b/x11-toolkits/py-Pmw/distinfo
@@ -1 +1 @@
-MD5 (Pmw.0.8.4.tar.gz) = 5df55a9a11ac2565c22f5048fadfc874
+MD5 (Pmw.0.8.5.tar.gz) = 1f6c205099c719102633800843fff51a
diff --git a/x11-toolkits/py-Pmw/pkg-plist b/x11-toolkits/py-Pmw/pkg-plist
index 9eb37ce92dda..6b569565a4c9 100644
--- a/x11-toolkits/py-Pmw/pkg-plist
+++ b/x11-toolkits/py-Pmw/pkg-plist
@@ -38,6 +38,12 @@ 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/PmwFileDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwFileDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwFileDialog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwFullTimeCounter.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwFullTimeCounter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwFullTimeCounter.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
@@ -107,156 +113,161 @@ 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/PmwTreeBrowse.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTreeBrowse.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwTreeBrowse.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwVerticalGauge.py
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwVerticalGauge.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Pmw/%%PMWVERSION%%/lib/PmwVerticalGauge.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
-share/doc/Pmw/Blt.html
-share/doc/Pmw/ButtonBox.gif
-share/doc/Pmw/ButtonBox.html
-share/doc/Pmw/Color.html
-share/doc/Pmw/ComboBox.gif
-share/doc/Pmw/ComboBox.html
-share/doc/Pmw/ComboBoxDialog.gif
-share/doc/Pmw/ComboBoxDialog.html
-share/doc/Pmw/Counter.gif
-share/doc/Pmw/Counter.html
-share/doc/Pmw/CounterDialog.gif
-share/doc/Pmw/CounterDialog.html
-share/doc/Pmw/Dialog.gif
-share/doc/Pmw/Dialog.html
-share/doc/Pmw/EntryField.gif
-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
-share/doc/Pmw/MenuBar.gif
-share/doc/Pmw/MenuBar.html
-share/doc/Pmw/MessageBar.gif
-share/doc/Pmw/MessageBar.html
-share/doc/Pmw/MessageDialog.gif
-share/doc/Pmw/MessageDialog.html
-share/doc/Pmw/NoteBook.gif
-share/doc/Pmw/NoteBook.html
-share/doc/Pmw/OptionMenu.gif
-share/doc/Pmw/OptionMenu.html
-share/doc/Pmw/PanedWidget.gif
-share/doc/Pmw/PanedWidget.html
-share/doc/Pmw/PmwFunctions.html
-share/doc/Pmw/PromptDialog.gif
-share/doc/Pmw/PromptDialog.html
-share/doc/Pmw/RadioSelect.gif
-share/doc/Pmw/RadioSelect.html
-share/doc/Pmw/ScrolledCanvas.gif
-share/doc/Pmw/ScrolledCanvas.html
-share/doc/Pmw/ScrolledField.gif
-share/doc/Pmw/ScrolledField.html
-share/doc/Pmw/ScrolledFrame.gif
-share/doc/Pmw/ScrolledFrame.html
-share/doc/Pmw/ScrolledListBox.gif
-share/doc/Pmw/ScrolledListBox.html
-share/doc/Pmw/ScrolledText.gif
-share/doc/Pmw/ScrolledText.html
-share/doc/Pmw/ScrolledText_test.py
-share/doc/Pmw/SelectionDialog.gif
-share/doc/Pmw/SelectionDialog.html
-share/doc/Pmw/TextDialog.gif
-share/doc/Pmw/TextDialog.html
-share/doc/Pmw/TimeCounter.gif
-share/doc/Pmw/TimeCounter.html
-share/doc/Pmw/blue_line.gif
-share/doc/Pmw/blueball.gif
-share/doc/Pmw/bugs.html
-share/doc/Pmw/changes.html
-share/doc/Pmw/copyright.html
-share/doc/Pmw/counter1.gif
-share/doc/Pmw/counter2.gif
-share/doc/Pmw/demosandtests.html
-share/doc/Pmw/dynamicloader.html
-share/doc/Pmw/example.py
-share/doc/Pmw/example1.gif
-share/doc/Pmw/example2.gif
-share/doc/Pmw/exercises.py
-share/doc/Pmw/features.html
-share/doc/Pmw/halfblueball.gif
-share/doc/Pmw/howtobuild.html
-share/doc/Pmw/howtouse.html
-share/doc/Pmw/index.html
-share/doc/Pmw/porting.html
-share/doc/Pmw/refindex.html
-share/doc/Pmw/scale1.gif
-share/doc/Pmw/scale2.gif
-share/doc/Pmw/starting.html
-share/doc/Pmw/todo.html
-share/doc/Pmw/transdove.gif
-share/examples/Pmw/AboutDialog.py
-share/examples/Pmw/All.py
-share/examples/Pmw/Balloon.py
-share/examples/Pmw/BltGraph.py
-share/examples/Pmw/BltTabset.py
-share/examples/Pmw/ButtonBox.py
-share/examples/Pmw/Colors.py
-share/examples/Pmw/ComboBox.py
-share/examples/Pmw/ComboBoxDialog.py
-share/examples/Pmw/ConfigClass.py
-share/examples/Pmw/Counter.py
-share/examples/Pmw/CounterDialog.py
-share/examples/Pmw/DemoVersion.py
-share/examples/Pmw/Dialog.py
-share/examples/Pmw/EntryField.py
-share/examples/Pmw/ErrorHandling.py
-share/examples/Pmw/ExampleDemo.py
-share/examples/Pmw/FontText.py
-share/examples/Pmw/Grid.py
-share/examples/Pmw/Group.py
-share/examples/Pmw/HistoryText.py
-share/examples/Pmw/LabeledWidget.py
-share/examples/Pmw/LogicalFont.py
-share/examples/Pmw/MainMenuBar.py
-share/examples/Pmw/MenuBar.py
-share/examples/Pmw/MessageBar.py
-share/examples/Pmw/MessageDialog.py
-share/examples/Pmw/MessageInfo.py
-share/examples/Pmw/NestedDialogs.py
-share/examples/Pmw/NoteBook.py
-share/examples/Pmw/NoteBook_2.py
-share/examples/Pmw/NoteBook_3.py
-share/examples/Pmw/OptionMenu.py
-share/examples/Pmw/PanedWidget.py
-share/examples/Pmw/PromptDialog.py
-share/examples/Pmw/RadioSelect.py
-share/examples/Pmw/Resources.py
-share/examples/Pmw/Resources_Pmw.py
-share/examples/Pmw/ScrolledCanvas.py
-share/examples/Pmw/ScrolledField.py
-share/examples/Pmw/ScrolledFrame.py
-share/examples/Pmw/ScrolledListBox.py
-share/examples/Pmw/ScrolledText.py
-share/examples/Pmw/SelectionDialog.py
-share/examples/Pmw/ShowBusy.py
-share/examples/Pmw/SpecialCounter.py
-share/examples/Pmw/SpecialEntry.py
-share/examples/Pmw/Spectrum.py
-share/examples/Pmw/SpeedTest.py
-share/examples/Pmw/TextDialog.py
-share/examples/Pmw/TextDisplay.py
-share/examples/Pmw/TimeCounter.py
-share/examples/Pmw/WidgetDestroy.py
-@dirrm share/examples/Pmw
-@dirrm share/doc/Pmw
+%%PORTDOCS%%share/doc/Pmw/AboutDialog.gif
+%%PORTDOCS%%share/doc/Pmw/AboutDialog.html
+%%PORTDOCS%%share/doc/Pmw/Balloon.html
+%%PORTDOCS%%share/doc/Pmw/Blt.html
+%%PORTDOCS%%share/doc/Pmw/ButtonBox.gif
+%%PORTDOCS%%share/doc/Pmw/ButtonBox.html
+%%PORTDOCS%%share/doc/Pmw/Color.html
+%%PORTDOCS%%share/doc/Pmw/ComboBox.gif
+%%PORTDOCS%%share/doc/Pmw/ComboBox.html
+%%PORTDOCS%%share/doc/Pmw/ComboBoxDialog.gif
+%%PORTDOCS%%share/doc/Pmw/ComboBoxDialog.html
+%%PORTDOCS%%share/doc/Pmw/Counter.gif
+%%PORTDOCS%%share/doc/Pmw/Counter.html
+%%PORTDOCS%%share/doc/Pmw/CounterDialog.gif
+%%PORTDOCS%%share/doc/Pmw/CounterDialog.html
+%%PORTDOCS%%share/doc/Pmw/Dialog.gif
+%%PORTDOCS%%share/doc/Pmw/Dialog.html
+%%PORTDOCS%%share/doc/Pmw/EntryField.gif
+%%PORTDOCS%%share/doc/Pmw/EntryField.html
+%%PORTDOCS%%share/doc/Pmw/ExampleDemo.py
+%%PORTDOCS%%share/doc/Pmw/Group.gif
+%%PORTDOCS%%share/doc/Pmw/Group.html
+%%PORTDOCS%%share/doc/Pmw/HistoryText.html
+%%PORTDOCS%%share/doc/Pmw/LabeledWidget.gif
+%%PORTDOCS%%share/doc/Pmw/LabeledWidget.html
+%%PORTDOCS%%share/doc/Pmw/MainMenuBar.gif
+%%PORTDOCS%%share/doc/Pmw/MainMenuBar.html
+%%PORTDOCS%%share/doc/Pmw/MegaArchetype.html
+%%PORTDOCS%%share/doc/Pmw/MegaToplevel.html
+%%PORTDOCS%%share/doc/Pmw/MegaWidget.html
+%%PORTDOCS%%share/doc/Pmw/MenuBar.gif
+%%PORTDOCS%%share/doc/Pmw/MenuBar.html
+%%PORTDOCS%%share/doc/Pmw/MessageBar.gif
+%%PORTDOCS%%share/doc/Pmw/MessageBar.html
+%%PORTDOCS%%share/doc/Pmw/MessageDialog.gif
+%%PORTDOCS%%share/doc/Pmw/MessageDialog.html
+%%PORTDOCS%%share/doc/Pmw/NoteBook.gif
+%%PORTDOCS%%share/doc/Pmw/NoteBook.html
+%%PORTDOCS%%share/doc/Pmw/OptionMenu.gif
+%%PORTDOCS%%share/doc/Pmw/OptionMenu.html
+%%PORTDOCS%%share/doc/Pmw/PanedWidget.gif
+%%PORTDOCS%%share/doc/Pmw/PanedWidget.html
+%%PORTDOCS%%share/doc/Pmw/PmwFunctions.html
+%%PORTDOCS%%share/doc/Pmw/PromptDialog.gif
+%%PORTDOCS%%share/doc/Pmw/PromptDialog.html
+%%PORTDOCS%%share/doc/Pmw/RadioSelect.gif
+%%PORTDOCS%%share/doc/Pmw/RadioSelect.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledCanvas.gif
+%%PORTDOCS%%share/doc/Pmw/ScrolledCanvas.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledField.gif
+%%PORTDOCS%%share/doc/Pmw/ScrolledField.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledFrame.gif
+%%PORTDOCS%%share/doc/Pmw/ScrolledFrame.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledListBox.gif
+%%PORTDOCS%%share/doc/Pmw/ScrolledListBox.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledText.gif
+%%PORTDOCS%%share/doc/Pmw/ScrolledText.html
+%%PORTDOCS%%share/doc/Pmw/ScrolledText_test.py
+%%PORTDOCS%%share/doc/Pmw/SelectionDialog.gif
+%%PORTDOCS%%share/doc/Pmw/SelectionDialog.html
+%%PORTDOCS%%share/doc/Pmw/TextDialog.gif
+%%PORTDOCS%%share/doc/Pmw/TextDialog.html
+%%PORTDOCS%%share/doc/Pmw/TimeCounter.gif
+%%PORTDOCS%%share/doc/Pmw/TimeCounter.html
+%%PORTDOCS%%share/doc/Pmw/blue_line.gif
+%%PORTDOCS%%share/doc/Pmw/blueball.gif
+%%PORTDOCS%%share/doc/Pmw/bugs.html
+%%PORTDOCS%%share/doc/Pmw/changes.html
+%%PORTDOCS%%share/doc/Pmw/copyright.html
+%%PORTDOCS%%share/doc/Pmw/counter1.gif
+%%PORTDOCS%%share/doc/Pmw/counter2.gif
+%%PORTDOCS%%share/doc/Pmw/demosandtests.html
+%%PORTDOCS%%share/doc/Pmw/dynamicloader.html
+%%PORTDOCS%%share/doc/Pmw/example.py
+%%PORTDOCS%%share/doc/Pmw/example1.gif
+%%PORTDOCS%%share/doc/Pmw/example2.gif
+%%PORTDOCS%%share/doc/Pmw/exercises.py
+%%PORTDOCS%%share/doc/Pmw/features.html
+%%PORTDOCS%%share/doc/Pmw/halfblueball.gif
+%%PORTDOCS%%share/doc/Pmw/howtobuild.html
+%%PORTDOCS%%share/doc/Pmw/howtouse.html
+%%PORTDOCS%%share/doc/Pmw/index.html
+%%PORTDOCS%%share/doc/Pmw/porting.html
+%%PORTDOCS%%share/doc/Pmw/refindex.html
+%%PORTDOCS%%share/doc/Pmw/scale1.gif
+%%PORTDOCS%%share/doc/Pmw/scale2.gif
+%%PORTDOCS%%share/doc/Pmw/starting.html
+%%PORTDOCS%%share/doc/Pmw/todo.html
+%%PORTDOCS%%share/doc/Pmw/transdove.gif
+%%PORTDOCS%%share/examples/Pmw/AboutDialog.py
+%%PORTDOCS%%share/examples/Pmw/All.py
+%%PORTDOCS%%share/examples/Pmw/Balloon.py
+%%PORTDOCS%%share/examples/Pmw/BltGraph.py
+%%PORTDOCS%%share/examples/Pmw/BltTabset.py
+%%PORTDOCS%%share/examples/Pmw/ButtonBox.py
+%%PORTDOCS%%share/examples/Pmw/Colors.py
+%%PORTDOCS%%share/examples/Pmw/ComboBox.py
+%%PORTDOCS%%share/examples/Pmw/ComboBoxDialog.py
+%%PORTDOCS%%share/examples/Pmw/ConfigClass.py
+%%PORTDOCS%%share/examples/Pmw/Counter.py
+%%PORTDOCS%%share/examples/Pmw/CounterDialog.py
+%%PORTDOCS%%share/examples/Pmw/DemoVersion.py
+%%PORTDOCS%%share/examples/Pmw/Dialog.py
+%%PORTDOCS%%share/examples/Pmw/EntryField.py
+%%PORTDOCS%%share/examples/Pmw/ErrorHandling.py
+%%PORTDOCS%%share/examples/Pmw/ExampleDemo.py
+%%PORTDOCS%%share/examples/Pmw/Grid.py
+%%PORTDOCS%%share/examples/Pmw/Group.py
+%%PORTDOCS%%share/examples/Pmw/HistoryText.py
+%%PORTDOCS%%share/examples/Pmw/LabeledWidget.py
+%%PORTDOCS%%share/examples/Pmw/LogicalFont.py
+%%PORTDOCS%%share/examples/Pmw/MainMenuBar.py
+%%PORTDOCS%%share/examples/Pmw/MenuBar.py
+%%PORTDOCS%%share/examples/Pmw/MessageBar.py
+%%PORTDOCS%%share/examples/Pmw/MessageDialog.py
+%%PORTDOCS%%share/examples/Pmw/MessageInfo.py
+%%PORTDOCS%%share/examples/Pmw/NestedDialogs.py
+%%PORTDOCS%%share/examples/Pmw/NoteBook.py
+%%PORTDOCS%%share/examples/Pmw/NoteBook_2.py
+%%PORTDOCS%%share/examples/Pmw/NoteBook_3.py
+%%PORTDOCS%%share/examples/Pmw/OptionMenu.py
+%%PORTDOCS%%share/examples/Pmw/PanedWidget.py
+%%PORTDOCS%%share/examples/Pmw/PromptDialog.py
+%%PORTDOCS%%share/examples/Pmw/RadioSelect.py
+%%PORTDOCS%%share/examples/Pmw/Resources.py
+%%PORTDOCS%%share/examples/Pmw/Resources_Pmw.py
+%%PORTDOCS%%share/examples/Pmw/ScrolledCanvas.py
+%%PORTDOCS%%share/examples/Pmw/ScrolledField.py
+%%PORTDOCS%%share/examples/Pmw/ScrolledFrame.py
+%%PORTDOCS%%share/examples/Pmw/ScrolledListBox.py
+%%PORTDOCS%%share/examples/Pmw/ScrolledText.py
+%%PORTDOCS%%share/examples/Pmw/SelectionDialog.py
+%%PORTDOCS%%share/examples/Pmw/ShowBusy.py
+%%PORTDOCS%%share/examples/Pmw/SpecialCounter.py
+%%PORTDOCS%%share/examples/Pmw/SpecialEntry.py
+%%PORTDOCS%%share/examples/Pmw/Spectrum.py
+%%PORTDOCS%%share/examples/Pmw/SpeedTest.py
+%%PORTDOCS%%share/examples/Pmw/TextDialog.py
+%%PORTDOCS%%share/examples/Pmw/TextDisplay.py
+%%PORTDOCS%%share/examples/Pmw/TimeCounter.py
+%%PORTDOCS%%share/examples/Pmw/WidgetDestroy.py
+%%PORTDOCS%%@dirrm share/examples/Pmw
+%%PORTDOCS%%@dirrm share/doc/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