Attachment 133649 Details for Bug 178147 – file.diff

[patch] file.diff

file.diff (text/plain), 7.51 KB, created by John Marino on 2013-04-25 15:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2013-04-25 15:50:01 UTC

Size: 7.51 KB

patch

obsolete

>--- devel/gps/Makefile.orig	2013-04-25 15:19:59.000000000 +0200
>+++ devel/gps/Makefile	2013-04-25 16:01:14.000000000 +0200
>@@ -1,48 +1,44 @@
>-# New ports collection makefile for:  gps
>-# Date created:                       12 December 2010
>-# Whom:                               John Marino <draco@marino.st>
>-#
>+# Created by: John Marino <draco@marino.st>
> # $FreeBSD: ports/devel/gps/Makefile,v 1.8 2012/11/17 05:55:46 svnexp Exp $
>-#
> 
> PORTNAME=	gps
> PORTVERSION=	5.0.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
>-MASTER_SITES=	http://downloads.dragonlace.net/src/ \
>-		http://dragonlace.mirrors.ada.cx/src/
>+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>20110325:${PORTSDIR}/lang/gnat-aux \
>-		gtkada<2.24:${PORTSDIR}/x11-toolkits/gtkada \
>+BUILD_DEPENDS=	gtkada<2.24:${PORTSDIR}/x11-toolkits/gtkada \
> 		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
>-		gprbuild-aux>=20101120:${PORTSDIR}/devel/gprbuild-aux
>+		gprbuild>=20120510:${PORTSDIR}/devel/gprbuild
> RUN_DEPENDS=	gtkada<2.24:${PORTSDIR}/x11-toolkits/gtkada
> LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
> 
>-LATEST_LINK=	gps-ide
>+LATEST_LINK=		gps-ide
> 
> GNU_CONFIGURE=		yes
> USE_GMAKE=		yes
> USE_BZIP2=		yes
> USE_PERL5_BUILD=	yes
> ALL_TARGET=		default
>-CC=			gnatgcc
>+USES+=			ada
> 
> CONFIGURE_ENV+=		AWK=/usr/bin/awk
>-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 console" off
>+OPTIONS_DEFINE=		SYSLOG SQLITE PGSQL PYTHON
>+OPTIONS_DEFAULT=	SYSLOG
>+
>+SYSLOG_DESC=		Enable system logging
>+SQLITE_DESC=	 	Enable SQLite database support
>+PGSQL_DESC=		Enable PostgreSQL database support
>+PYTHON_DESC=		Enable Python console
> 
> .include <bsd.port.options.mk>
> 
>-.if ${ARCH} == "amd64"
>-CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
>+.if ${OPSYS} == FreeBSD
>+CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:L}${OSREL}
> .endif
> 
> CONFIGURE_ARGS+=	--with-gmp=${PREFIX}
>@@ -51,7 +47,7 @@
> ##  SYSLOG  ##
> ##############
> 
>-.if defined(WITH_SYSLOG)
>+.if ${PORT_OPTIONS:MSYSLOG}
> CONFIGURE_ARGS+=	--enable-syslog=yes
> .else
> CONFIGURE_ARGS+=	--enable-syslog=no
>@@ -61,7 +57,7 @@
> ##  SQLITE  ##
> ##############
> 
>-.if defined(WITH_SQLITE)
>+.if ${PORT_OPTIONS:MSQLITE}
> CONFIGURE_ARGS+=	--with-sqlite=${PREFIX}
> BUILD_DEPENDS+=		sqlite3>=3:${PORTSDIR}/databases/sqlite3
> RUN_DEPENDS+=		sqlite3>=3:${PORTSDIR}/databases/sqlite3
>@@ -71,7 +67,7 @@
> ##  POSTGRESQL  ##
> ##################
> 
>-.if defined(WITH_PGSQL)
>+.if ${PORT_OPTIONS:MPGSQL}
> CONFIGURE_ARGS+=	--with-postgresql=${PREFIX}
> USE_PGSQL=		true
> .endif
>@@ -80,12 +76,12 @@
> ##  PYTHON / PYGTK ##
> #####################
> 
>-.if defined(WITH_PYTHON)
>+.if ${PORT_OPTIONS:MPYTHON}
> CONFIGURE_ARGS+=	--with-python=${PREFIX}
> CONFIGURE_ARGS+=	--enable-shared-python=yes
> CONFIGURE_ARGS+=	--enable-pygtk
> PLIST_SUB+=		PYSUPPORT=""
>-USE_PYTHON=		2.6-2.7
>+USE_PYTHON=		-2.7
> 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
>@@ -95,12 +91,10 @@
> PLIST_SUB+=		PYSUPPORT="@comment "
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> pre-install:
>-.if defined(WITH_PYTHON)
>+.if ${PORT_OPTIONS:MPYTHON}
> 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins
> 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>--- devel/gps/files/patch-ada__module_core_src_ada__semantic__tree-generics.adb.orig	2013-04-25 15:44:29.000000000 +0200
>+++ devel/gps/files/patch-ada__module_core_src_ada__semantic__tree-generics.adb	2013-04-25 15:41:58.000000000 +0200
>@@ -0,0 +1,24 @@
>+$NetBSD: patch-ada__module_core_src_ada__semantic__tree-generics.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
>+
>+--- ada_module/core/src/ada_semantic_tree-generics.adb.orig	2010-09-17 09:28:03.000000000 +0000
>++++ ada_module/core/src/ada_semantic_tree-generics.adb
>+@@ -389,14 +389,12 @@ package body Ada_Semantic_Tree.Generics
>+       Cached : Cache_Access := Get_Cache (Info);
>+    begin
>+       if Cached /= null then
>+-         Result := new Declaration_View_Record'
>+-           (Entity          =>
>+-              To_Entity_Access
>+-                (Instanciated_Package (Cached.all).Generic_Package),
>+-            Generic_Context =>
>++         Result := new Declaration_View_Record;
>++         Declaration_View_Record (Result.all).Generic_Context :=
>+               To_Active
>+-                (Instanciated_Package (Cached.all).Generic_Context),
>+-            others => <>);
>++                (Instanciated_Package (Cached.all).Generic_Context);
>++         Result.Entity := To_Entity_Access
>++           (Instanciated_Package (Cached.all).Generic_Package);
>+ 
>+          Ref (Declaration_View_Record (Result.all).Generic_Context);
>+ 
>--- devel/gps/files/patch-refactoring_core_src_refactoring-services.adb.orig	2013-04-25 15:44:20.000000000 +0200
>+++ devel/gps/files/patch-refactoring_core_src_refactoring-services.adb	2013-04-25 15:42:53.000000000 +0200
>@@ -0,0 +1,12 @@
>+$NetBSD: patch-refactoring_core_src_refactoring-services.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
>+
>+--- refactoring/core/src/refactoring-services.adb.orig	2010-10-01 14:01:51.000000000 +0000
>++++ refactoring/core/src/refactoring-services.adb
>+@@ -1318,6 +1318,7 @@ package body Refactoring.Services is
>+       Direction : Integer := 1) return Editor_Location'Class
>+    is
>+       Loc : Editor_Location'Class := From;
>++      pragma Unreferenced (Direction);
>+       Seen_Comment : Boolean := False;
>+    begin
>+       loop
>--- devel/gps/files/patch-toolchains_editor_core_src_toolchains-parsers.ads.orig	2013-04-25 15:44:02.000000000 +0200
>+++ devel/gps/files/patch-toolchains_editor_core_src_toolchains-parsers.ads	2013-04-25 15:43:19.000000000 +0200
>@@ -0,0 +1,22 @@
>+$NetBSD: patch-toolchains_editor_core_src_toolchains-parsers.ads,v 1.1 2012/07/08 20:23:50 marino Exp $
>+
>+--- toolchains_editor/core/src/toolchains-parsers.ads.orig	2010-09-21 08:15:41.000000000 +0000
>++++ toolchains_editor/core/src/toolchains-parsers.ads
>+@@ -73,7 +73,7 @@ package Toolchains.Parsers is
>+    type Parsed_Project_Record is private;
>+    type Parsed_Project is access all Parsed_Project_Record;
>+ 
>+-   type Project_Parser_Record is private;
>++   type Project_Parser_Record is limited private;
>+    type Project_Parser is access all Project_Parser_Record;
>+ 
>+    --------------------
>+@@ -184,7 +184,7 @@ private
>+    package Parsed_Projects_Maps is new Ada.Containers.Ordered_Maps
>+      (Project_Node_Id, Parsed_Project);
>+ 
>+-   type Project_Parser_Record is record
>++   type Project_Parser_Record is limited record
>+       Manager                : Toolchain_Manager;
>+ 
>+       Tree_Data              : Project_Tree_Ref;
>--- devel/gps/files/patch-prj_editor_src_gpr__creation.adb.orig	2013-04-25 15:44:24.000000000 +0200
>+++ devel/gps/files/patch-prj_editor_src_gpr__creation.adb	2013-04-25 15:42:28.000000000 +0200
>@@ -0,0 +1,12 @@
>+$NetBSD: patch-prj_editor_src_gpr__creation.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
>+
>+--- prj_editor/src/gpr_creation.adb.orig	2010-03-30 08:12:23.000000000 +0000
>++++ prj_editor/src/gpr_creation.adb
>+@@ -571,6 +571,7 @@ package body GPR_Creation is
>+       Current_Project : Integer;
>+       All_Source_Dirs : Boolean := False)
>+    is
>++      pragma Unreferenced (Root_Project);
>+       Current_Dir : Natural;
>+       Tmp         : Import_Project_Error;
>+    begin

Actions: View | Diff

Attachments on bug 178147: 133649