Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jun 2015 22:20:35 +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: r390464 - in head: Mk/Uses devel/gnatcoll devel/gnatcoll/files devel/gps devel/gps/files lang/asis lang/asis/files lang/gnat_util www/aws www/aws-demos www/aws/files x11-toolkits/gtkada...
Message-ID:  <201506232220.t5NMKZUH007211@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue Jun 23 22:20:35 2015
New Revision: 390464
URL: https://svnweb.freebsd.org/changeset/ports/390464

Log:
  Ada Framework: Switch to gcc5-aux, upgrade 6 packages at once
  
  The transition from gcc-aux to gcc5-aux in the Ada framework has been
  blocked by the inability to build gtkada3 and, once resolved, GPS (due
  to tight locking with compiler).
  
  A few days ago, Adacore made their annual release of their main libre
  products, include GPS.  However, some products were tightly coupled with
  the recent compilers, so in order to upgrade, the compiler had to be
  switched and dependencies require many ports to be upgraded at once:
  
    * lang/asis
    * devel/gnatcoll
    * devel/gps
    * x11-toolkits/gtkada3
    * www/aws
    * www/aws-demos
  
  While the version upgrades were modest in most cases (gps, gtkada3), the
  amount of work put into each port was significant.  There are too many
  improvements to mention here.  A few include the removal of dynamic
  package lists and incorporating gnatcoll into gps to avoid building it
  twice.  A private "exp-run" was done all on all 50+ Ada ports to ensure
  they still build.
  
  Also, a new argument was added to Uses/ada.mk, "run", that pulls in the
  GNAT compiler as a run depends.  This was necessary for GPS that will
  not launch correctly without the compiler in place.

Added:
  head/devel/gnatcoll/files/patch-configure   (contents, props changed)
  head/devel/gps/files/patch-common_core_src_os-utils.c   (contents, props changed)
  head/devel/gps/files/patch-gps_Makefile   (contents, props changed)
  head/devel/gps/files/patch-shared.gpr   (contents, props changed)
  head/devel/gps/pkg-plist   (contents, props changed)
  head/lang/asis/files/asis.gpr   (contents, props changed)
  head/lang/asis/pkg-plist   (contents, props changed)
  head/www/aws/files/patch-Makefile   (contents, props changed)
  head/www/aws/files/patch-gps_Makefile   (contents, props changed)
  head/www/aws/files/patch-src_extended_aws-services-web__block-context.ads   (contents, props changed)
  head/x11-toolkits/gtkada3/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/devel/gps/files/patch-browsers_src_browsers-scripts.adb
  head/devel/gps/files/patch-common_tty_terminals.c
  head/devel/gps/files/patch-gnatlib_src_gnatcoll__iconv.gpr
  head/devel/gps/files/patch-gnatlib_src_gnatcoll__readline.gpr.in
  head/devel/gps/files/patch-gnatlib_src_iconv_with__iconv_iconv__support.c
  head/lang/asis/files/patch-no-OpenVMS.diff
  head/www/aws/files/patch-gps_makefile
  head/www/aws/files/patch-makefile
  head/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb
  head/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads
Modified:
  head/Mk/Uses/ada.mk
  head/devel/gnatcoll/Makefile
  head/devel/gnatcoll/distinfo
  head/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr
  head/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in
  head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
  head/devel/gnatcoll/pkg-plist
  head/devel/gps/Makefile
  head/devel/gps/distinfo
  head/devel/gps/files/patch-Makefile.in
  head/devel/gps/files/patch-docs_Makefile.in
  head/devel/gps/files/patch-widgets_widgets.gpr
  head/lang/asis/Makefile
  head/lang/asis/distinfo
  head/lang/asis/files/patch-Makefile.stub
  head/lang/asis/files/patch-asis_a4g-gnat__int.adb
  head/lang/gnat_util/Makefile
  head/www/aws-demos/Makefile
  head/www/aws/Makefile
  head/www/aws/distinfo
  head/www/aws/files/patch-aws.gpr
  head/www/aws/files/patch-include_include.gpr
  head/www/aws/files/patch-regtests_0043__check__mem_test.opt
  head/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt
  head/www/aws/files/patch-src_core_aws-net.adb
  head/www/aws/files/patch-src_src.gpr
  head/www/aws/files/patch-ssl__crypto_lib.gpr
  head/www/aws/files/patch-tools_tools.gpr
  head/www/aws/pkg-plist
  head/x11-toolkits/gtkada3/Makefile
  head/x11-toolkits/gtkada3/distinfo
  head/x11-toolkits/gtkada3/files/patch-configure
  head/x11-toolkits/gtkada3/files/patch-docs_Makefile.in
  head/x11-toolkits/gtkada3/pkg-plist

Modified: head/Mk/Uses/ada.mk
==============================================================================
--- head/Mk/Uses/ada.mk	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/Mk/Uses/ada.mk	Tue Jun 23 22:20:35 2015	(r390464)
@@ -6,7 +6,7 @@
 #
 # Feature:      ada
 # Usage:        USES=ada
-# Valid ARGS:   49, 5
+# Valid ARGS:   49, 5, run
 #
 # MAINTAINER: marino@FreeBSD.org
 
@@ -20,13 +20,17 @@ ADAXX=	gcc
 . elif ${ada_ARGS:M5}
 ADAXX=	gcc5
 . else
-.  if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 5
-ADAXX=	gcc5
-.  else
+.  if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 49
 ADAXX=	gcc
+.  else
+ADAXX=	gcc5
 .  endif
 . endif
 
+. if ${ada_ARGS:Mrun}
+RUN_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
+. endif
+
 BUILD_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat

Modified: head/devel/gnatcoll/Makefile
==============================================================================
--- head/devel/gnatcoll/Makefile	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/Makefile	Tue Jun 23 22:20:35 2015	(r390464)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnatcoll
-PORTVERSION=	2014
-PORTREVISION=	4
+PORTVERSION=	2015
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-gpl-${PORTVERSION}-src
@@ -15,32 +14,34 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
 		gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 \
+		libgmp.so:${PORTSDIR}/math/gmp
 
-USES=		ada gmake
+USES=		ada gmake pkgconfig python
+USE_GNOME=	pygobject3
+PYCOMPILE=	${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-lm
 PORTDOCS=	html gnatcoll.pdf
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV \
-			DOCS EXAMPLES
-OPTIONS_DEFAULT=	READLINE SYSLOG SQLITE PYTHON GTK PGSQL
+MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
+		Gnatcoll_Build=Production
+
+OPTIONS_DEFINE=		READLINE SYSLOG PGSQL ICONV DOCS EXAMPLES
+OPTIONS_DEFAULT=	READLINE SYSLOG
 OPTIONS_SUB=		yes
 DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-GTK_LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
-SYSLOG_CONFIGURE_ENABLE=syslog
-
-GTK_DESC=		GTK3 toolkit support
+SYSLOG_CONFIGURE_ENABLE=	syslog
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ARGS=		--with-gmp=${PREFIX} \
+			--with-sqlite=embedded \
+			--with-python=${PREFIX} \
+			--with-gtk=3.0 \
+			--enable-pygobject \
 			--disable-shared \
 			--disable-pygtk
 
-MAKE_ARGS+=		PROCESSORS=${MAKE_JOBS_NUMBER}
-MAKE_ARGS+=		Gnatcoll_Build=Production
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
@@ -50,12 +51,6 @@ CONFIGURE_ARGS+=	--enable-gpl
 CONFIGURE_ARGS+=	--disable-readline
 .endif
 
-.if ${PORT_OPTIONS:MSQLITE}
-CONFIGURE_ARGS+=	--with-sqlite=embedded
-.else
-CONFIGURE_ARGS+=	--without-sqlite
-.endif
-
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=			pgsql
 CONFIGURE_ARGS+=	--with-postgresql=${PREFIX}
@@ -72,24 +67,6 @@ CONFIGURE_ARGS+=	--with-iconv=${ICONV_PR
 CONFIGURE_ARGS+=	--without-iconv
 .endif
 
-.if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=	--with-python=${PREFIX} \
-			--enable-pygobject
-USES+=			python
-USE_GNOME=		pygobject3
-PYCOMPILE=		${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
-.else
-CONFIGURE_ARGS+=	--without-python \
-			--disable-pygobject
-.endif
-
-.if ${PORT_OPTIONS:MGTK}
-USES+=			pkgconfig
-CONFIGURE_ARGS+=	--with-gtk=3.0
-.else
-CONFIGURE_ARGS+=	--without-gtk
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|@PREFIX@|${PREFIX}|g" \
 	    ${WRKSRC}/src/gnatcoll_readline.gpr.in
@@ -102,14 +79,11 @@ do-build:
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
-	${RM} -rf ${STAGEDIR}${DOCSDIR}/html/_sources
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/gps
+	${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources
+	${RM} -r ${STAGEDIR}${PREFIX}/share/gps
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/library
 .if ! ${PORT_OPTIONS:MEXAMPLES}
-	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MSQLITE}
-	# Rename gnatinspect to gnatinspect-xref to avoid GPS conflict
-	cd ${STAGEDIR}${PREFIX}/bin && ${MV} gnatinspect gnatinspect-xref
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/gnatcoll/distinfo
==============================================================================
--- head/devel/gnatcoll/distinfo	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/distinfo	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,2 +1,2 @@
-SHA256 (gnatcoll-gpl-2014-src.tar.gz) = 3a631c2d6b7569ac6821c91d276c93a09ceaf1caf9441ffca4cbe162b7b533e6
-SIZE (gnatcoll-gpl-2014-src.tar.gz) = 5398895
+SHA256 (gnatcoll-gpl-2015-src.tar.gz) = ed27220497db6e4a540549e739323337427c069e7a1078cb06d0df52001f5b36
+SIZE (gnatcoll-gpl-2015-src.tar.gz) = 5337526

Added: head/devel/gnatcoll/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gnatcoll/files/patch-configure	Tue Jun 23 22:20:35 2015	(r390464)
@@ -0,0 +1,11 @@
+--- configure.orig	2015-04-30 10:51:26 UTC
++++ configure
+@@ -3911,7 +3911,7 @@ $as_echo_n "checking if we can link with
+             ia64-*hp-hpux11* )
+                PYTHON_LIBS="-ldld -ldl -lm -Wl,-E ${PYTHON_LIBS}"
+                ;;
+-            *-freebsd* )
++            *-freebsd* | *-dragonfly* )
+                PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}"
+                ;;
+          esac

Modified: head/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr
==============================================================================
--- head/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,4 +1,4 @@
---- src/gnatcoll_iconv.gpr.orig	2014-04-10 13:47:58.000000000 +0000
+--- src/gnatcoll_iconv.gpr.orig	2015-04-30 10:51:45 UTC
 +++ src/gnatcoll_iconv.gpr
 @@ -27,7 +27,8 @@ project GnatColl_Iconv is
     package Compiler is

Modified: head/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in
==============================================================================
--- head/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,4 +1,4 @@
---- src/gnatcoll_readline.gpr.in.orig	2014-04-10 13:47:58.000000000 +0000
+--- src/gnatcoll_readline.gpr.in.orig	2015-04-30 10:51:45 UTC
 +++ src/gnatcoll_readline.gpr.in
 @@ -6,7 +6,7 @@ project GnatColl_Readline is
        when "yes" =>

Modified: head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
==============================================================================
--- head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,11 +1,20 @@
---- src/iconv/with_iconv/iconv_support.c.orig	2013-08-21 12:16:12.000000000 +0000
+--- src/iconv/with_iconv/iconv_support.c.orig	2015-04-30 10:51:47 UTC
 +++ src/iconv/with_iconv/iconv_support.c
-@@ -25,7 +25,7 @@ int gnatcoll_iconv_close(iconv_t cd) {
+@@ -6,6 +6,7 @@
+ #include <iconv.h>
+ #include <errno.h>
+ #include <locale.h>
++#include <sys/param.h>
+ 
+ const int gnatcoll_errno_einval = EINVAL;
+ const int gnatcoll_errno_e2big  = E2BIG;
+@@ -25,7 +26,8 @@ int gnatcoll_iconv_close(iconv_t cd) {
     return iconv_close (cd);
  }
  
 -#if _LIBICONV_VERSION >= 0x010D
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
++#if defined (__DragonFly__) || \
++   (defined (__FreeBSD__) && __FreeBSD_version < 1001514)
  size_t gnatcoll_iconv
     (iconv_t cd,  const char** inbuf, size_t *inbytesleft, char** outbuf,
      size_t *outbytesleft)

Modified: head/devel/gnatcoll/pkg-plist
==============================================================================
--- head/devel/gnatcoll/pkg-plist	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gnatcoll/pkg-plist	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,11 +1,13 @@
 bin/gnatcoll_db2ada
-%%SQLITE%%bin/gnatinspect-xref
-%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.adb
-%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.ads
+bin/gnatinspect
+include/gnatcoll/gnatcoll-any_types-python.adb
+include/gnatcoll/gnatcoll-any_types-python.ads
 include/gnatcoll/gnatcoll-any_types.adb
 include/gnatcoll/gnatcoll-any_types.ads
 include/gnatcoll/gnatcoll-arg_lists.adb
 include/gnatcoll/gnatcoll-arg_lists.ads
+include/gnatcoll/gnatcoll-atomic.adb
+include/gnatcoll/gnatcoll-atomic.ads
 include/gnatcoll/gnatcoll-boyer_moore.adb
 include/gnatcoll/gnatcoll-boyer_moore.ads
 include/gnatcoll/gnatcoll-config.adb
@@ -102,7 +104,6 @@ include/gnatcoll/gnatcoll-ravenscar-util
 include/gnatcoll/gnatcoll-ravenscar.ads
 include/gnatcoll/gnatcoll-readline.adb
 include/gnatcoll/gnatcoll-readline.ads
-include/gnatcoll/gnatcoll-refcount-sync_counters.adb
 include/gnatcoll/gnatcoll-refcount-weakref.adb
 include/gnatcoll/gnatcoll-refcount-weakref.ads
 include/gnatcoll/gnatcoll-refcount.adb
@@ -110,12 +111,16 @@ include/gnatcoll/gnatcoll-refcount.ads
 include/gnatcoll/gnatcoll-remote-db.adb
 include/gnatcoll/gnatcoll-remote-db.ads
 include/gnatcoll/gnatcoll-remote.ads
-%%GTK%%include/gnatcoll/gnatcoll-scripts-gtkada.adb
-%%GTK%%include/gnatcoll/gnatcoll-scripts-gtkada.ads
+include/gnatcoll/gnatcoll-scripts-files.adb
+include/gnatcoll/gnatcoll-scripts-files.ads
+include/gnatcoll/gnatcoll-scripts-gtkada.adb
+include/gnatcoll/gnatcoll-scripts-gtkada.ads
 include/gnatcoll/gnatcoll-scripts-impl.adb
 include/gnatcoll/gnatcoll-scripts-impl.ads
-%%GTK%%include/gnatcoll/gnatcoll-scripts-python-gtkada.adb
-%%GTK%%include/gnatcoll/gnatcoll-scripts-python-gtkada.ads
+include/gnatcoll/gnatcoll-scripts-python-gtkada.adb
+include/gnatcoll/gnatcoll-scripts-python-gtkada.ads
+include/gnatcoll/gnatcoll-scripts-projects.adb
+include/gnatcoll/gnatcoll-scripts-projects.ads
 include/gnatcoll/gnatcoll-scripts-python.adb
 include/gnatcoll/gnatcoll-scripts-python.ads
 include/gnatcoll/gnatcoll-scripts-shell.adb
@@ -146,8 +151,8 @@ include/gnatcoll/gnatcoll-sql-sessions.a
 include/gnatcoll/gnatcoll-sql-sessions.ads
 include/gnatcoll/gnatcoll-sql-sqlite-builder.adb
 include/gnatcoll/gnatcoll-sql-sqlite-builder.ads
-%%SQLITE%%include/gnatcoll/gnatcoll-sql-sqlite-gnade.adb
-%%SQLITE%%include/gnatcoll/gnatcoll-sql-sqlite-gnade.ads
+include/gnatcoll/gnatcoll-sql-sqlite-gnade.adb
+include/gnatcoll/gnatcoll-sql-sqlite-gnade.ads
 include/gnatcoll/gnatcoll-sql-sqlite.adb
 include/gnatcoll/gnatcoll-sql-sqlite.ads
 include/gnatcoll/gnatcoll-sql.adb
@@ -171,8 +176,8 @@ include/gnatcoll/gnatcoll-tribooleans.ad
 include/gnatcoll/gnatcoll-tribooleans.ads
 include/gnatcoll/gnatcoll-utils.adb
 include/gnatcoll/gnatcoll-utils.ads
-%%GTK%%include/gnatcoll/gnatcoll-vfs-gtkada.adb
-%%GTK%%include/gnatcoll/gnatcoll-vfs-gtkada.ads
+include/gnatcoll/gnatcoll-vfs-gtkada.adb
+include/gnatcoll/gnatcoll-vfs-gtkada.ads
 include/gnatcoll/gnatcoll-vfs.adb
 include/gnatcoll/gnatcoll-vfs.ads
 include/gnatcoll/gnatcoll-vfs_types.ads
@@ -184,7 +189,7 @@ include/gnatcoll/gnatcoll.ads
 lib/gnat/gnatcoll.gpr
 lib/gnat/gnatcoll/gnatcoll.lgpr
 lib/gnat/gnatcoll/gnatcoll_gmp.lgpr
-%%GTK%%lib/gnat/gnatcoll/gnatcoll_gtk.lgpr
+lib/gnat/gnatcoll/gnatcoll_gtk.lgpr
 lib/gnat/gnatcoll/gnatcoll_iconv.lgpr
 lib/gnat/gnatcoll/gnatcoll_postgres.lgpr
 lib/gnat/gnatcoll/gnatcoll_python.lgpr
@@ -197,9 +202,10 @@ lib/gnat/gnatcoll_postgres.gpr
 lib/gnat/gnatcoll_python.gpr
 lib/gnat/gnatcoll_readline.gpr
 lib/gnat/gnatcoll_sqlite.gpr
-%%PYTHON%%lib/gnatcoll/static/gnatcoll-any_types-python.ali
+lib/gnatcoll/static/gnatcoll-any_types-python.ali
 lib/gnatcoll/static/gnatcoll-any_types.ali
 lib/gnatcoll/static/gnatcoll-arg_lists.ali
+lib/gnatcoll/static/gnatcoll-atomic.ali
 lib/gnatcoll/static/gnatcoll-boyer_moore.ali
 lib/gnatcoll/static/gnatcoll-config.ali
 lib/gnatcoll/static/gnatcoll-email-mailboxes.ali
@@ -252,9 +258,11 @@ lib/gnatcoll/static/gnatcoll-refcount-we
 lib/gnatcoll/static/gnatcoll-refcount.ali
 lib/gnatcoll/static/gnatcoll-remote-db.ali
 lib/gnatcoll/static/gnatcoll-remote.ali
-%%GTK%%lib/gnatcoll/static/gnatcoll-scripts-gtkada.ali
+lib/gnatcoll/static/gnatcoll-scripts-files.ali
+lib/gnatcoll/static/gnatcoll-scripts-gtkada.ali
 lib/gnatcoll/static/gnatcoll-scripts-impl.ali
-%%GTK%%lib/gnatcoll/static/gnatcoll-scripts-python-gtkada.ali
+lib/gnatcoll/static/gnatcoll-scripts-python-gtkada.ali
+lib/gnatcoll/static/gnatcoll-scripts-projects.ali
 lib/gnatcoll/static/gnatcoll-scripts-python.ali
 lib/gnatcoll/static/gnatcoll-scripts-shell.ali
 lib/gnatcoll/static/gnatcoll-scripts-utils.ali
@@ -270,7 +278,7 @@ lib/gnatcoll/static/gnatcoll-sql-postgre
 lib/gnatcoll/static/gnatcoll-sql-postgres.ali
 lib/gnatcoll/static/gnatcoll-sql-sessions.ali
 lib/gnatcoll/static/gnatcoll-sql-sqlite-builder.ali
-%%SQLITE%%lib/gnatcoll/static/gnatcoll-sql-sqlite-gnade.ali
+lib/gnatcoll/static/gnatcoll-sql-sqlite-gnade.ali
 lib/gnatcoll/static/gnatcoll-sql-sqlite.ali
 lib/gnatcoll/static/gnatcoll-sql.ali
 lib/gnatcoll/static/gnatcoll-sql_impl.ali
@@ -283,7 +291,7 @@ lib/gnatcoll/static/gnatcoll-traces-sysl
 lib/gnatcoll/static/gnatcoll-traces.ali
 lib/gnatcoll/static/gnatcoll-tribooleans.ali
 lib/gnatcoll/static/gnatcoll-utils.ali
-%%GTK%%lib/gnatcoll/static/gnatcoll-vfs-gtkada.ali
+lib/gnatcoll/static/gnatcoll-vfs-gtkada.ali
 lib/gnatcoll/static/gnatcoll-vfs.ali
 lib/gnatcoll/static/gnatcoll-vfs_types.ali
 lib/gnatcoll/static/gnatcoll-vfs_utils.ali
@@ -293,7 +301,7 @@ lib/gnatcoll/static/gnatcoll-xref.ali
 lib/gnatcoll/static/gnatcoll.ali
 lib/gnatcoll/static/libgnatcoll.a
 lib/gnatcoll/static/libgnatcoll_gmp.a
-%%GTK%%lib/gnatcoll/static/libgnatcoll_gtk.a
+lib/gnatcoll/static/libgnatcoll_gtk.a
 lib/gnatcoll/static/libgnatcoll_iconv.a
 lib/gnatcoll/static/libgnatcoll_postgres.a
 lib/gnatcoll/static/libgnatcoll_python.a

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gps/Makefile	Tue Jun 23 22:20:35 2015	(r390464)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gps
-PORTVERSION=	6.1.0.0
-PORTREVISION=	4
+PORTVERSION=	6.1.1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
+DISTNAME=	gps-6.1.1-src
 PKGNAMESUFFIX=	-ide
 
 MAINTAINER=	marino@FreeBSD.org
@@ -16,22 +16,26 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	gprbuild>=20140417:${PORTSDIR}/devel/gprbuild \
 		gnat_util>=20140422_2:${PORTSDIR}/lang/gnat_util \
 		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
+		gnatcoll>=2015:${PORTSDIR}/devel/gnatcoll \
 		templates_parser>11:${PORTSDIR}/textproc/templates_parser
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
-RUN_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2   # See note
-
-GNU_CONFIGURE=		yes
-USES=			ada gmake perl5 pkgconfig python tar:bzip2
-USE_PERL5=		build
-USE_GNOME=		glib20
-USE_GNOME=		pygobject3
-PYCOMPILE=		${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
-AWKREVDATE=		'/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
-GPSVER=			GPS_VERSION=${PORTVERSION}
-ALL_TARGET=		default
-NO_MTREE=		yes
-SUB_FILES=		gps
+LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
+RUN_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
+		gnatinspect::${PORTSDIR}/devel/gnatcoll \
+		gdb${PORTGDB}:${PORTSDIR}/devel/gdb \
+		${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}jedi>0:${PORTSDIR}/devel/py-jedi
+
+GNU_CONFIGURE=	yes
+USES=		ada:run gmake perl5 pkgconfig python
+USE_PERL5=	build
+USE_GNOME=	glib20 pygobject3
+PYCOMPILE=	${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
+AWKREVDATE=	'/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
+GPSVER=		GPS_VERSION=${PORTVERSION}
+ALL_TARGET=	default
+NO_MTREE=	yes
+SUB_FILES=	gps
+PORTGDB=	791
 
 # note: librsvg2 is needed to display the svg icons in the menu.  Actually
 # needed is lib/gdk-pixbuf-2.0/%%GTK2_VER%%/loaders/libpixbufloader-svg.so ,
@@ -39,23 +43,17 @@ SUB_FILES=		gps
 # we just request the sole binary to pull in the package which effectively
 # accomplishes what is desired.
 
-OPTIONS_DEFINE=		READLINE SYSLOG PGSQL DEBUG DOCS EXAMPLES
-OPTIONS_DEFAULT=	READLINE SYSLOG
+OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
 OPTIONS_SUB=		yes
 DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-SYSLOG_CONFIGURE_ENABLE=syslog
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
-CONFIGURE_ARGS=		--with-gmp=${PREFIX} \
-			--with-gtk=3.0 \
-			--with-sqlite=embedded \
-			--with-python=${PREFIX} \
-			--enable-pygobject \
-			--disable-shared \
-			--disable-pygtk
+CONFIGURE_ARGS=		--with-gtk=3.0
 MAKE_ARGS+=		PROCESSORS=${MAKE_JOBS_NUMBER}
 MAKE_ARGS+=		PYTHON_CMD=${PYTHON_CMD}
+PORTDOCS=		html pdf
+PORTEXAMPLES=		demo python remote tutorial xml
 
 .include <bsd.port.options.mk>
 
@@ -67,29 +65,6 @@ MAKE_ARGS+=		Build=Debug
 MAKE_ARGS+=		Build=Production
 .endif
 
-.if ${PORT_OPTIONS:MREADLINE}
-USES+=			readline:port
-CONFIGURE_ARGS+=	--enable-gpl
-.else
-CONFIGURE_ARGS+=	--disable-readline
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=			pgsql
-CONFIGURE_ARGS+=	--with-postgresql=${PREFIX}
-.else
-CONFIGURE_ARGS+=	--without-postgresql
-.endif
-
-# Iconv option crashes GPS almost immediately.
-# GNATColl needs to be examined before attempting to support Iconv again
-.if 0 #${PORT_OPTIONS:  MICONV}
-USES+=			iconv
-CONFIGURE_ARGS+=	--with-iconv=${ICONV_PREFIX}
-.else
-CONFIGURE_ARGS+=	--without-iconv
-.endif
-
 post-extract:
 	@${MV} ${WRKSRC}/templates_parser ${WRKSRC}/TP.ignore
 	@${MV} ${WRKSRC}/Makefile.gnat ${WRKSRC}/Makefile.gnat.ignore
@@ -97,31 +72,34 @@ post-extract:
 post-patch:
 	@${ECHO} "GNAT_SOURCES=" > ${WRKSRC}/Makefile.gnat
 	@${REINPLACE_CMD} -e 's/^with .*templates_parser\//with "/g' \
-		${WRKSRC}/docgen2/docgen2.gpr \
 		${WRKSRC}/gnatdoc/gnatdoc.gpr \
 		${WRKSRC}/vcs/vcs.gpr
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
-		${WRKSRC}/gnatlib/src/gnatcoll_readline.gpr.in \
 		${WRKSRC}/widgets/widgets.gpr
-	@${REINPLACE_CMD} -e 's| gnat/sdefault/sdefault.adb | |' \
-		-e 's;freebsd;freebsd*|*-dragonfly;g' \
-		${WRKSRC}/gnatlib/configure \
-		${WRKSRC}/gnatlib/configure.in
-	@${REINPLACE_CMD} -e 's|gnatlib/gnat_src|distrib|' \
-		${WRKSRC}/distrib/from_impunit.pl
+	#@${REINPLACE_CMD} -e 's|gnatlib/gnat_src|distrib|' \
+	#	${WRKSRC}/distrib/from_impunit.pl
 	@${REINPLACE_CMD} -e 's|, "-fdump-xref"||g' \
-		${WRKSRC}/gnatlib/gnatcoll_shared.gpr.in \
 		${WRKSRC}/shared.gpr
-	@${REINPLACE_CMD} -e "s|GPS_VERSION=.*|${GPSVER}|" \
-		${WRKSRC}/configure
-	@${AWK} ${AWKREVDATE} ${WRKSRC}/REVISION | ${XARGS} -I sub \
-		${SED} -i.bak -e sub ${WRKSRC}/common/core/src/config.ads.in
+	#@${REINPLACE_CMD} -e "s|GPS_VERSION=.*|${GPSVER}|" \
+	#	${WRKSRC}/configure
+	#@${AWK} ${AWKREVDATE} ${WRKSRC}/REVISION | ${XARGS} -I sub \
+	#	${SED} -i.bak -e sub ${WRKSRC}/common/core/src/config.ads.in
 	@${SED} -i '' -e \
 		's|= "gnat"|= "${LOCALBASE}/${ADAXX}-aux/bin/gnat"|' \
 		${WRKSRC}/share/support/core/gps_utils/gnat_rules.py
-	@${REINPLACE_CMD} -e \
-		's|@UTILSHARE@|${LOCALBASE}/share/gnat_util|' \
-		${WRKSRC}/Makefile.in
+	#@${REINPLACE_CMD} -e 's|@UTILSHARE@|${LOCALBASE}/share/gnat_util|' \
+	#	${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/gnatcoll_tools/d' ${WRKSRC}/gps/gps.gpr
+	@${REINPLACE_CMD} -e 's|../gnatlib/src/||' \
+		${WRKSRC}/common/comm* \
+		${WRKSRC}/spark/spark.gpr \
+		${WRKSRC}/kernel/kern*.gpr \
+		${WRKSRC}/language/language.gpr \
+		${WRKSRC}/vsearch/vsearch.gpr \
+		${WRKSRC}/python/py*.gpr
+	@${REINPLACE_CMD} -e '/Gdb_Command/ s|"gdb"|"gdb${PORTGDB}"|' \
+		${WRKSRC}/gvd/src/debugger-gdb_mi.adb \
+		${WRKSRC}/gvd/src/debugger-gdb.adb
 
 do-build:
 	@${CP} ${PREFIX}/include/gnat_util/impunit.* ${WRKSRC}/distrib
@@ -133,13 +111,10 @@ do-build:
 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library
 
 post-install:
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/users_guide/_sources
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources
 	${INSTALL_SCRIPT} ${WRKDIR}/gps ${STAGEDIR}${PREFIX}/bin
 	echo "This is the GPS GPL Edition for the ${OPSYS} Ports Collection." \
 		> ${STAGEDIR}${PREFIX}/share/gps/about.txt
 	${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
-	@(cd ${STAGEDIR}${PREFIX} ; \
-		${FIND} * \( -type f -or -type l \) | ${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>

Modified: head/devel/gps/distinfo
==============================================================================
--- head/devel/gps/distinfo	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gps/distinfo	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,2 +1,2 @@
-SHA256 (gps-6.1.0.0.tar.bz2) = f930d89a5b69ff8a4562832b5f2902322ad002ef17633556d87f51733ef955c0
-SIZE (gps-6.1.0.0.tar.bz2) = 12034437
+SHA256 (gps-6.1.1-src.tar.gz) = 14ddd84b0e79cc4b426dc314e37e8cf66ea1c48930cdd0c06d171b6094eb325d
+SIZE (gps-6.1.1-src.tar.gz) = 28924922

Modified: head/devel/gps/files/patch-Makefile.in
==============================================================================
--- head/devel/gps/files/patch-Makefile.in	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gps/files/patch-Makefile.in	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2014-05-23 17:24:28 UTC
+--- Makefile.in.orig	2014-11-13 18:15:57 UTC
 +++ Makefile.in
 @@ -3,16 +3,15 @@ MV              = mv
  MKDIR           = mkdir -p
@@ -24,24 +24,28 @@
  
  all default:
  	$(MAKE) -C gps default
-@@ -49,16 +48,6 @@ ifeq ($(OS),Windows_NT)
+@@ -49,20 +48,6 @@ ifeq ($(OS),Windows_NT)
  		share/plug-ins/_subversion_ \
  		> share/plug-ins/subversion_native_windows.py
  endif
 -	$(RM) -f $(sharedir)/gps/GPS_old
 -	$(RM) $(sharedir)/gps/library/*.py
+-	$(RM) $(sharedir)/gps/library/*.pyc
 -	$(RM) $(sharedir)/gps/library/*.xml
 -	$(RM) $(sharedir)/gps/plug-ins/*.py
+-	$(RM) $(sharedir)/gps/plug-ins/*.pyc
 -	$(RM) $(sharedir)/gps/plug-ins/*.xml
 -	$(RM) -r $(sharedir)/gps/plug-ins/spark
 -	$(RM) $(sharedir)/gps/support/core/*.py
+-	$(RM) $(sharedir)/gps/support/core/*.pyc
 -	$(RM) $(sharedir)/gps/support/ui/*.py
+-	$(RM) $(sharedir)/gps/support/ui/*.pyc
 -	${RM} ${sharedir}/gps/perspectives.xml
 -	$(RMDIR) $(sharedir)/gps/templates
  # update runtime.xml before copying the plug-ins files.
- 	(cd distrib; $(PERL) from_impunit.pl)
+ 	cd distrib; $(PERL) from_impunit.pl
  # update light icon set
-@@ -71,12 +60,11 @@ ifeq ($(OS),Windows_NT)
+@@ -75,10 +60,8 @@ ifeq ($(OS),Windows_NT)
  	$(MV) share/plug-ins/_subversion_ share/plug-ins/subversion.py
  	$(RM) share/plug-ins/subversion_native_windows.py
  endif
@@ -50,13 +54,9 @@
  	(cd share; tar cf - library/*.py) | (cd $(sharedir)/gps; tar xf -)
 -	(cd share; tar cf - library/GPS_old/*.py) | (cd $(sharedir)/gps; tar xf -)
  	(cd share; tar cf - support/) | (cd $(sharedir)/gps; tar xf -)
--	$(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/support/core/gnat_switches.py
-+	$(AWK) -f distrib/gnat_switches.awk < @UTILSHARE@/gnat_ugn.texi \
-+		> $(sharedir)/gps/support/core/gnat_switches.py
+ 	-$(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/support/core/gnat_switches.py
  	$(RM) $(sharedir)/gps/plug-ins/emacs.xml
- 	$(RM) $(sharedir)/gps/plug-ins/python_doc.py
- 	$(RM) $(sharedir)/gps/plug-ins/python_doc.pyc
-@@ -103,7 +91,7 @@ ifeq ($(OS),Windows_NT)
+@@ -108,11 +91,10 @@ ifeq ($(OS),Windows_NT)
  	$(INSTALL_PROGRAM) gnatlib/src/obj/gnatinspect.exe $(bindir)
  	$(MAKE) -C common/expect install
  else
@@ -65,3 +65,7 @@
  	$(INSTALL_PROGRAM) cli/obj/gnatdoc $(bindir)
  	$(INSTALL_PROGRAM) cli/obj/gps_cli $(bindir)
  	$(INSTALL_PROGRAM) spark/obj/gnatspark $(bindir)
+-	$(INSTALL_PROGRAM) gnatlib/src/obj/gnatinspect $(bindir)
+ endif
+ 
+ install-strip: install-common

Added: head/devel/gps/files/patch-common_core_src_os-utils.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gps/files/patch-common_core_src_os-utils.c	Tue Jun 23 22:20:35 2015	(r390464)
@@ -0,0 +1,19 @@
+--- common/core/src/os-utils.c.orig	2014-11-13 18:15:57 UTC
++++ common/core/src/os-utils.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <lmcons.h>
+@@ -32,7 +33,7 @@
+ #endif
+ 
+ int
+-__gps_subdirectories_count (name)
++__gps_subdirectories_count (char *name)
+ {
+   struct stat statbuf;
+   int ret;

Modified: head/devel/gps/files/patch-docs_Makefile.in
==============================================================================
--- head/devel/gps/files/patch-docs_Makefile.in	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gps/files/patch-docs_Makefile.in	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,4 +1,4 @@
---- docs/Makefile.in.orig	2014-05-23 09:12:23 UTC
+--- docs/Makefile.in.orig	2014-11-13 18:15:57 UTC
 +++ docs/Makefile.in
 @@ -1,10 +1,9 @@
  prefix = @prefix@

Added: head/devel/gps/files/patch-gps_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gps/files/patch-gps_Makefile	Tue Jun 23 22:20:35 2015	(r390464)
@@ -0,0 +1,22 @@
+--- gps/Makefile.orig	2014-11-13 18:15:57 UTC
++++ gps/Makefile
+@@ -10,9 +10,9 @@ GPRBUILD_FLAGS=
+ Build?=Debug
+ 
+ ifeq ($(Build),Production)
+-  GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Production -XGnatcoll_Build=Production
++  GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Production
+ else
+-  GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Debug -XGnatcoll_Build=Debug
++  GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Debug
+ endif
+ 
+ .PHONY: default resources do_links all clean
+@@ -27,7 +27,6 @@ include ../Makefile.gnat
+ # NOTE: we need to build gnatcoll separately, since we cannot use
+ # gnat.adc (No_Tasking restriction) on all gnatcoll sources.
+ all: resources do_links
+-	$(MAKE) Gnatcoll_Build=${Build} -C ../gnatlib
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -ws -P../spark/spark
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \
+ 	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`

Added: head/devel/gps/files/patch-shared.gpr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gps/files/patch-shared.gpr	Tue Jun 23 22:20:35 2015	(r390464)
@@ -0,0 +1,47 @@
+--- shared.gpr.orig	2015-01-19 12:21:19 UTC
++++ shared.gpr
+@@ -1,4 +1,6 @@
+-with "gnatlib/gnatcoll_shared";
++with "gnatcoll_iconv";
++with "gnatcoll_gtk";
++with "gnatcoll_python";
+ 
+ project Shared is
+ 
+@@ -9,8 +11,7 @@ project Shared is
+    Build : Build_Type := External ("Build", "Production");
+ 
+    for Source_Dirs use ();
+-   for Object_Dir use Gnatcoll_Shared'Object_Dir;
+-   for Library_Dir use Gnatcoll_Shared'Library_Dir;
++   for Object_Dir use "obj";
+ 
+    type VCS_Type is ("Subversion", "Git", "Auto");
+    VCS_Kind : VCS_Type := External ("PRJ_VCS", "Subversion");
+@@ -34,7 +35,7 @@ project Shared is
+                "-gnatwaCJe", "-gnat2012", "-gnateE");
+ 
+             for Default_Switches ("C") use
+-              ("-g", "-O1", "-fdump-xref") & GnatColl_Shared.Gtk_Include;
++              ("-g", "-O1");
+ 
+          when "Production" =>
+             for Default_Switches ("Ada") use
+@@ -42,7 +43,7 @@ project Shared is
+                "-gnatT3", --  Temporary, L403-023.
+                "-gnatws", "-gnat12");
+             for Default_Switches ("C") use
+-              ("-g", "-O2") & GnatColl_Shared.Gtk_Include;
++              ("-g", "-O2");
+       end case;
+    end Compiler;
+ 
+@@ -51,7 +52,7 @@ project Shared is
+    end Binder;
+ 
+    package Linker is
+-      for Default_Switches ("Ada") use Gnatcoll_Shared.System_Linker_Flags;
++      for Default_Switches ("Ada") use ();
+    end Linker;
+ 
+ end Shared;

Modified: head/devel/gps/files/patch-widgets_widgets.gpr
==============================================================================
--- head/devel/gps/files/patch-widgets_widgets.gpr	Tue Jun 23 21:22:08 2015	(r390463)
+++ head/devel/gps/files/patch-widgets_widgets.gpr	Tue Jun 23 22:20:35 2015	(r390464)
@@ -1,4 +1,4 @@
---- widgets/widgets.gpr.orig	2013-03-05 14:31:25.000000000 +0000
+--- widgets/widgets.gpr.orig	2014-11-13 18:15:57 UTC
 +++ widgets/widgets.gpr
 @@ -5,7 +5,10 @@ with "../shared";
  project Widgets is
@@ -8,7 +8,7 @@
 +   for Source_Dirs use ("src", "@PREFIX@/include/gtk-3.0", 
 +      "@PREFIX@/include/glib-2.0", "@PREFIX@/include/pango-1.0", 
 +      "@PREFIX@/include/cairo", "@PREFIX@/include/gdk-pixbuf-2.0",
-+      "@PREFIX@/include/atk-1.0");
++      "@PREFIX@/include/atk-1.0", "@PREFIX@/lib/glib-2.0/include");
     for Object_Dir use Shared'Object_Dir;
  
     package Compiler renames Shared.Compiler;

Added: head/devel/gps/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gps/pkg-plist	Tue Jun 23 22:20:35 2015	(r390464)
@@ -0,0 +1,641 @@
+bin/gnatdoc
+bin/gnatspark
+bin/gps
+bin/gps_cli
+bin/gps_exe
+share/gps/about.txt
+share/gps/activity_log.tmplt
+share/gps/default.gpr
+share/gps/gnatdoc/html/compile.sh
+share/gps/gnatdoc/html/static/blank.html
+share/gps/gnatdoc/html/static/gnatdoc.css
+share/gps/gnatdoc/html/static/gnatdoc.js
+share/gps/gnatdoc/html/static/index.html
+share/gps/gnatdoc/html/static/inheritance_index.html
+share/gps/gnatdoc/html/templates/documentation.html.tmpl
+share/gps/gnatdoc/html/templates/documentation.js.tmpl
+share/gps/gnatdoc/html/templates/documentation_index.js.tmpl
+share/gps/gnatdoc/html/templates/entities_categories_index.js.tmpl
+share/gps/gnatdoc/html/templates/entities_category.html.tmpl
+share/gps/gnatdoc/html/templates/entities_category.js.tmpl
+share/gps/gnatdoc/html/templates/index.js.tmpl
+share/gps/gnatdoc/html/templates/inheritance_index.js.tmpl
+share/gps/gnatdoc/html/templates/source_file.html.tmpl
+share/gps/gnatdoc/html/templates/source_file.js.tmpl
+share/gps/gnatdoc/html/templates/source_file_index.js.tmpl
+share/gps/gnatdoc/simple/entities.tmpl
+share/gps/gnatdoc/simple/files_index.tmpl
+share/gps/gnatdoc/simple/index.tmpl
+share/gps/gnatdoc/simple/prj_index.tmpl
+share/gps/gnatdoc/simple/src.tmpl
+share/gps/gnatdoc/simple/support/Makefile
+share/gps/gnatdoc/simple/support/conf.py
+share/gps/gnatdoc/simple/support/make.bat
+share/gps/gps-Adwaita (Dark).css
+share/gps/gps-Adwaita.css
+share/gps/gps-gtk-win32-xp.css
+share/gps/gps-gtk-win32.css
+share/gps/gps-splash.png
+share/gps/gps.css
+share/gps/icons/dark/16px/box.png
+share/gps/icons/dark/16px/build_main_16.png
+share/gps/icons/dark/16px/cleanup_16.png
+share/gps/icons/dark/16px/clear_entry_16.png
+share/gps/icons/dark/16px/compile_16.png
+share/gps/icons/dark/16px/compute_xref_16.png
+share/gps/icons/dark/16px/custom_build_16.png
+share/gps/icons/dark/16px/debug_break.png
+share/gps/icons/dark/16px/debug_indicator.png
+share/gps/icons/dark/16px/entities/circle.png
+share/gps/icons/dark/16px/entities/circle_p.png
+share/gps/icons/dark/16px/entities/circle_ps.png
+share/gps/icons/dark/16px/entities/circle_s.png
+share/gps/icons/dark/16px/entities/circle_x.png
+share/gps/icons/dark/16px/entities/circle_xs.png
+share/gps/icons/dark/16px/entities/diamond.png
+share/gps/icons/dark/16px/entities/diamond_p.png
+share/gps/icons/dark/16px/entities/diamond_ps.png
+share/gps/icons/dark/16px/entities/diamond_s.png
+share/gps/icons/dark/16px/entities/diamond_x.png
+share/gps/icons/dark/16px/entities/diamond_x_blue.png
+share/gps/icons/dark/16px/entities/diamond_xs.png
+share/gps/icons/dark/16px/entities/dot.png
+share/gps/icons/dark/16px/entities/dot_p.png
+share/gps/icons/dark/16px/entities/dot_ps.png
+share/gps/icons/dark/16px/entities/dot_s.png
+share/gps/icons/dark/16px/entities/dot_x.png
+share/gps/icons/dark/16px/entities/dot_xs.png
+share/gps/icons/dark/16px/entities/square.png
+share/gps/icons/dark/16px/entities/square_p.png
+share/gps/icons/dark/16px/entities/square_ps.png
+share/gps/icons/dark/16px/entities/square_s.png
+share/gps/icons/dark/16px/entities/square_x.png
+share/gps/icons/dark/16px/entities/square_xs.png
+share/gps/icons/dark/16px/entities/triangle.png
+share/gps/icons/dark/16px/entities/triangle_p.png
+share/gps/icons/dark/16px/entities/triangle_ps.png
+share/gps/icons/dark/16px/entities/triangle_s.png
+share/gps/icons/dark/16px/entities/triangle_x.png
+share/gps/icons/dark/16px/entities/triangle_xs.png
+share/gps/icons/dark/16px/error.png
+share/gps/icons/dark/16px/file.png
+share/gps/icons/dark/16px/file_altered.png
+share/gps/icons/dark/16px/file_error.png
+share/gps/icons/dark/16px/file_pencil.png
+share/gps/icons/dark/16px/file_warning.png
+share/gps/icons/dark/16px/finish_16.png
+share/gps/icons/dark/16px/folder_closed.png
+share/gps/icons/dark/16px/folder_e_closed.png
+share/gps/icons/dark/16px/folder_e_open.png
+share/gps/icons/dark/16px/folder_o_closed.png
+share/gps/icons/dark/16px/folder_o_open.png
+share/gps/icons/dark/16px/folder_open.png
+share/gps/icons/dark/16px/gps_16.png
+share/gps/icons/dark/16px/negate.png
+share/gps/icons/dark/16px/newfile_16.png
+share/gps/icons/dark/16px/newfile_b_16.png
+share/gps/icons/dark/16px/next_16.png
+share/gps/icons/dark/16px/play_16.png
+share/gps/icons/dark/16px/project_box.png
+share/gps/icons/dark/16px/project_box_altered.png
+share/gps/icons/dark/16px/project_box_error.png
+share/gps/icons/dark/16px/project_box_open.png
+share/gps/icons/dark/16px/project_box_open_altered.png
+share/gps/icons/dark/16px/project_box_pencil.png
+share/gps/icons/dark/16px/project_box_warning.png
+share/gps/icons/dark/16px/project_root_box.png
+share/gps/icons/dark/16px/project_runtime.png
+share/gps/icons/dark/16px/regexp.png
+share/gps/icons/dark/16px/semantic_check_16.png
+share/gps/icons/dark/16px/stack_down_16.png
+share/gps/icons/dark/16px/stack_up_16.png
+share/gps/icons/dark/16px/step_16.png
+share/gps/icons/dark/16px/stop_16.png
+share/gps/icons/dark/16px/sync_to_local.png
+share/gps/icons/dark/16px/sync_to_remote.png
+share/gps/icons/dark/16px/syntax_check_16.png
+share/gps/icons/dark/16px/warning.png
+share/gps/icons/dark/18px/build_main_18.png
+share/gps/icons/dark/18px/cleanup_18.png
+share/gps/icons/dark/18px/compile_18.png
+share/gps/icons/dark/18px/compute_xref_18.png
+share/gps/icons/dark/18px/custom_build_18.png
+share/gps/icons/dark/18px/finish_18.png
+share/gps/icons/dark/18px/newfile_18.png
+share/gps/icons/dark/18px/next_18.png
+share/gps/icons/dark/18px/play_18.png
+share/gps/icons/dark/18px/semantic_check_18.png
+share/gps/icons/dark/18px/stack_down_18.png
+share/gps/icons/dark/18px/stack_up_18.png
+share/gps/icons/dark/18px/step_18.png
+share/gps/icons/dark/18px/stop_18.png
+share/gps/icons/dark/18px/syntax_check_18.png
+share/gps/icons/dark/20px/vcs-added.png
+share/gps/icons/dark/20px/vcs-has-conflicts.png
+share/gps/icons/dark/20px/vcs-modified.png
+share/gps/icons/dark/20px/vcs-needs-merge.png
+share/gps/icons/dark/20px/vcs-needs-update.png
+share/gps/icons/dark/20px/vcs-not-registered.png
+share/gps/icons/dark/20px/vcs-removed.png
+share/gps/icons/dark/20px/vcs-unknown.png
+share/gps/icons/dark/20px/vcs-up-to-date.png
+share/gps/icons/dark/24px/build_main_24.png
+share/gps/icons/dark/24px/cleanup_24.png
+share/gps/icons/dark/24px/compile_24.png
+share/gps/icons/dark/24px/compute_xref_24.png
+share/gps/icons/dark/24px/custom_build_24.png
+share/gps/icons/dark/24px/finish_24.png
+share/gps/icons/dark/24px/newfile_24.png
+share/gps/icons/dark/24px/next_24.png
+share/gps/icons/dark/24px/play_24.png
+share/gps/icons/dark/24px/semantic_check_24.png
+share/gps/icons/dark/24px/stack_down_24.png
+share/gps/icons/dark/24px/stack_up_24.png
+share/gps/icons/dark/24px/step_24.png
+share/gps/icons/dark/24px/stop_24.png
+share/gps/icons/dark/24px/syntax_check_24.png
+share/gps/icons/dark/32px/gps_32.png
+share/gps/icons/dark/48px/gps_48.png
+share/gps/icons/dark/9px/build_error.png
+share/gps/icons/dark/9px/build_error_fixable.png
+share/gps/icons/dark/9px/build_style.png
+share/gps/icons/dark/9px/build_style_fixable.png
+share/gps/icons/dark/9px/build_warning.png
+share/gps/icons/dark/9px/build_warning_fixable.png
+share/gps/icons/dark/9px/collapse_12.png
+share/gps/icons/dark/9px/executed_code.png
+share/gps/icons/dark/9px/expand_12.png
+share/gps/icons/dark/9px/line_has_code.png
+share/gps/icons/dark/9px/line_might_have_code.png
+share/gps/icons/dark/9px/non_executed_code.png
+share/gps/icons/dark/9px/partially_covered_code.png
+share/gps/icons/dark/9px/remove_unselected_12.png
+share/gps/icons/dark/9px/toggle_links_12.png
+share/gps/icons/dark/9px/wrench.png
+share/gps/icons/dark/9px/wrench_multi.png
+share/gps/icons/dark/other/adacore_logo.png
+share/gps/icons/dark/other/button_guide.png
+share/gps/icons/dark/other/button_guide_over.png
+share/gps/icons/dark/other/button_overview.png
+share/gps/icons/dark/other/button_overview_over.png
+share/gps/icons/dark/other/button_tutorial.png
+share/gps/icons/dark/other/button_tutorial_over.png
+share/gps/icons/dark/other/get_started.png
+share/gps/icons/dark/other/welcome_header.png
+share/gps/icons/dark/svg/build.svg
+share/gps/icons/dark/svg/buildall.svg
+share/gps/icons/dark/svg/buildcustom.svg
+share/gps/icons/dark/svg/buildmain.svg
+share/gps/icons/dark/svg/circle.svg
+share/gps/icons/dark/svg/circle_s.svg
+share/gps/icons/dark/svg/circle_x.svg
+share/gps/icons/dark/svg/circle_xs.svg
+share/gps/icons/dark/svg/clean-12.svg
+share/gps/icons/dark/svg/clean.svg
+share/gps/icons/dark/svg/clear_entry.svg
+share/gps/icons/dark/svg/close.svg
+share/gps/icons/dark/svg/compile.svg
+share/gps/icons/dark/svg/copy.svg
+share/gps/icons/dark/svg/cut.svg
+share/gps/icons/dark/svg/diamond.svg
+share/gps/icons/dark/svg/diamond_s.svg
+share/gps/icons/dark/svg/diamond_x.svg
+share/gps/icons/dark/svg/diamond_x_blue.svg
+share/gps/icons/dark/svg/diamond_xs.svg
+share/gps/icons/dark/svg/document.svg
+share/gps/icons/dark/svg/dot.svg
+share/gps/icons/dark/svg/dot_s.svg
+share/gps/icons/dark/svg/dot_x.svg
+share/gps/icons/dark/svg/dot_xs.svg
+share/gps/icons/dark/svg/double_arrow.svg
+share/gps/icons/dark/svg/edit.svg
+share/gps/icons/dark/svg/environment.svg
+share/gps/icons/dark/svg/error.svg
+share/gps/icons/dark/svg/folder-12.svg
+share/gps/icons/dark/svg/folder.svg
+share/gps/icons/dark/svg/gnatcheck.svg
+share/gps/icons/dark/svg/gnatmetric.svg
+share/gps/icons/dark/svg/gnatprove-path.svg
+share/gps/icons/dark/svg/gnattest.svg
+share/gps/icons/dark/svg/gps-fold-block.svg
+share/gps/icons/dark/svg/gps-unfold-block.svg
+share/gps/icons/dark/svg/info.svg
+share/gps/icons/dark/svg/left.svg
+share/gps/icons/dark/svg/lock-12.svg
+share/gps/icons/dark/svg/lock.svg
+share/gps/icons/dark/svg/menu-12.svg
+share/gps/icons/dark/svg/menu.svg
+share/gps/icons/dark/svg/messages.svg
+share/gps/icons/dark/svg/minus.svg
+share/gps/icons/dark/svg/newdocument.svg
+share/gps/icons/dark/svg/paste.svg
+share/gps/icons/dark/svg/plus.svg
+share/gps/icons/dark/svg/power.svg
+share/gps/icons/dark/svg/print.svg
+share/gps/icons/dark/svg/project.svg
+share/gps/icons/dark/svg/redo.svg
+share/gps/icons/dark/svg/refresh.svg
+share/gps/icons/dark/svg/right.svg
+share/gps/icons/dark/svg/run.svg
+share/gps/icons/dark/svg/run_blue.svg
+share/gps/icons/dark/svg/run_blue_d.svg
+share/gps/icons/dark/svg/run_green.svg
+share/gps/icons/dark/svg/run_green_d.svg
+share/gps/icons/dark/svg/save-12.svg
+share/gps/icons/dark/svg/save.svg
+share/gps/icons/dark/svg/search-and-menu.svg
+share/gps/icons/dark/svg/search.svg
+share/gps/icons/dark/svg/settings.svg
+share/gps/icons/dark/svg/square.svg
+share/gps/icons/dark/svg/square_s.svg
+share/gps/icons/dark/svg/square_x.svg
+share/gps/icons/dark/svg/square_xs.svg
+share/gps/icons/dark/svg/triangle.svg
+share/gps/icons/dark/svg/triangle_s.svg
+share/gps/icons/dark/svg/triangle_x.svg
+share/gps/icons/dark/svg/triangle_xs.svg
+share/gps/icons/dark/svg/undo.svg
+share/gps/icons/dark/svg/unlock-12.svg
+share/gps/icons/dark/svg/unlock.svg
+share/gps/icons/dark/svg/warning.svg
+share/gps/icons/dark/svg/zip.svg
+share/gps/icons/dark/svg/zoom.svg
+share/gps/icons/dark/svg/zoomout.svg
+share/gps/icons/light/svg/build.svg
+share/gps/icons/light/svg/buildall.svg
+share/gps/icons/light/svg/buildcustom.svg
+share/gps/icons/light/svg/buildmain.svg
+share/gps/icons/light/svg/circle.svg
+share/gps/icons/light/svg/circle_s.svg
+share/gps/icons/light/svg/circle_x.svg
+share/gps/icons/light/svg/circle_xs.svg
+share/gps/icons/light/svg/clean-12.svg
+share/gps/icons/light/svg/clean.svg
+share/gps/icons/light/svg/clear_entry.svg
+share/gps/icons/light/svg/close.svg
+share/gps/icons/light/svg/compile.svg
+share/gps/icons/light/svg/copy.svg
+share/gps/icons/light/svg/cut.svg
+share/gps/icons/light/svg/diamond.svg

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506232220.t5NMKZUH007211>