Date: Tue, 8 Dec 2015 14:54:44 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403276 - in head/devel/gps: . files Message-ID: <201512081454.tB8EsiE4027885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Dec 8 14:54:44 2015 New Revision: 403276 URL: https://svnweb.freebsd.org/changeset/ports/403276 Log: devel/gps: Remover requirement on gnatinspect, plus Currently gnatinspect is useless because GNAT FSF cannot generate the cross-reference definitions. It needs to be implmented at the compiler level (and one day I may do it). In the meantime, alter gps to skip as many cross-reference checks as we can and remove gnatcoll from RUN_DEPENDS list. While here: 1) generate all the pyc files (a bunch were missed) 2) fix pkg-plist 3) Fix locale support (use ISO8859-* instead of ISO-8859-*) These changes were done in an attempt to solve PR/202317, but that FreeBSD-only problem still exists (error highlight works perfectly on DragonFly). Cause still unknown. Added: head/devel/gps/files/patch-share_plug-ins_dispatching.py (contents, props changed) Modified: head/devel/gps/Makefile head/devel/gps/pkg-plist Modified: head/devel/gps/Makefile ============================================================================== --- head/devel/gps/Makefile Tue Dec 8 14:44:32 2015 (r403275) +++ head/devel/gps/Makefile Tue Dec 8 14:54:44 2015 (r403276) @@ -3,7 +3,7 @@ PORTNAME= gps PORTVERSION= 6.1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= gps-6.1.1-src @@ -20,7 +20,6 @@ BUILD_DEPENDS= gprbuild:${PORTSDIR}/deve templates_parser>11:${PORTSDIR}/textproc/templates_parser LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 RUN_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ - gnatinspect:${PORTSDIR}/devel/gnatcoll \ gdb${PORTGDB}:${PORTSDIR}/devel/gdb \ gprbuild:${PORTSDIR}/devel/gprbuild \ ${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \ @@ -71,6 +70,8 @@ MAKE_ARGS+= Build=Production post-extract: @${MV} ${WRKSRC}/templates_parser ${WRKSRC}/TP.ignore @${MV} ${WRKSRC}/Makefile.gnat ${WRKSRC}/Makefile.gnat.ignore + @${FIND} ${WRKSRC}/share -name "*.pyc" -delete + ${RM} ${WRKSRC}/share/support/core/cross_references.py post-patch: @${ECHO} "GNAT_SOURCES=" > ${WRKSRC}/Makefile.gnat @@ -103,6 +104,14 @@ post-patch: @${REINPLACE_CMD} -e '/Gdb_Command/ s|"gdb"|"gdb${PORTGDB}"|' \ ${WRKSRC}/gvd/src/debugger-gdb_mi.adb \ ${WRKSRC}/gvd/src/debugger-gdb.adb + @${REINPLACE_CMD} -e 's|ISO-8859|ISO8859|' \ + ${WRKSRC}/kernel/src/gps-kernel-charsets.adb \ + ${WRKSRC}/share/support/core/os_utils.py \ + ${WRKSRC}/configure* \ + ${WRKSRC}/po/build_skeleton.pl + @${REINPLACE_CMD} -e 's|iso-8859|ISO8859|' \ + ${WRKSRC}/cli/src/gps-cli_scripts.adb \ + ${WRKSRC}/cli/src/gnatdoc_main.adb do-build: @${CP} ${PREFIX}/include/gnat_util/impunit.* ${WRKSRC}/distrib @@ -112,6 +121,7 @@ do-build: ${MAKE_CMD} ${MAKE_ARGS} all ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library + ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/support post-install: ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources Added: head/devel/gps/files/patch-share_plug-ins_dispatching.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gps/files/patch-share_plug-ins_dispatching.py Tue Dec 8 14:54:44 2015 (r403276) @@ -0,0 +1,30 @@ +--- share/plug-ins/dispatching.py.orig 2014-11-13 18:15:57 UTC ++++ share/plug-ins/dispatching.py +@@ -35,11 +35,8 @@ class Dispatching_Highlighter(Location_H + GPS.Hook("file_edited").add(self.__on_file_edited) + GPS.Hook("file_changed_on_disk").add(self.__on_file_edited) + +- if GPS.Logger("ENTITIES.SQLITE").active: +- GPS.Hook("xref_updated").add(self.__on_compilation_finished) +- else: +- GPS.Hook("compilation_finished").add( +- self.__on_compilation_finished) ++ GPS.Hook("compilation_finished").add( ++ self.__on_compilation_finished) + + def __del__(self): + Location_Highlighter.__del__(self) +@@ -47,11 +44,8 @@ class Dispatching_Highlighter(Location_H + GPS.Hook("file_edited").remove(self.__on_file_edited) + GPS.Hook("file_changed_on_disk").remove(self.__on_file_edited) + +- if GPS.Logger("ENTITIES.SQLITE").active: +- GPS.Hook("xref_updated").remove(self.__on_compilation_finished) +- else: +- GPS.Hook("compilation_finished").remove( +- self.__on_compilation_finished) ++ GPS.Hook("compilation_finished").remove( ++ self.__on_compilation_finished) + + def __on_preferences_changed(self, hook): + changed = False Modified: head/devel/gps/pkg-plist ============================================================================== --- head/devel/gps/pkg-plist Tue Dec 8 14:44:32 2015 (r403275) +++ head/devel/gps/pkg-plist Tue Dec 8 14:54:44 2015 (r403276) @@ -497,17 +497,25 @@ share/gps/predefined_ada.xml share/gps/readonly.gpr share/gps/show_coverage.xsl share/gps/support/core/GPS_help.py +share/gps/support/core/GPS_help.pyc share/gps/support/core/GPS_old/__init__.py +share/gps/support/core/GPS_old/__init__.pyc share/gps/support/core/__init__.py +share/gps/support/core/__init__.pyc share/gps/support/core/aliases.py +share/gps/support/core/aliases.pyc share/gps/support/core/auto_load.py +share/gps/support/core/auto_load.pyc share/gps/support/core/build.py +share/gps/support/core/build.pyc share/gps/support/core/color_utils.py +share/gps/support/core/color_utils.pyc share/gps/support/core/completion.py +share/gps/support/core/completion.pyc share/gps/support/core/console_utils.py +share/gps/support/core/console_utils.pyc share/gps/support/core/constructs.py share/gps/support/core/constructs.pyc -share/gps/support/core/cross_references.py share/gps/support/core/customFiles.xsd share/gps/support/core/extensions/__init__.py share/gps/support/core/extensions/__init__.pyc @@ -521,37 +529,57 @@ share/gps/support/core/gps_utils/__init_ share/gps/support/core/gps_utils/console_process.py share/gps/support/core/gps_utils/console_process.pyc share/gps/support/core/gps_utils/gnat_rules.py +share/gps/support/core/gps_utils/gnat_rules.pyc share/gps/support/core/gps_utils/gnatcheck_default.py +share/gps/support/core/gps_utils/gnatcheck_default.pyc share/gps/support/core/gps_utils/gnatcheck_rules_editor.py +share/gps/support/core/gps_utils/gnatcheck_rules_editor.pyc share/gps/support/core/gps_utils/highlighter.py share/gps/support/core/gps_utils/highlighter.pyc share/gps/support/core/gps_utils/promises.py +share/gps/support/core/gps_utils/promises.pyc share/gps/support/core/gps_utils/switches.py +share/gps/support/core/gps_utils/switches.pyc share/gps/support/core/gps_utils/workflow.py +share/gps/support/core/gps_utils/workflow.pyc share/gps/support/core/languages.py +share/gps/support/core/languages.pyc share/gps/support/core/modules.py share/gps/support/core/modules.pyc share/gps/support/core/navigation_utils.py +share/gps/support/core/navigation_utils.pyc share/gps/support/core/os_utils.py +share/gps/support/core/os_utils.pyc share/gps/support/core/projects.py +share/gps/support/core/projects.pyc share/gps/support/core/protocols.py share/gps/support/core/protocols.py.in +share/gps/support/core/protocols.pyc share/gps/support/core/runtime.py share/gps/support/core/search.py +share/gps/support/core/search.pyc share/gps/support/core/text_utils.py +share/gps/support/core/text_utils.pyc share/gps/support/core/tool_output.py +share/gps/support/core/tool_output.pyc share/gps/support/core/toolchains.py +share/gps/support/core/toolchains.pyc share/gps/support/core/vcs.py +share/gps/support/core/vcs.pyc share/gps/support/ui/GPS_doc/Browsers.py share/gps/support/ui/GPS_doc/Browsers.pyc share/gps/support/ui/GPS_doc/__init__.py share/gps/support/ui/GPS_doc/__init__.pyc share/gps/support/ui/c_highlighter.py +share/gps/support/ui/c_highlighter.pyc share/gps/support/ui/colorschemes.py share/gps/support/ui/colorschemes.pyc share/gps/support/ui/console.py +share/gps/support/ui/console.pyc share/gps/support/ui/gnatmetric.py +share/gps/support/ui/gnatmetric.pyc share/gps/support/ui/gpsbrowsers.py +share/gps/support/ui/gpsbrowsers.pyc share/gps/support/ui/highlighter/__init__.py share/gps/support/ui/highlighter/__init__.pyc share/gps/support/ui/highlighter/common.py @@ -561,16 +589,25 @@ share/gps/support/ui/highlighter/engine. share/gps/support/ui/highlighter/interface.py share/gps/support/ui/highlighter/interface.pyc share/gps/support/ui/icons.py +share/gps/support/ui/icons.pyc share/gps/support/ui/locations_view_utils.py +share/gps/support/ui/locations_view_utils.pyc share/gps/support/ui/multi_cursors.py +share/gps/support/ui/multi_cursors.pyc share/gps/support/ui/pygps/__init__.py share/gps/support/ui/pygps/__init__.pyc share/gps/support/ui/pygps/notebook.py +share/gps/support/ui/pygps/notebook.pyc share/gps/support/ui/pygps/project.py +share/gps/support/ui/pygps/project.pyc share/gps/support/ui/pygps/tree.py +share/gps/support/ui/pygps/tree.pyc share/gps/support/ui/python_highlighter.py +share/gps/support/ui/python_highlighter.pyc share/gps/support/ui/reloadcss.py +share/gps/support/ui/reloadcss.pyc share/gps/support/ui/task_manager.py +share/gps/support/ui/task_manager.pyc share/gps/templates/ajis_hello/@_project_name_@.gpr share/gps/templates/ajis_hello/Makefile share/gps/templates/ajis_hello/ajis_hello.gpt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512081454.tB8EsiE4027885>