ports/161442: [MAINTAINER] devel/gps: Update to version 5.0.1
John Marino
draco at marino.st
Sun Oct 9 21:20:10 UTC 2011
>Number: 161442
>Category: ports
>Synopsis: [MAINTAINER] devel/gps: Update to version 5.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 09 21:20:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: John Marino
>Release:
>Organization:
>Environment:
>Description:
Update to officially released version 5.0.1 (Jan 2011)
This version requires that the highest version of gtkada used is 2.22. Gtkada will have to remain at 2.22 until GPS 5.1 or 5.2 is added to the ports. Unfortunately, these new versions of GPS requires GNAT based on gcc 4.7 which isn't released yet, so we'll be on the GPS 5.0 series for a while.
Patch:
1) checks that version of gtkada < 2.24
2) Fixes python dependency (limited to 2.6 and 2.7)
3) Fixes py-gtk2 dependency (it was broken before)
Several patches removed:
patch-prj_editor-src-project_properties.adb
patch-prj_editor-src-project_viewers.ads
patch-prj_editor-src-project_viewers.adb
patch-gnatlib-gnat_src-gnatvsn.adb
Several patches added:
patch-gnatlib-gnat_src-mlib-utl.adb
patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.ads
patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.adb
Two patches modified:
patch-common-tty-terminals.c
patch-Makefile.in
Documentation is now limited to the Adacore produced pdf manual.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2011-07-17 18:35:54.000000000 +0200
+++ Makefile 2011-10-10 00:00:12.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= gps
-PORTVERSION= 5.0.0
-PORTREVISION= 1
+PORTVERSION= 5.0.1
CATEGORIES= devel
MASTER_SITES= http://downloads.dragonlace.net/src/ \
http://dragonlace.mirrors.ada.cx/src/
@@ -15,11 +14,11 @@
MAINTAINER= draco at marino.st
COMMENT= GNAT Programming Studio - IDE for Ada and many other languages
-BUILD_DEPENDS= gnat-aux>20101204:${PORTSDIR}/lang/gnat-aux \
- gtkada>=2.22:${PORTSDIR}/x11-toolkits/gtkada \
+BUILD_DEPENDS= gnat-aux>20110325:${PORTSDIR}/lang/gnat-aux \
+ gtkada<2.24:${PORTSDIR}/x11-toolkits/gtkada \
xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
gprbuild-aux>=20101120:${PORTSDIR}/devel/gprbuild-aux
-RUN_DEPENDS= gtkada>=2.22:${PORTSDIR}/x11-toolkits/gtkada
+RUN_DEPENDS= gtkada<2.24:${PORTSDIR}/x11-toolkits/gtkada
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
LATEST_LINK= gps-ide
@@ -85,8 +84,7 @@
.if defined(WITH_PYTHON)
CONFIGURE_ARGS+= --with-python=${PREFIX}
-BUILD_DEPENDS+= python26>=2.6:${PORTSDIR}/lang/python26
-RUN_DEPENDS+= python26>=2.6:${PORTSDIR}/lang/python26
+USE_PYTHON= 26 27
.else
CONFIGURE_ARGS+= --without-python
.endif
@@ -97,8 +95,8 @@
.if defined(WITH_PYGTK)
CONFIGURE_ARGS+= --enable-pygtk
-BUILD_DEPENDS+= py-gtk2>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+= py-gtk2>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
+BUILD_DEPENDS+= py2[67]-gtk>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS+= py2[67]-gtk>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
.else
CONFIGURE_ARGS+= --disable-pygtk
.endif
--- files/patch-common-tty-terminals.c.orig 2011-03-02 01:53:02.000000000 +0100
+++ files/patch-common-tty-terminals.c 2011-10-09 02:59:35.000000000 +0200
@@ -1,5 +1,5 @@
---- common/tty/terminals.c.orig 2010-12-04 03:57:46 +0000
-+++ common/tty/terminals.c
+--- common/tty/terminals.c.orig 2009-09-30 11:30:08.000000000 +0200
++++ common/tty/terminals.c 2011-10-09 02:58:53.000000000 +0200
@@ -31,7 +31,10 @@
#ifndef WIN32
@@ -12,3 +12,13 @@
# define FREEBSD
#endif
#if defined (__alpha__) && defined (__osf__)
+@@ -260,7 +263,9 @@
+ #ifndef NLDLY
+ #define NLDLY 0
+ #define CRDLY 0
++#ifndef TABDLY
+ #define TABDLY 0
++#endif
+ #define BSDLY 0
+ #define VTDLY 0
+ #define FFDLY 0
--- /dev/null 2011-10-09 07:13:54.000000000 +0200
+++ files/patch-gnatlib-gnat_src-mlib-utl.adb 2011-10-09 04:13:17.000000000 +0200
@@ -0,0 +1,11 @@
+--- gnatlib/gnat_src/mlib-utl.adb.orig 2010-02-14 02:40:00.000000000 +0100
++++ gnatlib/gnat_src/mlib-utl.adb 2011-10-09 04:11:21.000000000 +0200
+@@ -412,7 +412,7 @@
+ if Driver_Name = No_Name then
+ if Gcc_Exec = null then
+ if Gcc_Name = null then
+- Gcc_Name := Osint.Program_Name ("gcc", "gnatmake");
++ Gcc_Name := Osint.Program_Name ("gnatgcc", "gnatmake");
+ end if;
+
+ Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all);
--- /dev/null 2011-10-09 07:13:54.000000000 +0200
+++ files/patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.ads 2011-10-09 05:07:17.000000000 +0200
@@ -0,0 +1,13 @@
+--- gnatlib/src/nopython/gnatcoll-scripts-python.ads.orig 2010-10-14 12:15:05.000000000 +0200
++++ gnatlib/src/nopython/gnatcoll-scripts-python.ads 2011-10-09 05:03:58.000000000 +0200
+@@ -31,7 +31,9 @@
+
+ procedure Register_Python_Scripting
+ (Repo : Scripts.Scripts_Repository;
+- Module : String);
++ Module : String;
++ Program_Name : String := "python";
++ Python_Home : String := "");
+ procedure Unregister_Python_Scripting
+ (Repo : Scripts.Scripts_Repository);
+ -- Does nothing, since python was not compiled in.
--- /dev/null 2011-10-09 07:18:09.000000000 +0200
+++ files/patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.adb 2011-10-09 05:14:01.000000000 +0200
@@ -0,0 +1,16 @@
+--- gnatlib/src/nopython/gnatcoll-scripts-python.adb.orig 2011-10-09 05:02:49.000000000 +0200
++++ gnatlib/src/nopython/gnatcoll-scripts-python.adb 2011-10-09 05:13:08.000000000 +0200
+@@ -33,9 +33,11 @@
+
+ procedure Register_Python_Scripting
+ (Repo : Scripts.Scripts_Repository;
+- Module : String)
++ Module : String;
++ Program_Name : String := "python";
++ Python_Home : String := "")
+ is
+- pragma Unreferenced (Repo, Module);
++ pragma Unreferenced (Repo, Module, Program_Name, Python_Home);
+ begin
+ null;
+ end Register_Python_Scripting;
--- files/patch-prj_editor-src-project_properties.adb 2011-07-16 18:52:52.000000000 +0200
+++ /dev/null 2011-10-09 07:18:09.000000000 +0200
@@ -1,20 +0,0 @@
---- prj_editor/src/project_properties.adb.orig 2010-12-14 23:30:31.000000000 +0100
-+++ prj_editor/src/project_properties.adb
-@@ -4925,7 +4925,7 @@
- then
- -- Some pages might not be visible though...
- P := Get_Nth_Project_Editor_Page
-- (Ed.Kernel, Page - Pages_From_XML_Count);
-+ (Ed.Kernel, Page - Pages_From_XML_Count + 1);
- end if;
-
- if P /= null then
-@@ -4934,7 +4934,7 @@
- begin
- Refresh
- (Page => P,
-- Widget => Ed.Pages (Page - Pages_From_XML_Count),
-+ Widget => Ed.Pages (Page - Pages_From_XML_Count + 1),
- Project => Ed.Project,
- Languages => Languages.all);
- Free (Languages);
--- files/patch-prj_editor-src-project_viewers.ads 2011-07-16 18:52:52.000000000 +0200
+++ /dev/null 2011-10-09 07:18:09.000000000 +0200
@@ -1,11 +0,0 @@
---- prj_editor/src/project_viewers.ads.orig 2010-12-14 23:30:31.000000000 +0100
-+++ prj_editor/src/project_viewers.ads
-@@ -159,7 +159,7 @@
- -- Return the number of registered project editor pages
-
- function Get_Nth_Project_Editor_Page
-- (Kernel : access GPS.Kernel.Kernel_Handle_Record'Class; Num : Natural)
-+ (Kernel : access GPS.Kernel.Kernel_Handle_Record'Class; Num : Positive)
- return Project_Editor_Page;
- -- Return the Num-th registered project editor page.
- -- First page is number 1.
--- files/patch-prj_editor-src-project_viewers.adb 2011-07-16 18:52:52.000000000 +0200
+++ /dev/null 2011-10-09 07:18:09.000000000 +0200
@@ -1,11 +0,0 @@
---- prj_editor/src/project_viewers.adb.orig 2010-12-14 23:30:31.000000000 +0100
-+++ prj_editor/src/project_viewers.adb
-@@ -1657,7 +1657,7 @@
- ---------------------------------
-
- function Get_Nth_Project_Editor_Page
-- (Kernel : access Kernel_Handle_Record'Class; Num : Natural)
-+ (Kernel : access Kernel_Handle_Record'Class; Num : Positive)
- return Project_Editor_Page
- is
- pragma Unreferenced (Kernel);
--- pkg-plist.orig 2011-03-02 01:53:01.000000000 +0100
+++ pkg-plist 2011-10-09 09:09:54.000000000 +0200
@@ -1,86 +1,5 @@
bin/gps
-%%DOCSDIR%%/html/welcome.jpg
-%%DOCSDIR%%/html/visual-diff.jpg
-%%DOCSDIR%%/html/vcs-explorer.jpg
-%%DOCSDIR%%/html/vcs-activities.jpg
-%%DOCSDIR%%/html/user_guide.png
-%%DOCSDIR%%/html/tutorial.png
-%%DOCSDIR%%/html/triangle_x.png
-%%DOCSDIR%%/html/tooltips.jpg
-%%DOCSDIR%%/html/toolchains-config.jpg
-%%DOCSDIR%%/html/tip-of-the-day.jpg
-%%DOCSDIR%%/html/tasks.jpg
-%%DOCSDIR%%/html/task-manager.jpg
-%%DOCSDIR%%/html/target-configuration-dialog.jpg
-%%DOCSDIR%%/html/switch-editor-revert.jpg
-%%DOCSDIR%%/html/switch-editor.jpg
-%%DOCSDIR%%/html/square_x.png
-%%DOCSDIR%%/html/source-editor.jpg
-%%DOCSDIR%%/html/smart-completion.jpg
-%%DOCSDIR%%/html/shell-window.jpg
-%%DOCSDIR%%/html/servers-configuration.jpg
-%%DOCSDIR%%/html/search-options.jpg
-%%DOCSDIR%%/html/search-hide.jpg
-%%DOCSDIR%%/html/scenario-view.jpg
-%%DOCSDIR%%/html/scenarios.jpg
-%%DOCSDIR%%/html/save-dialog.jpg
-%%DOCSDIR%%/html/revision-view.jpg
-%%DOCSDIR%%/html/report-of-analysis_tree.jpg
-%%DOCSDIR%%/html/report-of-analysis_flat.jpg
-%%DOCSDIR%%/html/remote-view.jpg
-%%DOCSDIR%%/html/remote-view-full.jpg
-%%DOCSDIR%%/html/project-wizard.jpg
-%%DOCSDIR%%/html/project-view.jpg
-%%DOCSDIR%%/html/project-properties.jpg
-%%DOCSDIR%%/html/project-modified.jpg
-%%DOCSDIR%%/html/project-deps.jpg
-%%DOCSDIR%%/html/project-browser.jpg
-%%DOCSDIR%%/html/preferences-general.jpg
-%%DOCSDIR%%/html/overview.png
-%%DOCSDIR%%/html/outline-view.jpg
-%%DOCSDIR%%/html/open-from-project.jpg
-%%DOCSDIR%%/html/open-file.jpg
-%%DOCSDIR%%/html/naming-scheme.jpg
-%%DOCSDIR%%/html/messages.jpg
-%%DOCSDIR%%/html/memory-view.jpg
-%%DOCSDIR%%/html/main-gps.jpg
-%%DOCSDIR%%/html/locations-view.jpg
-%%DOCSDIR%%/html/key-shortcuts.jpg
-%%DOCSDIR%%/html/help_index.html
-%%DOCSDIR%%/html/gps-welcome.html
-%%DOCSDIR%%/html/gps-vcs-up-to-date.jpg
-%%DOCSDIR%%/html/gps-vcs-unknown.jpg
-%%DOCSDIR%%/html/gps-vcs-removed.jpg
-%%DOCSDIR%%/html/gps-vcs-not-registered.jpg
-%%DOCSDIR%%/html/gps-vcs-needs-update.jpg
-%%DOCSDIR%%/html/gps-vcs-needs-merge.jpg
-%%DOCSDIR%%/html/gps-vcs-modified.jpg
-%%DOCSDIR%%/html/gps-vcs-has-conflicts.jpg
-%%DOCSDIR%%/html/gps-vcs-added.jpg
-%%DOCSDIR%%/html/gps_title.gif
-%%DOCSDIR%%/html/gps-splash.png
-%%DOCSDIR%%/html/gps-splash-gpl.png
-%%DOCSDIR%%/html/gps-splash-academic.png
-%%DOCSDIR%%/html/gps_index.xml
-%%DOCSDIR%%/html/gps.html
-%%DOCSDIR%%/html/file-view.jpg
-%%DOCSDIR%%/html/explorer-scenario.jpg
-%%DOCSDIR%%/html/entity-view.jpg
-%%DOCSDIR%%/html/entity-browser.jpg
-%%DOCSDIR%%/html/dot_x.png
-%%DOCSDIR%%/html/docgen.jpg
-%%DOCSDIR%%/html/diamond_x.png
-%%DOCSDIR%%/html/dependency-browser.jpg
-%%DOCSDIR%%/html/colors.jpg
-%%DOCSDIR%%/html/circle_x.png
-%%DOCSDIR%%/html/canvas.jpg
-%%DOCSDIR%%/html/call-stack.jpg
-%%DOCSDIR%%/html/call-graph.jpg
-%%DOCSDIR%%/html/breakpoints.jpg
-%%DOCSDIR%%/html/bp-advanced.jpg
-%%DOCSDIR%%/html/assembly.jpg
-%%DOCSDIR%%/html/aliases.jpg
-%%DOCSDIR%%/html/about.jpg
+%%DOCSDIR%%/gps.pdf
%%DATADIR%%/templates/simple_project/src/@_main_name_ at .adb
%%DATADIR%%/templates/simple_project/simple_project.gpt
%%DATADIR%%/templates/simple_project/@_project_name_ at .gpr
@@ -484,7 +403,6 @@
%%EXAMPLESDIR%%/tutorial/projects/prj2.gpr
%%EXAMPLESDIR%%/tutorial/projects/prj1/src1.adb
%%EXAMPLESDIR%%/tutorial/projects/prj1.gpr
-%%EXAMPLESDIR%%/tutorial/obj/.cvsignore
%%EXAMPLESDIR%%/tutorial/input.txt
%%EXAMPLESDIR%%/tutorial/common/stack.ads
%%EXAMPLESDIR%%/tutorial/common/stack.adb
@@ -501,7 +419,6 @@
%%EXAMPLESDIR%%/remote/src/gen_list.adb
%%EXAMPLESDIR%%/remote/src/demo1.adb
%%EXAMPLESDIR%%/remote/remote.gpr
-%%EXAMPLESDIR%%/remote/obj/.cvsignore
%%EXAMPLESDIR%%/remote/my_ssh
%%EXAMPLESDIR%%/remote/README
%%EXAMPLESDIR%%/python/remote_server_assign_variable.py
@@ -544,7 +461,6 @@
%%EXAMPLESDIR%%/demo/projects/prj2.gpr
%%EXAMPLESDIR%%/demo/projects/prj1/src1.adb
%%EXAMPLESDIR%%/demo/projects/prj1.gpr
-%%EXAMPLESDIR%%/demo/obj/.cvsignore
%%EXAMPLESDIR%%/demo/matrix_handling/matrix_utils.c
%%EXAMPLESDIR%%/demo/matrix_handling/matrix.h
%%EXAMPLESDIR%%/demo/matrix_handling/matrix.c
@@ -638,9 +554,6 @@
@dirrm %%DATADIR%%/docgen2/custom
@dirrm %%DATADIR%%/docgen2
@dirrm %%DATADIR%%/aunit
- at dirrm %%DOCSDIR%%/html
- at dirrm %%DOCSDIR%%/pdf
- at dirrm %%DOCSDIR%%/txt
@dirrm %%DOCSDIR%%
@dirrmtry %%DATADIR%%/plug-ins
@dirrmtry %%DATADIR%%
--- distinfo.orig 2011-03-02 01:53:01.000000000 +0100
+++ distinfo 2011-10-09 09:09:19.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (gps-5.0.0.tar.bz2) = 3eb34bca1868f7b762bf5bd5b753ca584b6d74cc2a95970970c66ce724b0cbc7
-SIZE (gps-5.0.0.tar.bz2) = 9325721
+SHA256 (gps-5.0.1.tar.bz2) = 3fd1dcaf420c901eb1107d65bce0b9fa0ec08d3948fbcd3ddb670c1ee84eeb09
+SIZE (gps-5.0.1.tar.bz2) = 12968543
--- files/patch-Makefile.in.orig 2011-03-02 01:53:02.000000000 +0100
+++ files/patch-Makefile.in 2011-10-09 09:52:44.000000000 +0200
@@ -1,6 +1,22 @@
---- Makefile.in.orig 2010-12-04 07:21:32.000000000 +0100
-+++ Makefile.in 2010-12-14 17:31:51.000000000 +0100
-@@ -42,11 +42,6 @@
+--- Makefile.in.orig 2010-09-24 10:51:03.000000000 +0200
++++ Makefile.in 2011-10-09 09:51:56.000000000 +0200
+@@ -11,6 +11,7 @@
+ prefix = @prefix@
+ bindir = $(prefix)/bin
+ sharedir = $(prefix)/share
++docdir = $(prefix)/share/doc/gps
+ examplesdir = $(prefix)/share/examples/gps
+
+ default:
+@@ -26,6 +27,7 @@
+ install-common:
+ $(MKDIR) $(bindir)
+ $(MKDIR) $(sharedir)
++ $(MKDIR) $(docdir)
+ $(MKDIR) $(examplesdir)
+ $(MKDIR) $(sharedir)/gps
+ $(MKDIR) $(sharedir)/gps/docgen2
+@@ -42,11 +44,6 @@
share/plug-ins/_subversion_ \
> share/plug-ins/subversion_native_windows.xml
endif
@@ -12,3 +28,13 @@
# update runtime.xml before copying the plug-ins files.
(cd distrib; $(PERL) from_impunit.pl)
(cd share; tar cf - plug-ins/*.xml) | (cd $(sharedir)/gps; tar xf -)
+@@ -72,7 +69,8 @@
+ | (cd $(sharedir)/gps/docgen2; tar xf -)
+ (cd aunit/templates; tar cf - *.tmpl) \
+ | (cd $(sharedir)/gps/aunit; tar xf -)
+- $(MAKE) -C docs install
++ ${INSTALL} docs/gps.pdf $(docdir)
++ ${INSTALL} docs/gps-splash.png $(sharedir)/gps
+ (cd examples; tar cf - --exclude .svn . ) | (cd $(examplesdir); tar xf -)
+
+ install: install-common
--- files/patch-gnatlib-gnat_src-gnatvsn.adb 2011-03-02 01:53:02.000000000 +0100
+++ /dev/null 2011-10-10 00:22:00.000000000 +0200
@@ -1,31 +0,0 @@
---- gnatlib/gnat_src/gnatvsn.adb.orig 2010-12-04 08:12:30 +0000
-+++ gnatlib/gnat_src/gnatvsn.adb
-@@ -53,27 +53,13 @@ package body Gnatvsn is
- " FOR A PARTICULAR PURPOSE.";
- end Gnat_Free_Software;
-
-- Version_String : String (1 .. Ver_Len_Max);
-- -- Import the C string defined in the (language-independent) source file
-- -- version.c.
-- -- The size is not the real one, which does not matter since we will
-- -- check for the nul character in Gnat_Version_String.
-- pragma Import (C, Version_String, "version_string");
--
- -------------------------
- -- Gnat_Version_String --
- -------------------------
-
- function Gnat_Version_String return String is
-- NUL_Pos : Positive := 1;
- begin
-- loop
-- exit when Version_String (NUL_Pos) = ASCII.NUL;
--
-- NUL_Pos := NUL_Pos + 1;
-- end loop;
--
-- return Version_String (1 .. NUL_Pos - 1);
-+ return Gnat_Static_Version_String;
- end Gnat_Version_String;
-
- end Gnatvsn;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list