textproc/xmlada: Build with USE_LANGUAGES+= ada

1) Remove lang/gnat-aux dependency
2) USE_LANGUAGES+= ada (invokes lang/gcc-aux dependency)
3) Improve shared library rpath definition required when built by compiler
   not installed at ${LOCALBASE}
4) Restore use of pkgsrc wrappers

7 files changed, 33 insertions, 31 deletions

diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index cfc5c559134..065b34ab349 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/12/03 07:30:48 marino Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/08 20:03:08 marino Exp $
 #
 
 DISTNAME=	xmlada-${XMLADA_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
@@ -16,20 +16,23 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 XMLADA_VERS=		4.2.0.0
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c # ada is not valid enumeration
+USE_LANGUAGES=		c ada
 USE_TOOLS=		gmake makeinfo
 MAKE_JOBS_SAFE=		no
 
-# no special configuration options necessary
-pre-configure:
-	# explicitly request GNAT-AUX compiler
-	# It is done here to fool tough pkgscr compiler checks
-	${SETENV} CC=gnatgcc
+# Link options were added for the sax, dom, schema, and input_sources libraries
+# "-R" option disables all rpaths except adalib and compiler libs.  This is
+#      done because by default the rpaths will points at the WRKOBJDIR because
+#      it doesn't support the concept of DESTDIR.
+# "-Wl,-R" adds a second rpath string.
+# -Wl,-rpath is a better choice, but synonym -Wl,-R works on all BSD and SunOS
+SUBST_CLASSES+= 	rpath
+SUBST_STAGE.rpath=	pre-configure
+SUBST_MESSAGE.rpath=	Adjust rpaths of shared libraries
+SUBST_FILES.rpath=	sax/sax.gpr
+SUBST_FILES.rpath+=	dom/dom.gpr
+SUBST_FILES.rpath+=	input_sources/input_sources.gpr
+SUBST_FILES.rpath+=	schema/schema.gpr
+SUBST_SED.rpath=	-e "s,@ADDITIONAL_RPATH@,${PREFIX}/lib,"
 
-post-wrapper:
-	# We disable at least the wrapper binaries on all GNAT AUX ports to
-	# avoid potential linkage problems
-	${RM} ${WRKDIR}/.wrapper/bin/*
-
-.include "../../lang/gnat-aux/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlada/buildlink3.mk b/textproc/xmlada/buildlink3.mk
index 097fa49baf1..db5b85e3ed0 100644
--- a/textproc/xmlada/buildlink3.mk
+++ b/textproc/xmlada/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/03 18:50:53 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/07/08 20:03:08 marino Exp $
 
-BUILDLINK_TREE+=	xmlada
+BUILDLINK_TREE+= xmlada
 
 .if !defined(XMLADA_BUILDLINK3_MK)
 XMLADA_BUILDLINK3_MK:=
@@ -8,7 +8,6 @@ XMLADA_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.xmlada+=	xmlada>=3.2.1
 BUILDLINK_PKGSRCDIR.xmlada?=	../../textproc/xmlada
 
-.include "../../lang/gnat-aux/buildlink3.mk"
 .endif	# XMLADA_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-xmlada
+BUILDLINK_TREE+= -xmlada
diff --git a/textproc/xmlada/distinfo b/textproc/xmlada/distinfo
index 38945af890b..2f2d6ceeb83 100644
--- a/textproc/xmlada/distinfo
+++ b/textproc/xmlada/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2011/12/03 07:30:48 marino Exp $
+$NetBSD: distinfo,v 1.5 2012/07/08 20:03:08 marino Exp $
 
 SHA1 (xmlada-4.2.0.0.tar.bz2) = b52984f60cf6b1486495ea92ea9dca7d0892ebc3
 RMD160 (xmlada-4.2.0.0.tar.bz2) = 494e4c6a93bbe18251633bb4a7ac452821a38a93
 Size (xmlada-4.2.0.0.tar.bz2) = 668384 bytes
 SHA1 (patch-aa) = 62d64940a043ddeeb72eb69944fc2572f142191b
 SHA1 (patch-ab) = 3fa075e307471b09eb5db49972fcb7807d41ac53
-SHA1 (patch-ac) = d0eb024f17fdf865e9074c05d23edb6b73155c7b
-SHA1 (patch-ad) = a0ce0701f2a80b18efcb0e56e0c88eb696ecc140
-SHA1 (patch-ae) = cb3403af7affbe04ac5b419c028ecee68aeaa8f0
-SHA1 (patch-af) = f395d63f9dc650bfb0daff52a5a854e5bca7ccb0
+SHA1 (patch-ac) = 7fbfbd51f0b6aa3da4a87e4c7c53945de789bd17
+SHA1 (patch-ad) = da995bf7e4a55c7db5fe799013326bd36d202328
+SHA1 (patch-ae) = 83b036e9f6baec6a5fdf0861b85578cea75c4a4d
+SHA1 (patch-af) = 8ee0ce0bac567ff2d3d144ce255ab6e4aef71e79
diff --git a/textproc/xmlada/patches/patch-ac b/textproc/xmlada/patches/patch-ac
index e40588cdc26..729be067243 100644
--- a/textproc/xmlada/patches/patch-ac
+++ b/textproc/xmlada/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2011/12/03 07:30:48 marino Exp $
+$NetBSD: patch-ac,v 1.2 2012/07/08 20:03:08 marino Exp $
 
 --- sax/sax.gpr.orig	2011-10-08 19:18:44.000000000 +0000
 +++ sax/sax.gpr
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1 2011/12/03 07:30:48 marino Exp $
     for Object_Dir  use "obj/" & Project'Library_Kind;
     for Library_Dir use "lib/" & Project'Library_Kind;
     for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
-+   for Library_Options use ("-R");
++   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;
     package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-ad b/textproc/xmlada/patches/patch-ad
index eba3a019055..fd82668c625 100644
--- a/textproc/xmlada/patches/patch-ad
+++ b/textproc/xmlada/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2011/12/03 07:30:48 marino Exp $
+$NetBSD: patch-ad,v 1.2 2012/07/08 20:03:08 marino Exp $
 
 --- dom/dom.gpr.orig	2011-11-11 12:40:42.991596000 +0000
 +++ dom/dom.gpr
@@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1 2011/12/03 07:30:48 marino Exp $
     for Object_Dir  use "obj/" & Project'Library_Kind;
     for Library_Dir use "lib/" & Project'Library_Kind;
     for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
-+   for Library_Options use ("-R");
++   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;
     package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-ae b/textproc/xmlada/patches/patch-ae
index fc4306dc6a2..7860074a6a2 100644
--- a/textproc/xmlada/patches/patch-ae
+++ b/textproc/xmlada/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2011/12/03 07:30:48 marino Exp $
+$NetBSD: patch-ae,v 1.2 2012/07/08 20:03:08 marino Exp $
 
 --- input_sources/input_sources.gpr.orig	2011-10-08 19:18:37.000000000 +0000
 +++ input_sources/input_sources.gpr
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.1 2011/12/03 07:30:48 marino Exp $
     for Object_Dir  use "obj/" & Project'Library_Kind;
     for Library_Dir use "lib/" & Project'Library_Kind;
     for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
-+   for Library_Options use ("-R");
++   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;
     package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-af b/textproc/xmlada/patches/patch-af
index 95508a736c8..16bd402f056 100644
--- a/textproc/xmlada/patches/patch-af
+++ b/textproc/xmlada/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2011/12/03 07:30:48 marino Exp $
+$NetBSD: patch-af,v 1.2 2012/07/08 20:03:08 marino Exp $
 
 --- schema/schema.gpr.orig	2011-10-08 19:18:59.000000000 +0000
 +++ schema/schema.gpr
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1 2011/12/03 07:30:48 marino Exp $
     for Object_Dir  use "obj/" & Project'Library_Kind;
     for Library_Dir use "lib/" & Project'Library_Kind;
     for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
-+   for Library_Options use ("-R");
++   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;
     package Compiler renames Shared.Compiler;