Date: Sun, 6 Jul 2014 05:46:21 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360861 - in head/x11-toolkits/py-gui: . files Message-ID: <201407060546.s665kLnx083609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Jul 6 05:46:20 2014 New Revision: 360861 URL: http://svnweb.freebsd.org/changeset/ports/360861 QAT: https://qat.redports.org/buildarchive/r360861/ Log: - Convert to new options helper - Respect PORTEXAMPLES - Remove LATEST_LINK - Use COPYTREE_SHARE - Merge file/dir manipulation into post-patch: - Bump PORTREVISION for package change Modified: head/x11-toolkits/py-gui/Makefile head/x11-toolkits/py-gui/files/patch-GUI-Gtk-GL.py head/x11-toolkits/py-gui/pkg-plist Modified: head/x11-toolkits/py-gui/Makefile ============================================================================== --- head/x11-toolkits/py-gui/Makefile Sun Jul 6 05:39:03 2014 (r360860) +++ head/x11-toolkits/py-gui/Makefile Sun Jul 6 05:46:20 2014 (r360861) @@ -3,7 +3,7 @@ PORTNAME= gui PORTVERSION= 1.7.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python_gui/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,46 +14,29 @@ COMMENT= Cross-platform pythonic GUI API BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex +OPTIONS_DEFINE= DOCS EXAMPLES OPENGL +OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options + +USE_GNOME= pygtk2 USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes -USE_GNOME= pygtk2 DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} - -# A workaround for the problem that "make config" doesn't work -# because _OPTIONSFILE is defined before bsd.python.mk is included. -LATEST_LINK= py-${PORTNAME} - WRKSRC= ${WRKDIR}/PyGUI-${PORTVERSION} -OPTIONS_DEFINE= OPENGL DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENGL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext -.endif - -post-extract: - ${RM} -rf ${WRKSRC}/GUI/Cocoa - ${TOUCH} ${WRKSRC}/GUI/Gtk/__init__.py \ - ${WRKSRC}/GUI/Generic/__init__.py +OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext post-patch: - ${REINPLACE_CMD} -e 's/"GUI.Cocoa",//g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|"GUI.Cocoa",||g' ${WRKSRC}/setup.py + @${TOUCH} ${WRKSRC}/GUI/Generic/__init__.py ${WRKSRC}/GUI/Gtk/__init__.py + @${RM} -fr ${WRKSRC}/Demos/BlobEdit/.gdb_history ${WRKSRC}/Demos/BlobEdit/Makefile ${WRKSRC}/GUI/Cocoa post-install: -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${TAR} -C ${WRKSRC}/Doc -cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - + cd ${WRKSRC}/Doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${RM} -f ${WRKSRC}/Demos/BlobEdit/.gdb_history \ - ${WRKSRC}/Demos/BlobEdit/Makefile - ${TAR} -C ${WRKSRC}/Demos -cf - . | \ - ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf - -.endif + cd ${WRKSRC}/Demos/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/x11-toolkits/py-gui/files/patch-GUI-Gtk-GL.py ============================================================================== --- head/x11-toolkits/py-gui/files/patch-GUI-Gtk-GL.py Sun Jul 6 05:39:03 2014 (r360860) +++ head/x11-toolkits/py-gui/files/patch-GUI-Gtk-GL.py Sun Jul 6 05:46:20 2014 (r360861) @@ -28,7 +28,3 @@ @@ -223,4 +223,4 @@ print "GLPixmap: Set viewport to", width, height ### self.init_context() - -- -\ No newline at end of file -+ Modified: head/x11-toolkits/py-gui/pkg-plist ============================================================================== --- head/x11-toolkits/py-gui/pkg-plist Sun Jul 6 05:39:03 2014 (r360860) +++ head/x11-toolkits/py-gui/pkg-plist Sun Jul 6 05:46:20 2014 (r360861) @@ -71,18 +71,16 @@ %%PORTDOCS%%%%DOCSDIR%%/using_the_view_class.html %%PORTDOCS%%%%DOCSDIR%%/view-model.cwk %%PORTDOCS%%%%DOCSDIR%%/view-model.jpg -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/blobedit.py -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob.tiff -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob_app.icns -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob_file.icns -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Samples/asdf.blob -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Samples/frown.blob -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Samples/line.blob -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/Samples/smile.blob -%%PORTDOCS%%%%EXAMPLESDIR%%/BlobEdit/setup.py -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BlobEdit/Resources -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BlobEdit/Samples -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BlobEdit -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob.tiff +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob_app.icns +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Resources/blob_file.icns +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Samples/asdf.blob +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Samples/frown.blob +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Samples/line.blob +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/Samples/smile.blob +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/blobedit.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlobEdit/setup.py +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlobEdit +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/ToDo %%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407060546.s665kLnx083609>