3 files changed, 102 insertions, 18 deletions

diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 2f6ebbe12136..e142a80010ae 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gui
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	1.7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.cosc.canterbury.ac.nz/~greg/python_gui/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,19 +18,18 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/deve
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_REINPLACE=	yes
 USE_GNOME=	pygtk2
 
 DOCSDIR=	share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 post-extract:
-	${RM} -rf ${WRKSRC}/GUI/Mac
+	${RM} -rf ${WRKSRC}/GUI/Cocoa
 	${TOUCH} ${WRKSRC}/GUI/Gtk/__init__.py \
 		${WRKSRC}/GUI/Generic/__init__.py
 
 post-patch:
-	${REINPLACE_CMD} -e 's/"GUI.Mac",//g' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e 's/"GUI.Cocoa",//g' ${WRKSRC}/setup.py
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/py-gui/distinfo b/x11-toolkits/py-gui/distinfo
index 08458f8d8723..c17ec2fdacfe 100644
--- a/x11-toolkits/py-gui/distinfo
+++ b/x11-toolkits/py-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyGUI-1.5.1.tar.gz) = ca04267c8ec6981ac2202cb9f9e6d256
-SHA256 (PyGUI-1.5.1.tar.gz) = 42523730cf8e1525833af60ef30729cbfaac9ce4c9443d073af98b3990048005
-SIZE (PyGUI-1.5.1.tar.gz) = 381565
+SHA256 (PyGUI-1.7.tar.gz) = ffaa4a126d83c4981b76046afb3b7813f29a464d20634d0de5d0ad2cd2aa4671
+MD5 (PyGUI-1.7.tar.gz) = 600eb300f943b819ceaf047eee379c72
+SIZE (PyGUI-1.7.tar.gz) = 415848
diff --git a/x11-toolkits/py-gui/pkg-plist b/x11-toolkits/py-gui/pkg-plist
index d6a6320fe227..9caed84868c7 100644
--- a/x11-toolkits/py-gui/pkg-plist
+++ b/x11-toolkits/py-gui/pkg-plist
@@ -4,9 +4,15 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/AlertFunctions.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/AlertFunctions.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/AlertFunctions.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/BaseAlertFunctions.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/BaseAlertFunctions.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/BaseAlertFunctions.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Documents.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Documents.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Documents.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Enumerations.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Enumerations.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Enumerations.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Exceptions.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Exceptions.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Exceptions.pyo
@@ -22,6 +28,9 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GButtons.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GButtons.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GButtons.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvasPaths.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvasPaths.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvasPaths.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvases.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvases.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GCanvases.pyo
@@ -43,6 +52,9 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GControls.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GControls.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GControls.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCursors.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCursors.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GCursors.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GDialogs.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GDialogs.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GDialogs.pyo
@@ -55,15 +67,45 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GFonts.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GFonts.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GFonts.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GFrames.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GFrames.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GFrames.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLBases.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLBases.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLBases.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLConfig.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLConfig.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLConfig.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLContexts.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLContexts.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLContexts.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixelFormats.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixelFormats.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixelFormats.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixmaps.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixmaps.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GGLPixmaps.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGLViews.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGLViews.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGLViews.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGeometry.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGeometry.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GGeometry.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GImageBases.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GImageBases.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GImageBases.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GImages.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GImages.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GImages.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLDisplayLists.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLDisplayLists.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLDisplayLists.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLShareGroups.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLShareGroups.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLShareGroups.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLTextures.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLTextures.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GLTextures.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GLabels.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GLabels.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GLabels.pyo
@@ -82,9 +124,9 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GRadioGroups.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GRadioGroups.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GRadioGroups.pyo
-%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollBars.py
-%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollBars.pyc
-%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollBars.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollableViews.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollableViews.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/GScrollableViews.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GTasks.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GTasks.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GTasks.pyo
@@ -100,6 +142,9 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GWindows.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GWindows.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/GWindows.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/MenuLists.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/MenuLists.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/MenuLists.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/MessageHandlers.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/MessageHandlers.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/MessageHandlers.pyo
@@ -112,12 +157,18 @@
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Properties.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Properties.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/Properties.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Resources.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Resources.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/Resources.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/ScrollFrames.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/ScrollFrames.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/ScrollFrames.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/StdColors.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/StdColors.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/StdColors.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Generic/_StdMenus.py
+%%PYTHON_SITELIBDIR%%/GUI/Generic/_StdMenus.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Generic/_StdMenus.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Generic/__init__.py
 %%PYTHON_SITELIBDIR%%/GUI/Generic/__init__.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Generic/__init__.pyo
@@ -154,6 +205,9 @@
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Controls.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Controls.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Controls.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Cursors.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Cursors.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Cursors.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Dialogs.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Dialogs.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Dialogs.pyo
@@ -169,18 +223,27 @@
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Fonts.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Fonts.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Fonts.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Frames.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Frames.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/Frames.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Geometry.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Geometry.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Geometry.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkImageScaling.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkImageScaling.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkImageScaling.pyo
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkInput.py
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkInput.pyc
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkInput.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkPixmaps.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkPixmaps.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/GtkPixmaps.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ImageBases.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ImageBases.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ImageBases.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Images.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Images.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Images.pyo
@@ -199,12 +262,18 @@
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/RadioGroups.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/RadioGroups.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/RadioGroups.pyo
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollBars.py
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollBars.pyc
-%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollBars.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollableViews.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollableViews.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/ScrollableViews.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdCursors.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdCursors.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdCursors.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/StdFonts.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/StdFonts.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/StdFonts.pyo
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdMenus.py
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdMenus.pyc
+%%PYTHON_SITELIBDIR%%/GUI/Gtk/StdMenus.pyo
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Tasks.py
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Tasks.pyc
 %%PYTHON_SITELIBDIR%%/GUI/Gtk/Tasks.pyo
@@ -238,29 +307,45 @@
 %%PORTDOCS%%%%DOCSDIR%%/CheckBox.html
 %%PORTDOCS%%%%DOCSDIR%%/Color.html
 %%PORTDOCS%%%%DOCSDIR%%/Component.html
+%%PORTDOCS%%%%DOCSDIR%%/Container.html
 %%PORTDOCS%%%%DOCSDIR%%/Control.html
+%%PORTDOCS%%%%DOCSDIR%%/Cursor.html
 %%PORTDOCS%%%%DOCSDIR%%/Dialog.html
 %%PORTDOCS%%%%DOCSDIR%%/DirRef.html
+%%PORTDOCS%%%%DOCSDIR%%/DisplayList.html
 %%PORTDOCS%%%%DOCSDIR%%/Document.html
 %%PORTDOCS%%%%DOCSDIR%%/Event.html
 %%PORTDOCS%%%%DOCSDIR%%/FileRef.html
+%%PORTDOCS%%%%DOCSDIR%%/FileType.html
 %%PORTDOCS%%%%DOCSDIR%%/Font.html
 %%PORTDOCS%%%%DOCSDIR%%/Frame.html
+%%PORTDOCS%%%%DOCSDIR%%/GL.html
+%%PORTDOCS%%%%DOCSDIR%%/GLConfig.html
+%%PORTDOCS%%%%DOCSDIR%%/GLPixmap.html
 %%PORTDOCS%%%%DOCSDIR%%/GLView.html
 %%PORTDOCS%%%%DOCSDIR%%/Geometry.html
 %%PORTDOCS%%%%DOCSDIR%%/Image.html
+%%PORTDOCS%%%%DOCSDIR%%/ImageBase.html
 %%PORTDOCS%%%%DOCSDIR%%/Label.html
 %%PORTDOCS%%%%DOCSDIR%%/Menu.html
+%%PORTDOCS%%%%DOCSDIR%%/MenuItem.html
+%%PORTDOCS%%%%DOCSDIR%%/MenuList.html
 %%PORTDOCS%%%%DOCSDIR%%/MessageHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/ModalDialog.html
 %%PORTDOCS%%%%DOCSDIR%%/Model.html
 %%PORTDOCS%%%%DOCSDIR%%/Pixmap.html
 %%PORTDOCS%%%%DOCSDIR%%/RadioButton.html
 %%PORTDOCS%%%%DOCSDIR%%/RadioGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/ScrollFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/Resources.html
+%%PORTDOCS%%%%DOCSDIR%%/ScrollableView.html
+%%PORTDOCS%%%%DOCSDIR%%/ShareGroup.html
 %%PORTDOCS%%%%DOCSDIR%%/StdColors.html
+%%PORTDOCS%%%%DOCSDIR%%/StdCursors.html
 %%PORTDOCS%%%%DOCSDIR%%/StdFonts.html
+%%PORTDOCS%%%%DOCSDIR%%/StdMenus.html
+%%PORTDOCS%%%%DOCSDIR%%/Task.html
 %%PORTDOCS%%%%DOCSDIR%%/TextField.html
+%%PORTDOCS%%%%DOCSDIR%%/Texture.html
 %%PORTDOCS%%%%DOCSDIR%%/ToDo/Picture.html
 %%PORTDOCS%%%%DOCSDIR%%/Tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/View.html
@@ -272,6 +357,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/coordinates.cwk
 %%PORTDOCS%%%%DOCSDIR%%/coordinates.html
 %%PORTDOCS%%%%DOCSDIR%%/coordinates.jpg
+%%PORTDOCS%%%%DOCSDIR%%/customising-standard-menus.html
 %%PORTDOCS%%%%DOCSDIR%%/event_handling.html
 %%PORTDOCS%%%%DOCSDIR%%/extent.cwk
 %%PORTDOCS%%%%DOCSDIR%%/extent.jpg