3 files changed, 115 insertions, 127 deletions

diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index d0eb25d711a7..e62156061f28 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pmw
-# Version required:	0.8.1
+# Version required:	0.8.3
 # Date created:		03 June 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 
-DISTNAME=	Pmw.0.8.1
-PKGNAME=	py-pmw-0.8.1
+DISTNAME=	Pmw.0.8.3
+PKGNAME=	py-pmw-0.8.3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 
@@ -21,7 +21,7 @@ PYTHONSCRIPTDIR=${PREFIX}/lib/python1.5
 SITEPYDIR=	${PYTHONSCRIPTDIR}/site-packages
 DOCDIR=		${PREFIX}/share/doc/Pmw
 EXAMPLEDIR=	${PREFIX}/share/examples/Pmw
-PMWVERSION=	Pmw_0_8_1
+PMWVERSION=	Pmw_0_8_3
 
 do-build:
 	@${ECHO_MSG} "Do a \`make install' as root."
diff --git a/x11-toolkits/py-Pmw/distinfo b/x11-toolkits/py-Pmw/distinfo
index 680ce4b3a163..b312301834a8 100644
--- a/x11-toolkits/py-Pmw/distinfo
+++ b/x11-toolkits/py-Pmw/distinfo
@@ -1 +1 @@
-MD5 (Pmw.0.8.1.tar.gz) = 5cf40c9bf6e74d76c6317f985b9538ad
+MD5 (Pmw.0.8.3.tar.gz) = 1037624ec72132eb4890f57d8b2caddc
diff --git a/x11-toolkits/py-Pmw/pkg-plist b/x11-toolkits/py-Pmw/pkg-plist
index 477af0c5d297..588028ea1866 100644
--- a/x11-toolkits/py-Pmw/pkg-plist
+++ b/x11-toolkits/py-Pmw/pkg-plist
@@ -1,12 +1,6 @@
-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/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/__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/%%PMWVERSION%%/lib/Pmw.def
 lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.py
 lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwAboutDialog.pyc
@@ -65,12 +59,9 @@ 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/PmwNoteBookR.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBookR.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBookR.pyo
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBookS.py
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBookS.pyc
-lib/python1.5/site-packages/Pmw/%%PMWVERSION%%/lib/PmwNoteBookS.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
@@ -110,104 +101,104 @@ 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
-share/doc/Pmw/refindex.html
-share/doc/Pmw/todo.html
+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
+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/LabeledWidget.gif
 share/doc/Pmw/LabeledWidget.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/NoteBookR.html
-share/doc/Pmw/NoteBookS.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/PmwFunctions.html
-share/doc/Pmw/Color.html
-share/doc/Pmw/Blt.html
-share/doc/Pmw/features.html
-share/doc/Pmw/changes.html
-share/doc/Pmw/copyright.html
-share/doc/Pmw/srcindex.html
-share/doc/Pmw/index.html
-share/doc/Pmw/starting.html
-share/doc/Pmw/demosandtests.html
-share/doc/Pmw/howtobuild.html
-share/doc/Pmw/dynamicloader.html
-share/doc/Pmw/porting.html
-share/doc/Pmw/howtouse.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/doc/Pmw/example.py
-share/doc/Pmw/exercises.py
-share/doc/Pmw/ExampleDemo.py
-share/doc/Pmw/ScrolledText_test.py
-share/doc/Pmw/PmwAboutDialog.py.html
-share/doc/Pmw/PmwBalloon.py.html
-share/doc/Pmw/PmwBase.py.html
-share/doc/Pmw/PmwBlt.py.html
-share/doc/Pmw/PmwButtonBox.py.html
-share/doc/Pmw/PmwColor.py.html
-share/doc/Pmw/PmwComboBox.py.html
-share/doc/Pmw/PmwComboBoxDialog.py.html
-share/doc/Pmw/PmwCounter.py.html
-share/doc/Pmw/PmwCounterDialog.py.html
-share/doc/Pmw/PmwDialog.py.html
-share/doc/Pmw/PmwEntryField.py.html
-share/doc/Pmw/PmwGroup.py.html
-share/doc/Pmw/PmwLabeledWidget.py.html
-share/doc/Pmw/PmwLoader.py.html
-share/doc/Pmw/PmwLogicalFont.py.html
-share/doc/Pmw/PmwMenuBar.py.html
-share/doc/Pmw/PmwMessageBar.py.html
-share/doc/Pmw/PmwMessageDialog.py.html
-share/doc/Pmw/PmwNoteBookR.py.html
-share/doc/Pmw/PmwNoteBookS.py.html
-share/doc/Pmw/PmwOptionMenu.py.html
-share/doc/Pmw/PmwPanedWidget.py.html
-share/doc/Pmw/PmwPromptDialog.py.html
-share/doc/Pmw/PmwRadioSelect.py.html
-share/doc/Pmw/PmwScrolledCanvas.py.html
-share/doc/Pmw/PmwScrolledField.py.html
-share/doc/Pmw/PmwScrolledFrame.py.html
-share/doc/Pmw/PmwScrolledListBox.py.html
-share/doc/Pmw/PmwScrolledText.py.html
-share/doc/Pmw/PmwSelectionDialog.py.html
-share/doc/Pmw/PmwTextDialog.py.html
-share/doc/Pmw/PmwTimeCounter.py.html
-share/doc/Pmw/PmwTimeFuncs.py.html
 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
@@ -223,27 +214,39 @@ 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/ComboBox_Simple.py
-share/examples/Pmw/ComboBox_Simple.pyc
-share/examples/Pmw/ComboBox_Simple.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
@@ -262,15 +265,27 @@ 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/NoteBookR.py
-share/examples/Pmw/NoteBookR.pyc
-share/examples/Pmw/NoteBookR.pyo
-share/examples/Pmw/ShowBusy.py
-share/examples/Pmw/ShowBusy.pyc
-share/examples/Pmw/ShowBusy.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
@@ -286,9 +301,15 @@ 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
@@ -298,6 +319,15 @@ 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/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
@@ -307,54 +337,12 @@ share/examples/Pmw/TextDialog.pyo
 share/examples/Pmw/TextDisplay.py
 share/examples/Pmw/TextDisplay.pyc
 share/examples/Pmw/TextDisplay.pyo
-share/examples/Pmw/ScrolledCanvas.py
-share/examples/Pmw/ScrolledCanvas.pyc
-share/examples/Pmw/ScrolledCanvas.pyo
-share/examples/Pmw/NoteBookS.py
-share/examples/Pmw/NoteBookS.pyc
-share/examples/Pmw/NoteBookS.pyo
-share/examples/Pmw/FontText.py
-share/examples/Pmw/FontText.pyc
-share/examples/Pmw/FontText.pyo
-share/examples/Pmw/WidgetDestroy.py
-share/examples/Pmw/WidgetDestroy.pyc
-share/examples/Pmw/WidgetDestroy.pyo
-share/examples/Pmw/OptionMenu.py
-share/examples/Pmw/OptionMenu.pyc
-share/examples/Pmw/OptionMenu.pyo
 share/examples/Pmw/TimeCounter.py
 share/examples/Pmw/TimeCounter.pyc
 share/examples/Pmw/TimeCounter.pyo
-share/examples/Pmw/ScrolledFrame.py
-share/examples/Pmw/ScrolledFrame.pyc
-share/examples/Pmw/ScrolledFrame.pyo
-share/examples/Pmw/All.py
-share/examples/Pmw/All.pyc
-share/examples/Pmw/All.pyo
-share/examples/Pmw/ComboBox_Dropdown.py
-share/examples/Pmw/ComboBox_Dropdown.pyc
-share/examples/Pmw/ComboBox_Dropdown.pyo
-share/examples/Pmw/EntryField.py
-share/examples/Pmw/EntryField.pyc
-share/examples/Pmw/EntryField.pyo
-share/examples/Pmw/MessageDialog.py
-share/examples/Pmw/MessageDialog.pyc
-share/examples/Pmw/MessageDialog.pyo
-share/examples/Pmw/DemoVersion.py
-share/examples/Pmw/DemoVersion.pyc
-share/examples/Pmw/DemoVersion.pyo
-share/examples/Pmw/SpecialEntry.py
-share/examples/Pmw/SpecialEntry.pyc
-share/examples/Pmw/SpecialEntry.pyo
-share/examples/Pmw/Counter.py
-share/examples/Pmw/Counter.pyc
-share/examples/Pmw/Counter.pyo
-share/examples/Pmw/NestedDialogs.py
-share/examples/Pmw/NestedDialogs.pyc
-share/examples/Pmw/NestedDialogs.pyo
-share/examples/Pmw/Spectrum.py
-share/examples/Pmw/Spectrum.pyc
-share/examples/Pmw/Spectrum.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