x11/gtkada: Build with USE_LANGUAGES+= ada

1) Remove lang/gnat-aux dependency
2) USE_LANGUAGES+= ada (invokes lang/gcc-aux dependency)
3) USE_TOOLS+= pkg-config (remove hardcoded PATH)
4) Restore use of pkgsrc wrappers
5) Fix bad paths of bin/gate (discovered by updated PKG_DEVELOPER=yes)
6) Use @pkgdir for required empty directory instead of .IGNOREME
7) Add -lgnat for shared libraries, required in this build configuration

6 files changed, 20 insertions, 26 deletions

diff --git a/x11/gtkada/Makefile b/x11/gtkada/Makefile
index 8351d7e3a84..8c0b8eb4ab1 100644
--- a/x11/gtkada/Makefile
+++ b/x11/gtkada/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/03/03 00:12:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/08 20:18:59 marino Exp $
 #
 
 DISTNAME=	gtkada-${GTKADA_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
@@ -18,21 +18,20 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config perl makeinfo
+USE_TOOLS+=		gmake pkg-config perl makeinfo pkg-config
+USE_LANGUAGES=		c ada c++ fortran
 MAKE_JOBS_SAFE=		no
 
 GTKADA_VERSION=		2.22
-FULL_PATH=		/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin:${PREFIX}/lib/pkgconfig
-MY_CONFIGURE_ENV=	PATH=${FULL_PATH}
-MY_CONFIGURE_ENV+=	CC=gnatgcc
 CONFIGURE_ARGS+=	--disable-nls
 PKGCONFIG_OVERRIDE+=	projects/gtkada.pc.in
 
-post-wrapper:
-	# We disable at least the wrapper binaries on all GNAT AUX ports to
-	# avoid linkage and build problems.  In this case we need the wrappers
-	# for the sed transformation script.
-	${RM} ${WRKDIR}/.wrapper/bin/*
+SUBST_CLASSES+= 	gate
+SUBST_STAGE.gate=	pre-configure
+SUBST_MESSAGE.gate=	Override tools for gate executable
+SUBST_FILES.gate=	src/tools/gate.in
+SUBST_SED.gate= 	-e "s,@DIFF@,${TOOLS_PLATFORM.diff},"
+SUBST_SED.gate+=	-e "s,@PATCH@,${TOOLS_PLATFORM.patch},"
 
 do-configure:
 	# OpenGL, Gnome, and glade are normally detected automatically, but
@@ -40,10 +39,6 @@ do-configure:
 	# test everything, patch-ad just disables support for these features.
 	cd ${WRKSRC} && ${SETENV} ${MY_CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 
-post-install:
-	${TOUCH} ${DESTDIR}${PREFIX}/lib/gnat/gtkada/IGNORE.ME
-
 # gtk2 includes atk, glib and pango among others
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../lang/gnat-aux/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtkada/PLIST b/x11/gtkada/PLIST
index f9338545f57..d90202eba8f 100644
--- a/x11/gtkada/PLIST
+++ b/x11/gtkada/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 03:15:31 dholland Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/07/08 20:18:59 marino Exp $
 bin/gate
 bin/gate-in.exe
 bin/gtkada-config
@@ -552,7 +552,6 @@ include/gtkada/pango-tabs.adb
 include/gtkada/pango-tabs.ads
 include/gtkada/pango.ads
 lib/gnat/gtkada.gpr
-lib/gnat/gtkada/IGNORE.ME
 lib/gtkada/relocatable/cairo-font_face.ali
 lib/gtkada/relocatable/cairo-font_options.ali
 lib/gtkada/relocatable/cairo-image_surface.ali
@@ -2457,3 +2456,4 @@ share/examples/gtkada/user_data/Makefile
 share/examples/gtkada/user_data/README
 share/examples/gtkada/user_data/test_handlers.adb
 share/gps/plug-ins/gtkada.xml
+@pkgdir lib/gnat/gtkada
diff --git a/x11/gtkada/buildlink3.mk b/x11/gtkada/buildlink3.mk
index c4c8dba500b..e7a4a96bf2c 100644
--- a/x11/gtkada/buildlink3.mk
+++ b/x11/gtkada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/05/07 01:54:09 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2012/07/08 20:18:59 marino Exp $
 
 BUILDLINK_TREE+=	gtkada
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.gtkada+=	gtkada>=2.22nb4
 BUILDLINK_PKGSRCDIR.gtkada?=	../../x11/gtkada
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../lang/gnat-aux/buildlink3.mk"
 .endif	# GTKADA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gtkada
diff --git a/x11/gtkada/distinfo b/x11/gtkada/distinfo
index d1b9a01daab..96f64c49d8b 100644
--- a/x11/gtkada/distinfo
+++ b/x11/gtkada/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/05/06 17:55:52 marino Exp $
+$NetBSD: distinfo,v 1.5 2012/07/08 20:18:59 marino Exp $
 
 SHA1 (gtkada-2.22.tar.bz2) = 99cce5b7847b6c497aef8f388250034df462cfa6
 RMD160 (gtkada-2.22.tar.bz2) = f12409882e31213eae2817309193025eec9bf20b
@@ -8,9 +8,9 @@ RMD160 (gtkada-rm-2.22.tar.bz2) = 455767367be496a42e87589902b7752d74303ec0
 Size (gtkada-rm-2.22.tar.bz2) = 3263320 bytes
 SHA1 (patch-aa) = 341bac6befb2ba9647cd6820057630d417e47d42
 SHA1 (patch-ab) = 420a0e809b1f7e82cd1b7212ed2840ade4def6c2
-SHA1 (patch-ac) = e013efafab5f68ce282f9ce38577fa018c05ff00
+SHA1 (patch-ac) = 3470d003563b82d228f9819f308c3d86bef4d842
 SHA1 (patch-ad) = 09803810177e1e9ff0957773362f7cd44589665b
-SHA1 (patch-ae) = 7ef44d33bda6c8deb126d8457f4b36415ff256a6
+SHA1 (patch-ae) = 8c72682d361b9162cfbc8807fe36d117de656a4b
 SHA1 (patch-af) = ab8b28cfe1d04b51207aaf666e547732bbd3b03d
 SHA1 (patch-ag) = cbd147b8a193642b7d8e2b706b45c2002b8cdc99
 SHA1 (patch-ah) = 9539f2e735550ccedbc769bf66fe979f333e5851
diff --git a/x11/gtkada/patches/patch-ac b/x11/gtkada/patches/patch-ac
index 7f01addd9e7..07ab56f6ef5 100644
--- a/x11/gtkada/patches/patch-ac
+++ b/x11/gtkada/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2012/07/08 20:19:00 marino Exp $
 
 --- src/tools/Makefile.in.orig	2011-01-19 22:51:22.000000000 +0100
 +++ src/tools/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
  GTKADA_CONFIG = gtkada-config
  
 -GNATMAKELDFLAGS = -largs -L../lib-obj -lgtkada $(GTK_LIBS)
-+GNATMAKELDFLAGS = -largs -shared-libgcc -L../lib-obj -lgtkada $(GTK_LIBS)
++GNATMAKELDFLAGS = -largs -shared-libgcc -lgnat -L../lib-obj -lgtkada $(GTK_LIBS)
  
  OBJ_DIR=obj
  include ../Makefile.common
diff --git a/x11/gtkada/patches/patch-ae b/x11/gtkada/patches/patch-ae
index 610a9846f12..42428e81f9e 100644
--- a/x11/gtkada/patches/patch-ae
+++ b/x11/gtkada/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2012/07/08 20:19:00 marino Exp $
 
 --- testgtk/Makefile.in.orig	2011-01-19 23:19:14.000000000 +0100
 +++ testgtk/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
  endif
  
 -GNATMAKELDFLAGS = -largs -L$(src_dir)/lib-obj -L$(opengl_dir) -lgtkada \
-+GNATMAKELDFLAGS = -shared-libgcc -L$(src_dir)/lib-obj -L$(opengl_dir) -lgtkada \
++GNATMAKELDFLAGS = -shared-libgcc -lgnat -L$(src_dir)/lib-obj -L$(opengl_dir) -lgtkada \
    $(GTKADA_GL_LIBS) @GTK_LIBS@ $(TARGET_LFLAGS)
  
  all: opengl/view_gl.adb $(OPENGL_C_OBJECTS) $(target)