- Update to 2.4.0

- Take maintainership

PR:		ports/98986
Submitted by:	Petr Holub <hopet@ics.muni.cz>

11 files changed, 26 insertions, 101 deletions

diff --git a/x11-toolkits/gtkada/files/patch-Makefile.in b/x11-toolkits/gtkada/files/patch-Makefile.in
new file mode 100644
index 000000000000..35da8b4bbecc
--- /dev/null
+++ b/x11-toolkits/gtkada/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Fri Jul  7 16:07:08 2006
++++ Makefile.in	Fri Jul  7 16:08:36 2006
+@@ -21,7 +21,9 @@
+ 	$(MAKE) -C $(src_dir) install
+ 	$(MAKE) -C $(projects_dir) install
+ 	$(MAKE) -C $(testgtk_dir) install
++ifndef NOPORTDOCS
+ 	$(MAKE) -C $(doc_dir) install
++endif
+ 	$(MAKE) -C $(example_dir) install
+
+ clean-generic:
diff --git a/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in b/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in
index 6f16a286720d..56ff3453f8e3 100644
--- a/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in
+++ b/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in
@@ -6,7 +6,7 @@ $FreeBSD$
 @@ -1,5 +1,5 @@
  prefix = @prefix@
 -docdir = $(prefix)/doc/GtkAda/gtkada_rm
-+docdir = $(prefix)/share/doc/GtkAda/gtkada_rm
++docdir = $(prefix)/share/doc/gtkada/gtkada_rm
  
  MKDIR = mkdir -p
  INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in b/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in
index f4969155d6e6..b1731d9df54f 100644
--- a/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in
+++ b/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in
@@ -6,7 +6,7 @@ $FreeBSD$
 @@ -1,5 +1,5 @@
  prefix = @prefix@
 -docdir = $(prefix)/doc/GtkAda/gtkada_ug
-+docdir = $(prefix)/share/doc/GtkAda/gtkada_ug
++docdir = $(prefix)/share/doc/gtkada/gtkada_ug
  
  MKDIR = mkdir -p
  INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-projects_Makefile b/x11-toolkits/gtkada/files/patch-projects_Makefile
new file mode 100644
index 000000000000..2b5c163f1c35
--- /dev/null
+++ b/x11-toolkits/gtkada/files/patch-projects_Makefile
@@ -0,0 +1,12 @@
+diff -ruN projects/Makefile projects/Makefile
+--- projects/Makefile	Fri Oct  8 12:59:36 2004
++++ projects/Makefile	Thu Jun 15 18:32:43 2006
+@@ -3,6 +3,6 @@
+ MKDIR = mkdir -p
+
+ install:
+-	${MKDIR} $(prefix)/projects/
+-	cp *.gpr $(prefix)/projects/
++	${MKDIR} $(prefix)/share/gtkada/projects/
++	cp *.gpr $(prefix)/share/gtkada/projects/
+
diff --git a/x11-toolkits/gtkada/files/patch-src::Makefile.in b/x11-toolkits/gtkada/files/patch-src::Makefile.in
deleted file mode 100644
index 9e551a6ac3e3..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2001/08/15 08:53:08	1.1
-+++ src/Makefile.in	2001/08/15 08:53:31
-@@ -32,7 +32,7 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
- LIBNAME       = libgtkada$(SO_EXT)
--SONAME        = libgtkada-$(MAJOR).$(MINOR)$(SO_EXT).$(MICRO)
-+SONAME        = libgtkada$(SO_EXT).$(MICRO)
- ARCHIVENAME   = libgtkada.a
- 
- GTKADA_CONFIG = gtkada-config
diff --git a/x11-toolkits/gtkada/files/patch-src::glade::Makefile.in b/x11-toolkits/gtkada/files/patch-src::glade::Makefile.in
deleted file mode 100644
index bea9f89ee18d..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::glade::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/glade/Makefile.in	2001/08/15 08:53:08	1.1
-+++ src/glade/Makefile.in	2001/08/15 08:53:38
-@@ -7,7 +7,7 @@
- 
- include ../Makefile.common
- 
--SONAME        = libgtkada_glade-$(MAJOR).$(MINOR)$(SO_EXT).$(MICRO)
-+SONAME        = libgtkada_glade$(SO_EXT).$(MICRO)
- LIBNAME       = libgtkada_glade$(SO_EXT)
- ARCHIVENAME   = libgtkada_glade.a
- INSTALL       = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-src::gnome::Makefile.in b/x11-toolkits/gtkada/files/patch-src::gnome::Makefile.in
deleted file mode 100644
index 9764f4d103bb..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::gnome::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/gnome/Makefile.in	2001/08/15 08:53:08	1.1
-+++ src/gnome/Makefile.in	2001/08/15 08:53:44
-@@ -1,7 +1,7 @@
- include ../Makefile.common
- 
- LIBNAME       = libgnomeada$(SO_EXT)
--SONAME        = libgnomeada-$(MAJOR).$(MINOR)$(SO_EXT).$(MICRO)
-+SONAME        = libgnomeada$(SO_EXT).$(MICRO)
- ARCHIVENAME   = libgnomeada.a
- GNOME_LIBS    = @GNOME_LIBS@
- HAVE_GNOME    = @HAVE_GNOME@
diff --git a/x11-toolkits/gtkada/files/patch-src::gtkextra::Makefile.in b/x11-toolkits/gtkada/files/patch-src::gtkextra::Makefile.in
deleted file mode 100644
index 5539766dee64..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::gtkextra::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/gtkextra/Makefile.in	2001/08/15 08:45:57	1.1
-+++ src/gtkextra/Makefile.in	2001/08/15 08:46:10
-@@ -6,7 +6,7 @@
- OBJ=${SRC:%.c=%.o}
- CC=@CC@
- FPIC=@FPIC@
--CFLAGS=-O2
-+CFLAGS=@CFLAGS@
- ALL_CFLAGS=$(CFLAGS) @GTK_CFLAGS@ $(FPIC)
- 
- all: $(OBJ)
diff --git a/x11-toolkits/gtkada/files/patch-src::opengl::Makefile.in b/x11-toolkits/gtkada/files/patch-src::opengl::Makefile.in
deleted file mode 100644
index 818475fe1bbd..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::opengl::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/opengl/Makefile.in	2001/08/15 08:53:08	1.1
-+++ src/opengl/Makefile.in	2001/08/15 08:53:23
-@@ -9,7 +9,7 @@
- 
- CFLAGS = @CFLAGS@ -Wall @GTK_CFLAGS@ -I. $(FPIC)
-  
--SONAME        = libgtkada_gl-$(MAJOR).$(MINOR)$(SO_EXT).$(MICRO)
-+SONAME        = libgtkada_gl$(SO_EXT).$(MICRO)
- LIBNAME       = libgtkada_gl$(SO_EXT)
- ARCHIVENAME   = libgtkada_gl.a
- INSTALL       = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-src::pixbuf::Makefile.in b/x11-toolkits/gtkada/files/patch-src::pixbuf::Makefile.in
deleted file mode 100644
index 363ec02df418..000000000000
--- a/x11-toolkits/gtkada/files/patch-src::pixbuf::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pixbuf/Makefile.in	2001/08/15 08:53:08	1.1
-+++ src/pixbuf/Makefile.in	2001/08/15 08:53:50
-@@ -9,7 +9,7 @@
- 
- CFLAGS = @CFLAGS@ -Wall @PIXBUF_CFLAGS@ -I. $(FPIC)
-  
--SONAME        = libgtkada_art-$(MAJOR).$(MINOR)$(SO_EXT).$(MICRO)
-+SONAME        = libgtkada_art$(SO_EXT).$(MICRO)
- LIBNAME       = libgtkada_art$(SO_EXT)
- ARCHIVENAME   = libgtkada_art.a
- INSTALL       = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-testgtk::Makefile.in b/x11-toolkits/gtkada/files/patch-testgtk::Makefile.in
deleted file mode 100644
index e44a9e889d62..000000000000
--- a/x11-toolkits/gtkada/files/patch-testgtk::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- testgtk/Makefile.in	Fri Apr 27 18:20:15 2001
-+++ testgtk/Makefile.in.new	Fri Aug 17 01:26:49 2001
-@@ -15,9 +15,9 @@
- 
- CC = @CC@
- GTKADA_CONFIG=gtkada-config
--GNATFLAGS = @CFLAGS@ -gnata
--GNATFLAGS_DEVEL = @CFLAGS@ -g -gnatawu
--TARGET_LFLAGS = @TARGET_LFLAGS@
-+GNATFLAGS = -O2 -gnata
-+GNATFLAGS_DEVEL = -O2 -g -gnatawu
-+TARGET_LFLAGS = $(LDFLAGS)
- 
- GNATMAKE = gnatmake
- GNATMAKELDFLAGS = -largs -L$(src_dir) -L$(opengl_dir) -lgtkada @GTK_LIBS@ \