- Update to 1.3.2

PR:		ports/121392
Submitted by:	TAOKA Fumiyoshi <fmysh AT iijmio-mail.jp> (maintainer)

4 files changed, 105 insertions, 94 deletions

diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index e9f71a93d2ed..c9091174fc6a 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Pmw
-PORTVERSION=	1.3
+PORTVERSION=	1.3.2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,33 +18,30 @@ COMMENT=	High-level compound graphics widgets for Python
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 LIB_DEPENDS=	BLT24.3:${PORTSDIR}/x11-toolkits/blt
 
-PLIST_SUB=	PMWVERSION="${PMWVERSION}"
-USE_PYTHON=	yes
-
-PMWVERSION=	${PORTNAME}_${PORTVERSION:S/./_/g}
-WRKSRC=		${WRKDIR}/src
-
-do-build:
-	@${ECHO_MSG} "Do a \`make install' as root."
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
-do-install:
-	@(cd ${WRKSRC}; ${TAR} cf - Pmw/__init__.py Pmw/${PMWVERSION}/__init__.py Pmw/${PMWVERSION}/lib) | \
-	    (cd ${PYTHON_SITELIBDIR}; ${TAR} xf -)
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Pmw
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Pmw
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+PMWVERSION=	${DISTNAME:R:S/./_/g}
+PLIST_SUB=	PMWVERSION="${PMWVERSION}"
 
+post-install:
 	@${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC}/Pmw/${PMWVERSION}; ${TAR} cf - bin) | \
-		(cd ${DATADIR}; ${TAR} xf -)
-	@(cd ${WRKSRC}/Pmw/${PMWVERSION}; ${TAR} cf - contrib) | \
-		(cd ${DATADIR}; ${TAR} xf -)
+	@(cd ${WRKSRC}/Pmw/${PMWVERSION}/bin; ${TAR} cf - .) | \
+		(cd ${DATADIR}; ${TAR} -xof -)
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/Pmw/${PMWVERSION}/doc; ${TAR} cf - .) | \
-		(cd ${DOCSDIR}; ${TAR} xf -)
-	@(cd ${WRKSRC}/Pmw/${PMWVERSION}/demos; ${TAR} cf - .) | \
-		(cd ${EXAMPLESDIR}; ${TAR} xf -)
+		(cd ${DOCSDIR}; ${TAR} -xof -)
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for d in  contrib demos
+	@(cd ${WRKSRC}/Pmw/${PMWVERSION}; ${TAR} cf - $d) | \
+		(cd ${EXAMPLESDIR}; ${TAR} -xof -)
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-Pmw/distinfo b/x11-toolkits/py-Pmw/distinfo
index 99e231654d3e..c92988609a92 100644
--- a/x11-toolkits/py-Pmw/distinfo
+++ b/x11-toolkits/py-Pmw/distinfo
@@ -1,3 +1,3 @@
-MD5 (Pmw.1.3.tar.gz) = fc9affbcb1b2b86930464350ac2f0a1d
-SHA256 (Pmw.1.3.tar.gz) = 65ff08d20c825180e8965d0d25bc74fdee12e0cbe460731fd4945869128d63b5
-SIZE (Pmw.1.3.tar.gz) = 399933
+MD5 (Pmw.1.3.2.tar.gz) = 7f30886fe9885ab3cf85dac6ce1fbda5
+SHA256 (Pmw.1.3.2.tar.gz) = 0c9ab8f9cbd57f926e22253d73048fdccfb7e033c3482b083a6fb41848074a18
+SIZE (Pmw.1.3.2.tar.gz) = 399262
diff --git a/x11-toolkits/py-Pmw/files/patch-setup.py b/x11-toolkits/py-Pmw/files/patch-setup.py
new file mode 100644
index 000000000000..f154cab43c44
--- /dev/null
+++ b/x11-toolkits/py-Pmw/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- setup.py.orig	2007-09-24 17:30:50.000000000 +0900
++++ setup.py	2008-03-05 20:02:42.000000000 +0900
+@@ -16,11 +16,6 @@
+ 		'Pmw.Pmw_1_3.lib',],
+ 
+       package_data={'Pmw': ['Pmw_1_3/lib/Pmw.def',
+-			    'Pmw_1_3/doc/*',
+-	                    'Pmw_1_3/contrib/*',
+-	                    'Pmw_1_3/demos/*',
+-	                    'Pmw_1_3/tests/*',
+-                            'Pmw_1_3/bin/*',
+ 			   ]
+                    },
+       
diff --git a/x11-toolkits/py-Pmw/pkg-plist b/x11-toolkits/py-Pmw/pkg-plist
index b875738f6334..d8550655f33b 100644
--- a/x11-toolkits/py-Pmw/pkg-plist
+++ b/x11-toolkits/py-Pmw/pkg-plist
@@ -113,14 +113,7 @@
 %%PYTHON_SITELIBDIR%%/Pmw/__init__.py
 %%PYTHON_SITELIBDIR%%/Pmw/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Pmw/__init__.pyo
-%%DATADIR%%/bin/bundlepmw.py
-%%DATADIR%%/contrib/DirBrowser.py
-%%DATADIR%%/contrib/MCListbox.py
-%%DATADIR%%/contrib/PmwFileDialog.py
-%%DATADIR%%/contrib/PmwFullTimeCounter.py
-%%DATADIR%%/contrib/PmwVerticalGauge.py
-%%DATADIR%%/contrib/README
-%%DATADIR%%/contrib/TreeBrowser.py
+%%DATADIR%%/bundlepmw.py
 %%PORTDOCS%%%%DOCSDIR%%/AboutDialog.gif
 %%PORTDOCS%%%%DOCSDIR%%/AboutDialog.html
 %%PORTDOCS%%%%DOCSDIR%%/Balloon.gif
@@ -212,68 +205,75 @@
 %%PORTDOCS%%%%DOCSDIR%%/starting.html
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/transdove.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/AboutDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/All.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Args.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Balloon.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/BltGraph.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/BltTabset.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ButtonBox.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Colors.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ComboBox.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ComboBoxDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ConfigClass.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Counter.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/CounterDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/DemoVersion.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/EntryField.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ErrorHandling.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ExampleDemo.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Grid.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Group.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/HistoryText.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/LabeledWidget.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/LogicalFont.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MainMenuBar.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MenuBar.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MessageBar.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MessageDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MessageInfo.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/MultiLineLabel.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/NestedDialogs.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/NoteBook.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/NoteBook_2.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/NoteBook_3.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/OptionMenu.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/PanedWidget.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/PanedWidget_2.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/PromptDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/RadioSelect.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Resources.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Resources_Pmw.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledCanvas.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledField.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledFrame.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledListBox.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledText.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ScrolledText_2.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/SelectionDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ShowBusy.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/SpecialCounter.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/SpecialEntry.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/Spectrum.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/SpeedTest.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/SubClassing.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/TextDialog.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/TextDisplay.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/TimeCounter.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/WidgetDestroy.py
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/DirBrowser.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/MCListbox.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/PmwFileDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/PmwFullTimeCounter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/PmwVerticalGauge.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/TreeBrowser.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/AboutDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/All.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Args.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Balloon.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/BltGraph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/BltTabset.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ButtonBox.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Colors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ComboBox.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ComboBoxDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ConfigClass.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Counter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/CounterDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/DemoVersion.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Dialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/EntryField.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ErrorHandling.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ExampleDemo.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Grid.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Group.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/HistoryText.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/LabeledWidget.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/LogicalFont.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MainMenuBar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MenuBar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MessageBar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MessageDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MessageInfo.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/MultiLineLabel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/NestedDialogs.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/NoteBook.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/NoteBook_2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/NoteBook_3.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/OptionMenu.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/PanedWidget.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/PanedWidget_2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/PromptDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/RadioSelect.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Resources.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Resources_Pmw.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledCanvas.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledField.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledFrame.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledListBox.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledText.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ScrolledText_2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/SelectionDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/ShowBusy.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/SpecialCounter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/SpecialEntry.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/Spectrum.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/SpeedTest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/SubClassing.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/TextDialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/TextDisplay.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/TimeCounter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/WidgetDestroy.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/Pmw/%%PMWVERSION%%/lib
 @dirrm %%PYTHON_SITELIBDIR%%/Pmw/%%PMWVERSION%%
 @dirrm %%PYTHON_SITELIBDIR%%/Pmw
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%