- Unbroke with threaded Mesa;

While I'm here:
- update to 1.2.2;
- respect CFLAGS;
- sort pkg-plist;
- properly name shared libraries.

Submitted by:	bento

10 files changed, 124 insertions, 21 deletions

diff --git a/x11-toolkits/gtkada-devel/files/patch-aa b/x11-toolkits/gtkada-devel/files/patch-aa
deleted file mode 100644
index 354e7cd983d2..000000000000
--- a/x11-toolkits/gtkada-devel/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.in.orig	Mon Nov 27 19:21:00 2000
-+++ src/Makefile.in	Mon Nov 27 19:22:38 2000
-@@ -14,6 +14,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
- CFLAGS = @CFLAGS@ -Wall @GTK_CFLAGS@ -I.. $(FPIC)
- 
-@@ -148,8 +149,8 @@
- 	   $(CP) gtk*.ads gtk*.adb $(incdir); \
- 	   $(CP) $(LIB_DIR)/glib*.ali $(LIB_DIR)/gdk*.ali $(LIB_DIR)/gtk*.ali $(alidir); \
- 	   $(CHMOD) -w $(alidir)/*.ali; \
--	   $(INSTALL_PROGRAM) $(GTKADA_CONFIG) $(bindir); \
--           $(INSTALL_PROGRAM) $(GATE) $(bindir); \
-+	   $(INSTALL_SCRIPT) $(GTKADA_CONFIG) $(bindir); \
-+           $(INSTALL_SCRIPT) $(GATE) $(bindir); \
-            $(INSTALL_PROGRAM) $(GATE_EX) $(bindir); \
-            $(INSTALL_PROGRAM) $(DGATE) $(bindir); \
-            $(INSTALL_PROGRAM) $(GDIALOG) $(bindir); \
diff --git a/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_rm::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_rm::Makefile.in
new file mode 100644
index 000000000000..6f16a286720d
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_rm::Makefile.in
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- docs/gtkada_rm/Makefile.in	2001/08/15 09:23:56	1.1
++++ docs/gtkada_rm/Makefile.in	2001/08/15 09:24:15
+@@ -1,5 +1,5 @@
+ prefix = @prefix@
+-docdir = $(prefix)/doc/GtkAda/gtkada_rm
++docdir = $(prefix)/share/doc/GtkAda/gtkada_rm
+ 
+ MKDIR = mkdir -p
+ INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_ug::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_ug::Makefile.in
new file mode 100644
index 000000000000..f4969155d6e6
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-docs::gtkada_ug::Makefile.in
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- docs/gtkada_ug/Makefile.in	2001/08/15 09:24:24	1.1
++++ docs/gtkada_ug/Makefile.in	2001/08/15 09:24:35
+@@ -1,5 +1,5 @@
+ prefix = @prefix@
+-docdir = $(prefix)/doc/GtkAda/gtkada_ug
++docdir = $(prefix)/share/doc/GtkAda/gtkada_ug
+ 
+ MKDIR = mkdir -p
+ INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada-devel/files/patch-src::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..9e551a6ac3e3
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-src::glade::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::glade::Makefile.in
new file mode 100644
index 000000000000..bea9f89ee18d
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::glade::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-src::gnome::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::gnome::Makefile.in
new file mode 100644
index 000000000000..9764f4d103bb
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::gnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-src::gtkextra::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::gtkextra::Makefile.in
new file mode 100644
index 000000000000..5539766dee64
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::gtkextra::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-src::opengl::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::opengl::Makefile.in
new file mode 100644
index 000000000000..818475fe1bbd
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::opengl::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-src::pixbuf::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-src::pixbuf::Makefile.in
new file mode 100644
index 000000000000..363ec02df418
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-src::pixbuf::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-devel/files/patch-testgtk::Makefile.in b/x11-toolkits/gtkada-devel/files/patch-testgtk::Makefile.in
new file mode 100644
index 000000000000..b68b960a5350
--- /dev/null
+++ b/x11-toolkits/gtkada-devel/files/patch-testgtk::Makefile.in
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- testgtk/Makefile.in	2001/08/15 08:56:29	1.1
++++ testgtk/Makefile.in	2001/08/15 08:57:20
+@@ -15,8 +15,8 @@
+ 
+ CC = @CC@
+ GTKADA_CONFIG=gtkada-config
+-GNATFLAGS = @CFLAGS@ -gnata
+-GNATFLAGS_DEVEL = @CFLAGS@ -g -gnatawu
++GNATFLAGS = -O2 -gnata
++GNATFLAGS_DEVEL = -O2 -g -gnatawu
+ TARGET_LFLAGS = @TARGET_LFLAGS@
+ 
+ GNATMAKE = gnatmake