7 files changed, 98 insertions, 140 deletions

diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile
index ebf746c120e7..71c8b85006f3 100644
--- a/x11-toolkits/gtkada3/Makefile
+++ b/x11-toolkits/gtkada3/Makefile
@@ -2,69 +2,58 @@
 # $FreeBSD$
 
 PORTNAME=	gtkada
-PORTVERSION=	3.8.3.1
-PORTREVISION=	1
+PORTVERSION=	3.8.3.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	3
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		gtkada-rm-${RM_VERSION}${EXTRACT_SUFX}
+DISTFILES=	gtkada-for-gps-6.1.1-src.tar.gz
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada graphical toolkit based on Gtk3 components
 
 LICENSE=	GPLv3
 
-USES=		ada gmake perl5 pkgconfig tar:bzip2
+BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+
+USES=		ada gmake perl5 pkgconfig
 USE_PERL5=	build
 USE_GNOME=	gtk30
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
-ALL_TARGET=	src
+ALL_TARGET=	tools static relocatable
 NO_MTREE=	yes
+WRKSRC=		${WRKDIR}/gtkada-gpl-2015-src
 PORTDOCS=	gtkada_rm gtkada_ug
 PORTEXAMPLES=	testgtk
 RM_VERSION=	3.8.3.0
+LDFLAGS=	-L${LOCALBASE}/lib
 
-MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
-		GL_SUPPORT=yes
+MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}
 
 CONFLICTS_INSTALL=	gtkada-*
 
 CONFIGURE_ARGS+=	--with-GL=auto \
-			--disable-gtkextra
+			--enable-shared \
+			--enable-static
 
 OPTIONS_DEFINE=		DOCS NLS EXAMPLES DEBUG
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_DISTFILES=		gtkada-rm-${RM_VERSION}.tar.bz2
+DOCS_ALL_TARGET=	docs
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+EXAMPLES_ALL_TARGET=	tests
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	--enable-nls
-USES+=			gettext
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-build=Debug
 .else
 CONFIGURE_ARGS+=	--enable-build=Production
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+= docs
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-ALL_TARGET+= tests
-.endif
-
 post-extract:
-.if ${PORTVERSION} != ${RM_VERSION}
+.if ${PORT_OPTIONS:MDOCS}
 	${MV} ${WRKDIR}/gtkada-${RM_VERSION}/docs/* ${WRKSRC}/docs/
 .endif
 
@@ -76,7 +65,11 @@ do-build:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
-	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
+	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
+	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
+	${RM} ${STAGEDIR}${PREFIX}/lib/libgtkada*
+	(cd ${STAGEDIR}${PREFIX}/lib && \
+	  ${LN} -s gtkada/relocatable/libgtkada.so.3.8.3 libgtkada.so && \
+	  ${LN} -s gtkada/relocatable/libgtkada_gl.so.3.8.3 libgtkada_gl.so)
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkada3/distinfo b/x11-toolkits/gtkada3/distinfo
index 21c19239c92a..6102fc5fa8ac 100644
--- a/x11-toolkits/gtkada3/distinfo
+++ b/x11-toolkits/gtkada3/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gtkada-3.8.3.1.tar.bz2) = 7131011c7b6a78f5a944901f1db414f825b38fc696263ce7da442f5edb253058
-SIZE (gtkada-3.8.3.1.tar.bz2) = 3062671
+SHA256 (gtkada-for-gps-6.1.1-src.tar.gz) = 5b7b777bb2f79ca276cf0d4778e21b77462c7066ea52fdf957b482d4699d58b0
+SIZE (gtkada-for-gps-6.1.1-src.tar.gz) = 11298808
 SHA256 (gtkada-rm-3.8.3.0.tar.bz2) = 445ed11620108a80ba76787b073f1c7b8931786bebaacc5c07710a35acac0991
 SIZE (gtkada-rm-3.8.3.0.tar.bz2) = 3368348
diff --git a/x11-toolkits/gtkada3/files/patch-Makefile.in b/x11-toolkits/gtkada3/files/patch-Makefile.in
new file mode 100644
index 000000000000..7589cb3d6a8c
--- /dev/null
+++ b/x11-toolkits/gtkada3/files/patch-Makefile.in
@@ -0,0 +1,26 @@
+--- Makefile.in.orig	2015-06-01 14:38:17 UTC
++++ Makefile.in
+@@ -70,7 +70,7 @@ all: tools tests
+ static: build_library_type/static
+ relocatable: build_library_type/relocatable
+ 
+-tools:
++tools: src/gtkada-intl.adb
+ 	@echo "====== Building tools ====="
+ 	${GPRBUILD_FULL} -XLIBRARY_TYPE=static -Psrc/tools/tools.gpr
+ 
+@@ -142,11 +142,11 @@ ifeq (${HAVE_OPENGL},True)
+ endif
+ 
+ 	@# install executables
+-	${INSTALL_PROGRAM} src/tools/gtkada-config ${bindir}
+-	${INSTALL_PROGRAM} src/obj/tools/gtkada-dialog${EXEEXT} ${bindir}
++	${BSD_INSTALL_SCRIPT} src/tools/gtkada-config ${bindir}
++	${BSD_INSTALL_PROGRAM} src/obj/tools/gtkada-dialog${EXEEXT} ${bindir}
+ 
+ 	@# install testgtk
+-	-${INSTALL_PROGRAM} testgtk/testgtk${EXEEXT} ${exampledir}
++	-${BSD_INSTALL_PROGRAM} testgtk/testgtk${EXEEXT} ${exampledir}
+ 	${CP} testgtk/*.ad? testgtk/*.xpm testgtk/*.png testgtk/*.gif testgtk/*.lwo testgtk/*.xml testgtk/*.css testgtk/*.ui ${exampledir}
+ 
+ 	$(MAKE) -C $(projects_dir) install
diff --git a/x11-toolkits/gtkada3/files/patch-configure b/x11-toolkits/gtkada3/files/patch-configure
index 259655a19c43..9d210c5d24ea 100644
--- a/x11-toolkits/gtkada3/files/patch-configure
+++ b/x11-toolkits/gtkada3/files/patch-configure
@@ -1,12 +1,23 @@
---- configure.orig	2014-05-18 00:52:57.000000000 +0000
+--- configure.orig	2015-06-01 14:38:18 UTC
 +++ configure
-@@ -2158,6 +2158,9 @@ fi
+@@ -2107,6 +2107,11 @@ fi
        ac_GNATLIB=`cd $ac_GNATDIR; ls libgnat-*.dll | sed 's,lib,,;s,.dll,,'`
        OS_SPECIFIC_LINK_OPTIONS=-Wl,-L$ac_GNATDIR,-l$ac_GNATLIB
        ;;
 +   *dragonfly*|*bsd*)
-+      TARGET_LFLAGS="-lm"
++      if test x$CAN_BUILD_SHARED = xyes ; then
++         BUILD_SHARED=yes
++      fi
 +      ;;
     *darwin*)
        SO_EXT=.dylib
-       if test x$CAN_BUILD_SHARED = xyes ; then
+       NEED_OBJECTIVE_C=yes
+@@ -3605,7 +3610,7 @@ $as_echo_n "checking for GTK - version >
+     GTK_CFLAGS=`$PKG_CONFIG $GTK --cflags`
+     GTK_LIBS=`$PKG_CONFIG $GTK gmodule-2.0 --libs`
+ 
+-            GTK_LIBS="$GTK_LIBS $LDFLAGS"
++            GTK_LIBS="$GTK_LIBS $LDFLAGS -lm -lX11"
+ 
+                     ac_save_CFLAGS="$CFLAGS"
+     ac_save_LIBS="$LIBS"
diff --git a/x11-toolkits/gtkada3/files/patch-docs_Makefile.in b/x11-toolkits/gtkada3/files/patch-docs_Makefile.in
index 7c127e0df0ec..55e6273db50a 100644
--- a/x11-toolkits/gtkada3/files/patch-docs_Makefile.in
+++ b/x11-toolkits/gtkada3/files/patch-docs_Makefile.in
@@ -1,4 +1,4 @@
---- docs/Makefile.in.orig	2014-05-18 00:53:01.000000000 +0000
+--- docs/Makefile.in.orig	2015-06-01 14:38:17 UTC
 +++ docs/Makefile.in
 @@ -4,14 +4,12 @@ CP=cp -p
  MKDIR=mkdir -p
diff --git a/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads b/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads
deleted file mode 100644
index 0a8c460c8a9b..000000000000
--- a/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/gtkada-canvas_view.ads.orig	2014-05-23 15:49:01 UTC
-+++ src/gtkada-canvas_view.ads
-@@ -372,7 +372,7 @@ package Gtkada.Canvas_View is
- 
-    function Is_Link
-      (Self : not null access Abstract_Item_Record)
--      return Boolean is (False);
-+      return Boolean is abstract;
-    --  Whether this item should be considered as a link between two other
-    --  items.
-    --  Such links have a few specific behavior: for instance, they cannot be
-@@ -448,7 +448,7 @@ package Gtkada.Canvas_View is
-    function Edit_Widget
-      (Self  : not null access Abstract_Item_Record;
-       View  : not null access Canvas_View_Record'Class)
--      return Gtk.Widget.Gtk_Widget is (null);
-+      return Gtk.Widget.Gtk_Widget is abstract;
-    --  Return the widget to use for in-place editing of the item.
-    --  null should be returned when the item is not editable in place.
-    --  It is the responsibility of the returned widget to monitor events and
-@@ -463,7 +463,7 @@ package Gtkada.Canvas_View is
- 
-    function Parent
-      (Self : not null access Abstract_Item_Record)
--      return Abstract_Item is (null);
-+      return Abstract_Item is abstract;
-    --  Return the item inside which Self is contained.
-    --  null is returned for toplevel items, in which case the coordinates of
-    --  the bounding box are model coordinats. Otherwise, the coordinates are
-@@ -478,7 +478,7 @@ package Gtkada.Canvas_View is
-      (Self     : not null access Abstract_Item_Record;
-       At_Point : Model_Point;
-       Context  : Draw_Context)
--      return Abstract_Item is (Self);
-+      return Abstract_Item is abstract;
-    --  Return the inner-most item at the specific coordinates in Self (or
-    --  Self itself).
- 
-@@ -509,7 +509,7 @@ package Gtkada.Canvas_View is
- 
-    function Is_Invisible
-      (Self : not null access Abstract_Item_Record)
--     return Boolean is (False);
-+     return Boolean is abstract;
-    --  True if Self has no filling or stroke information (and therefore is
-    --  invisible even when displayed, although some of its children might be
-    --  visible).
-@@ -526,6 +526,19 @@ package Gtkada.Canvas_View is
-    --  It is easier to derive from this type when you want to create your own
-    --  items, unless you want complete control of the data storage.
- 
-+   overriding function Is_Link
-+     (Self : not null access Canvas_Item_Record) return Boolean is (False);
-+   overriding function Parent
-+     (Self : not null access Canvas_Item_Record)
-+      return Abstract_Item is (null);
-+   overriding function Is_Invisible
-+     (Self : not null access Canvas_Item_Record)
-+     return Boolean is (False);
-+   function Inner_Most_Item
-+     (Self     : not null access Canvas_Item_Record;
-+      At_Point : Model_Point;
-+      Context  : Draw_Context)
-+      return Abstract_Item is (Self);
-    overriding function Position
-      (Self : not null access Canvas_Item_Record) return Gtkada.Style.Point;
-    overriding function Contains
-@@ -1583,6 +1596,21 @@ package Gtkada.Canvas_View is
-    --  Return the computed points for the link.
-    --  Do not free or store the result
- 
-+   overriding function Is_Invisible
-+     (Self : not null access Canvas_Link_Record)
-+     return Boolean is (False);
-+   overriding function Inner_Most_Item
-+     (Self     : not null access Canvas_Link_Record;
-+      At_Point : Model_Point;
-+      Context  : Draw_Context)
-+      return Abstract_Item is (null);
-+   overriding function Parent
-+     (Self : not null access Canvas_Link_Record)
-+      return Abstract_Item is (null);
-+   overriding function Edit_Widget
-+     (Self  : not null access Canvas_Link_Record;
-+      View  : not null access Canvas_View_Record'Class)
-+      return Gtk.Widget.Gtk_Widget is (null);
-    overriding procedure Destroy
-      (Self     : not null access Canvas_Link_Record;
-       In_Model : not null access Canvas_Model_Record'Class);
diff --git a/x11-toolkits/gtkada3/pkg-plist b/x11-toolkits/gtkada3/pkg-plist
index 4512556c2e29..1b4af741b5c6 100644
--- a/x11-toolkits/gtkada3/pkg-plist
+++ b/x11-toolkits/gtkada3/pkg-plist
@@ -44,6 +44,8 @@ include/gtkada/gdk-frame_clock.adb
 include/gtkada/gdk-frame_clock.ads
 include/gtkada/gdk-frame_timings.adb
 include/gtkada/gdk-frame_timings.ads
+include/gtkada/gdk-gl.adb
+include/gtkada/gdk-gl.ads
 include/gtkada/gdk-input.ads
 include/gtkada/gdk-keyval.adb
 include/gtkada/gdk-keyval.ads
@@ -69,6 +71,8 @@ include/gtkada/gdk-window.ads
 include/gtkada/gdk-window_attr.adb
 include/gtkada/gdk-window_attr.ads
 include/gtkada/gdk.ads
+include/gtkada/gl_h.adb
+include/gtkada/gl_h.ads
 include/gtkada/glib-action.adb
 include/gtkada/glib-action.ads
 include/gtkada/glib-action_group.adb
@@ -92,6 +96,8 @@ include/gtkada/glib-glist.adb
 include/gtkada/glib-glist.ads
 include/gtkada/glib-gnodes.adb
 include/gtkada/glib-gnodes.ads
+include/gtkada/glib-graphs-layouts.adb
+include/gtkada/glib-graphs-layouts.ads
 include/gtkada/glib-graphs.adb
 include/gtkada/glib-graphs.ads
 include/gtkada/glib-gslist.adb
@@ -137,6 +143,7 @@ include/gtkada/glib-xml.ads
 include/gtkada/glib-xml_int.ads
 include/gtkada/glib.adb
 include/gtkada/glib.ads
+include/gtkada/glu_h.ads
 include/gtkada/gtk-about_dialog.adb
 include/gtkada/gtk-about_dialog.ads
 include/gtkada/gtk-accel_group.adb
@@ -291,6 +298,8 @@ include/gtkada/gtk-frame.adb
 include/gtkada/gtk-frame.ads
 include/gtkada/gtk-gentry.adb
 include/gtkada/gtk-gentry.ads
+include/gtkada/gtk-glarea.adb
+include/gtkada/gtk-glarea.ads
 include/gtkada/gtk-gradient.adb
 include/gtkada/gtk-gradient.ads
 include/gtkada/gtk-grange.adb
@@ -560,8 +569,14 @@ include/gtkada/gtkada-canvas_view-astar.adb
 include/gtkada/gtkada-canvas_view-astar.ads
 include/gtkada/gtkada-canvas_view-links.adb
 include/gtkada/gtkada-canvas_view-links.ads
+include/gtkada/gtkada-canvas_view-models-layers.adb
+include/gtkada/gtkada-canvas_view-models-layers.ads
+include/gtkada/gtkada-canvas_view-models.adb
+include/gtkada/gtkada-canvas_view-models.ads
 include/gtkada/gtkada-canvas_view-objects.adb
 include/gtkada/gtkada-canvas_view-objects.ads
+include/gtkada/gtkada-canvas_view-rtrees.adb
+include/gtkada/gtkada-canvas_view-rtrees.ads
 include/gtkada/gtkada-canvas_view-views.adb
 include/gtkada/gtkada-canvas_view-views.ads
 include/gtkada/gtkada-canvas_view.adb
@@ -586,13 +601,6 @@ include/gtkada/gtkada-style.ads
 include/gtkada/gtkada-types.adb
 include/gtkada/gtkada-types.ads
 include/gtkada/gtkada.ads
-include/gtkada/opengl/gdk-gl.adb
-include/gtkada/opengl/gdk-gl.ads
-include/gtkada/opengl/gl_h.adb
-include/gtkada/opengl/gl_h.ads
-include/gtkada/opengl/glu_h.ads
-include/gtkada/opengl/gtk-glarea.adb
-include/gtkada/opengl/gtk-glarea.ads
 include/gtkada/pango-attributes.adb
 include/gtkada/pango-attributes.ads
 include/gtkada/pango-cairo.adb
@@ -625,7 +633,8 @@ include/gtkada/pango-tabs.adb
 include/gtkada/pango-tabs.ads
 include/gtkada/pango.ads
 lib/gnat/gtkada.gpr
-lib/gnat/gtkada_gl.gpr
+lib/gnat/gtkada/gtkada.lgpr
+lib/gnat/gtkada/gtkada_gl.lgpr
 lib/gtkada/relocatable/cairo-font_face.ali
 lib/gtkada/relocatable/cairo-font_options.ali
 lib/gtkada/relocatable/cairo-image_surface.ali
@@ -679,6 +688,7 @@ lib/gtkada/relocatable/glib-g_icon.ali
 lib/gtkada/relocatable/glib-generic_properties.ali
 lib/gtkada/relocatable/glib-glist.ali
 lib/gtkada/relocatable/glib-gnodes.ali
+lib/gtkada/relocatable/glib-graphs-layouts.ali
 lib/gtkada/relocatable/glib-graphs.ali
 lib/gtkada/relocatable/glib-gslist.ali
 lib/gtkada/relocatable/glib-key_file.ali
@@ -916,7 +926,10 @@ lib/gtkada/relocatable/gtkada-c.ali
 lib/gtkada/relocatable/gtkada-canvas.ali
 lib/gtkada/relocatable/gtkada-canvas_view-astar.ali
 lib/gtkada/relocatable/gtkada-canvas_view-links.ali
+lib/gtkada/relocatable/gtkada-canvas_view-models-layers.ali
+lib/gtkada/relocatable/gtkada-canvas_view-models.ali
 lib/gtkada/relocatable/gtkada-canvas_view-objects.ali
+lib/gtkada/relocatable/gtkada-canvas_view-rtrees.ali
 lib/gtkada/relocatable/gtkada-canvas_view-views.ali
 lib/gtkada/relocatable/gtkada-canvas_view.ali
 lib/gtkada/relocatable/gtkada-dialogs.ali
@@ -930,10 +943,12 @@ lib/gtkada/relocatable/gtkada-printing.ali
 lib/gtkada/relocatable/gtkada-style.ali
 lib/gtkada/relocatable/gtkada-types.ali
 lib/gtkada/relocatable/gtkada.ali
-lib/gtkada/relocatable/libgtkada-3.8.so.3
 lib/gtkada/relocatable/libgtkada.so
+lib/gtkada/relocatable/libgtkada.so.3.8
+lib/gtkada/relocatable/libgtkada.so.3.8.3
 lib/gtkada/relocatable/libgtkada_gl.so
-lib/gtkada/relocatable/opengl/libgtkada_gl-3.8.so.3
+lib/gtkada/relocatable/libgtkada_gl.so.3.8
+lib/gtkada/relocatable/libgtkada_gl.so.3.8.3
 lib/gtkada/relocatable/pango-attributes.ali
 lib/gtkada/relocatable/pango-cairo.ali
 lib/gtkada/relocatable/pango-context.ali
@@ -1003,6 +1018,7 @@ lib/gtkada/static/glib-g_icon.ali
 lib/gtkada/static/glib-generic_properties.ali
 lib/gtkada/static/glib-glist.ali
 lib/gtkada/static/glib-gnodes.ali
+lib/gtkada/static/glib-graphs-layouts.ali
 lib/gtkada/static/glib-graphs.ali
 lib/gtkada/static/glib-gslist.ali
 lib/gtkada/static/glib-key_file.ali
@@ -1240,7 +1256,10 @@ lib/gtkada/static/gtkada-c.ali
 lib/gtkada/static/gtkada-canvas.ali
 lib/gtkada/static/gtkada-canvas_view-astar.ali
 lib/gtkada/static/gtkada-canvas_view-links.ali
+lib/gtkada/static/gtkada-canvas_view-models-layers.ali
+lib/gtkada/static/gtkada-canvas_view-models.ali
 lib/gtkada/static/gtkada-canvas_view-objects.ali
+lib/gtkada/static/gtkada-canvas_view-rtrees.ali
 lib/gtkada/static/gtkada-canvas_view-views.ali
 lib/gtkada/static/gtkada-canvas_view.ali
 lib/gtkada/static/gtkada-dialogs.ali
@@ -1255,7 +1274,7 @@ lib/gtkada/static/gtkada-style.ali
 lib/gtkada/static/gtkada-types.ali
 lib/gtkada/static/gtkada.ali
 lib/gtkada/static/libgtkada.a
-lib/gtkada/static/opengl/libgtkada_gl.a
+lib/gtkada/static/libgtkada_gl.a
 lib/gtkada/static/pango-attributes.ali
 lib/gtkada/static/pango-cairo.ali
 lib/gtkada/static/pango-context.ali
@@ -1272,9 +1291,7 @@ lib/gtkada/static/pango-layout.ali
 lib/gtkada/static/pango-matrix.ali
 lib/gtkada/static/pango-tabs.ali
 lib/gtkada/static/pango.ali
-lib/libgtkada-3.8.so.3
 lib/libgtkada.so
-lib/libgtkada_gl-3.8.so.3
 lib/libgtkada_gl.so
 libdata/pkgconfig/gtkada.pc
 share/gps/plug-ins/gtkada.xml