sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 5.0.1

Browse source 
PR:		ports/161442
Submitted by:	John Marino <draco@marino.st> (maintainer)
Feature safe:	yes
This commit is contained in:
Frederic Culot 2011-11-15 13:35:48 +00:00
parent 9c4b64a964
commit fe6b01bc3f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=285850
14 changed files with 1105 additions and 664 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
devel/gps/Makefile
View file

@ -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 @@ MASTER_SITES= http://downloads.dragonlace.net/src/ \
MAINTAINER= draco@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
@ -37,10 +36,8 @@ MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
OPTIONS= SYSLOG "Enable system logging" on
OPTIONS+= SQLITE "Enable SQLite database support" off
OPTIONS+= PGSQL "Enable PostgreSQL database support" off
OPTIONS+= PYTHON "Enable Python scripts support" off
OPTIONS+= PYGTK "Enable Python bindings to GTK" off
OPTIONS+= PYTHON "Enable Python console" off
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
.if ${ARCH} == "amd64"
@ -48,7 +45,6 @@ CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif
CONFIGURE_ARGS+= --with-gmp=${PREFIX}
CONFIGURE_ARGS+= --enable-shared-python=yes
##############
## SYSLOG ##
@ -79,28 +75,31 @@ CONFIGURE_ARGS+= --with-postgresql=${PREFIX}
USE_PGSQL= true
.endif
##############
## PYTHON ##
##############
#####################
## PYTHON / PYGTK ##
#####################
.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
CONFIGURE_ARGS+= --enable-shared-python=yes
CONFIGURE_ARGS+= --enable-pygtk
PLIST_SUB+= PYSUPPORT=""
USE_PYTHON= 26 27
BUILD_DEPENDS+= py2[67]-gtk>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
RUN_DEPENDS+= py2[67]-gtk>=2.22:${PORTSDIR}/x11-toolkits/py-gtk2
PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
.else
CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --disable-pygtk
PLIST_SUB+= PYSUPPORT="@comment "
.endif
#############
## PYGTK ##
#############
.include <bsd.port.pre.mk>
.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
.else
CONFIGURE_ARGS+= --disable-pygtk
pre-install:
.if defined(WITH_PYTHON)
${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins
${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library
.endif
.include <bsd.port.post.mk>

4
devel/gps/distinfo
View file

@ -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) = d7228e3fd915e47a4af30d72cc6bba77cd95479f1289b3b525d66aa8d94176a5
SIZE (gps-5.0.1.tar.bz2) = 9303980

105
devel/gps/files/patch-Makefile.in
View file

@ -1,6 +1,39 @@
--- 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-11 17:59:53.000000000 +0200
@@ -11,10 +11,12 @@
prefix = @prefix@
bindir = $(prefix)/bin
sharedir = $(prefix)/share
+docdir = $(prefix)/share/doc/gps
examplesdir = $(prefix)/share/examples/gps
default:
$(MAKE) -C gps $@
+ $(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > share/plug-ins/gnat_switches.py
clean:
$(MAKE) -C gps $@
@@ -24,12 +26,13 @@
(cd scripts; ./testsuites clean)
install-common:
- $(MKDIR) $(bindir)
- $(MKDIR) $(sharedir)
- $(MKDIR) $(examplesdir)
- $(MKDIR) $(sharedir)/gps
- $(MKDIR) $(sharedir)/gps/docgen2
- $(MKDIR) $(sharedir)/gps/aunit
+ $(MKDIR) $(DESTDIR)$(bindir)
+ $(MKDIR) $(DESTDIR)$(sharedir)
+ $(MKDIR) $(DESTDIR)$(docdir)
+ $(MKDIR) $(DESTDIR)$(examplesdir)
+ $(MKDIR) $(DESTDIR)$(sharedir)/gps
+ $(MKDIR) $(DESTDIR)$(sharedir)/gps/docgen2
+ $(MKDIR) $(DESTDIR)$(sharedir)/gps/aunit
ifeq ($(OS),Windows_NT)
# On Windows we distribute two versions of subversion.xml, one that
# supports Cygwin/Subversion and one for native Subversion.
@@ -42,45 +45,40 @@
share/plug-ins/_subversion_ \
> share/plug-ins/subversion_native_windows.xml
endif
@ -11,4 +44,68 @@
- $(RMDIR) $(sharedir)/gps/templates
# 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 -)
- (cd share; tar cf - plug-ins/*.xml) | (cd $(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/*.xml) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
ifeq ($(OS),Windows_NT)
# Clean-up changes made above for Windows.
$(MV) share/plug-ins/_subversion_ share/plug-ins/subversion.xml
$(RM) share/plug-ins/subversion_native_windows.xml
endif
- $(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/plug-ins/gnat_switches.py
- (cd share; tar cf - plug-ins/*.py) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - plug-ins/gps_utils/*.py) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - plug-ins/spark/*.py) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - plug-ins/*.png) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - plug-ins/images/*.png) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - library/*.xml) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - library/*.py) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - library/pygps/*.py) | (cd $(sharedir)/gps; tar xf -)
- $(RM) $(sharedir)/gps/plug-ins/emacs.xml
- (cd share; tar cf - icons/) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - templates/) | (cd $(sharedir)/gps; tar xf -)
- (cd share; tar cf - *.*) | (cd $(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/*.py*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/gps_utils/*.py*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/spark/*.py*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/*.png) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - plug-ins/images/*.png) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - library/*.xml) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - library/*.py*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - library/pygps/*.py*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ $(RM) $(DESTDIR)$(sharedir)/gps/plug-ins/emacs.xml
+ (cd share; tar cf - icons/) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - templates/) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
+ (cd share; tar cf - *.*) | (cd $(DESTDIR)$(sharedir)/gps; tar xf -)
(cd docgen2/resources; tar cf - *.tmpl custom/*.css support/*.css support/*.js support/images/*.png) \
- | (cd $(sharedir)/gps/docgen2; tar xf -)
+ | (cd $(DESTDIR)$(sharedir)/gps/docgen2; tar xf -)
(cd aunit/templates; tar cf - *.tmpl) \
- | (cd $(sharedir)/gps/aunit; tar xf -)
- $(MAKE) -C docs install
- (cd examples; tar cf - --exclude .svn . ) | (cd $(examplesdir); tar xf -)
+ | (cd $(DESTDIR)$(sharedir)/gps/aunit; tar xf -)
+ ${INSTALL} docs/gps-splash.png $(DESTDIR)$(sharedir)/gps
+ (cd docs; tar -cf - html/) | (cd $(DESTDIR)$(docdir); tar xf -)
+ (cd examples; tar cf - --exclude .svn . ) | (cd $(DESTDIR)$(examplesdir); tar xf -)
install: install-common
ifeq ($(OS),Windows_NT)
$(INSTALL_PROGRAM) gps/obj/gps.exe $(bindir)
$(MAKE) -C common/expect install
else
- $(INSTALL_PROGRAM) gps/obj/gps $(bindir)
+ $(INSTALL_PROGRAM) gps/obj/gps $(DESTDIR)$(bindir)
endif
install-strip: install-common
@@ -89,8 +87,8 @@
$(INSTALL_PROGRAM) distrib/gps_run.cmd $(bindir)
$(MAKE) -C common/expect install-strip
else
- $(INSTALL_PROGRAM) -s gps/obj/gps $(bindir)/gps_exe
- $(INSTALL_PROGRAM) distrib/.gps_wrapper $(bindir)/gps
+ $(INSTALL_PROGRAM) -s gps/obj/gps $(DESTDIR)$(bindir)/gps_exe
+ $(INSTALL_PROGRAM) distrib/.gps_wrapper $(DESTDIR)$(bindir)/gps
endif
test: force

14
devel/gps/files/patch-common-tty-terminals.c
View file

@ -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

31
devel/gps/files/patch-gnatlib-gnat_src-gnatvsn.adb
View file

@ -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;

11
devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb Normal file
View file

@ -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);

31
devel/gps/files/patch-gnatlib_aclocal.m4 Normal file
View file

@ -0,0 +1,31 @@
--- gnatlib/aclocal.m4.orig 2010-07-19 10:57:13.000000000 +0200
+++ gnatlib/aclocal.m4 2011-10-11 03:05:28.000000000 +0200
@@ -452,6 +452,18 @@
*-darwin* )
PYTHON_LIBS="-ldl -lm ${PYTHON_LIBS}"
;;
+ *-freebsd* )
+ PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+ ;;
+ *-dragonfly* )
+ PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+ ;;
+ *-netbsd* )
+ PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+ ;;
+ *-openbsd* )
+ PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+ ;;
x86_64-*-* )
PYTHON_LIBS="-Wl,-export-dynamic -lm -ldl ${PYTHON_LIBS}"
;;
@@ -460,9 +472,6 @@
;;
i[[3456]]86-*win32* | i[[3456]]86-*mingw32* | i[[3456]]86-*cygwin* )
;;
- *-freebsd* )
- PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
- ;;
esac
if test -f ${PYTHON_DIR}/libpython${PYTHON_VERSION}.a ; then

22
devel/gps/files/patch-gnatlib_configure Normal file
View file

@ -0,0 +1,22 @@
--- gnatlib/configure.orig 2010-10-14 12:02:43.000000000 +0200
+++ gnatlib/configure 2011-10-11 03:07:02.000000000 +0200
@@ -3501,6 +3501,9 @@
*-darwin* )
PYTHON_LIBS="-ldl -lm ${PYTHON_LIBS}"
;;
+ *-freebsd* | *-dragonfly* | *-netbsd* | *-openbsd* )
+ PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+ ;;
x86_64-*-* )
PYTHON_LIBS="-Wl,-export-dynamic -lm -ldl ${PYTHON_LIBS}"
;;
@@ -3509,9 +3512,6 @@
;;
i[3456]86-*win32* | i[3456]86-*mingw32* | i[3456]86-*cygwin* )
;;
- *-freebsd* )
- PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
- ;;
esac
if test -f ${PYTHON_DIR}/libpython${PYTHON_VERSION}.a ; then

16
devel/gps/files/patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.adb Normal file
View file

@ -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;

13
devel/gps/files/patch-gnatlib_src_nonpython_gnatcoll-scripts.nopython.ads Normal file
View file

@ -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.

20
devel/gps/files/patch-prj_editor-src-project_properties.adb
View file

@ -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);

11
devel/gps/files/patch-prj_editor-src-project_viewers.adb
View file

@ -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);

11
devel/gps/files/patch-prj_editor-src-project_viewers.ads
View file

@ -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.

1435
devel/gps/pkg-plist
View file

File diff suppressed because it is too large Load diff