textproc/xmlada: Remove DESTDIR from library rpaths

Removing DESTDIR from the shared library rpaths required a change in the
compiler.  To tell GNAT not to add in DESTDIR rpaths, the -R switch
needs to be added to each library's option set.  GNAT-AUX 20110627nb2
required at a minimum to take advantage of these switches.

Additionally, issues with installed files' permissions were fixed.

7 files changed, 69 insertions, 17 deletions

diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 4ab614884e1..cfc5c559134 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2011/10/09 22:29:44 marino Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/03 07:30:48 marino Exp $
 #
 
 DISTNAME=	xmlada-${XMLADA_VERS}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
diff --git a/textproc/xmlada/distinfo b/textproc/xmlada/distinfo
index 3d8af8d3ef0..38945af890b 100644
--- a/textproc/xmlada/distinfo
+++ b/textproc/xmlada/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2011/10/09 22:29:44 marino Exp $
+$NetBSD: distinfo,v 1.4 2011/12/03 07:30:48 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) = 3f5524f211695823c7032f5cf5438b415b9f0a1d
+SHA1 (patch-aa) = 62d64940a043ddeeb72eb69944fc2572f142191b
 SHA1 (patch-ab) = 3fa075e307471b09eb5db49972fcb7807d41ac53
+SHA1 (patch-ac) = d0eb024f17fdf865e9074c05d23edb6b73155c7b
+SHA1 (patch-ad) = a0ce0701f2a80b18efcb0e56e0c88eb696ecc140
+SHA1 (patch-ae) = cb3403af7affbe04ac5b419c028ecee68aeaa8f0
+SHA1 (patch-af) = f395d63f9dc650bfb0daff52a5a854e5bca7ccb0
diff --git a/textproc/xmlada/patches/patch-aa b/textproc/xmlada/patches/patch-aa
index b3c9fc42b70..6a2dc17265c 100644
--- a/textproc/xmlada/patches/patch-aa
+++ b/textproc/xmlada/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2011/10/09 22:29:44 marino Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/03 07:30:48 marino Exp $
 
 --- Makefile.in.orig	2011-10-08 19:19:00.000000000 +0000
 +++ Makefile.in
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.3 2011/10/09 22:29:44 marino Exp $
  install: install_static
  endif
  
-@@ -91,53 +91,51 @@ docs: force
+@@ -91,53 +91,50 @@ docs: force
  
  # Rule for installing the modules
  %_inst: force
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2011/10/09 22:29:44 marino Exp $
 +	${RM} ${DESTDIR}${xmllib}libxmlada_$**
  ifeq (${LIBRARY_TYPE},static)
 -	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
-+	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
++	${INSTALL} -m 644 $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
  else
  ifeq (${OS},Windows_NT)
 -	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
@@ -87,18 +87,17 @@ $NetBSD: patch-aa,v 1.3 2011/10/09 22:29:44 marino Exp $
 -	-${INSTALL} docs/xml.info ${datadir}/doc/xmlada
 -	${CHMOD} +x ${bindir}/xmlada-config
 -	${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
-+	${INSTALL} distrib/xmlada_shared.gpr         ${DESTDIR}${libdir}/gnat
-+	${INSTALL} distrib/xmlada.gpr                ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_dom.gpr            ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_sax.gpr            ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_input.gpr          ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_schema.gpr         ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_unicode.gpr        ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_shared.gpr  ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada.gpr         ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_dom.gpr     ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_sax.gpr     ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_input.gpr   ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_schema.gpr  ${DESTDIR}${libdir}/gnat/
++	${INSTALL} -m 644 distrib/xmlada_unicode.gpr ${DESTDIR}${libdir}/gnat/
 +	${INSTALL} xmlada-config  ${DESTDIR}${bindir}
-+	-${INSTALL} docs/xml.html ${DESTDIR}${datadir}/doc/xmlada
-+	-${INSTALL} docs/xml.info ${DESTDIR}${datadir}/doc/xmlada
-+	${CHMOD} +x ${DESTDIR}${bindir}/xmlada-config
-+	${INSTALL} distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
++	${INSTALL} -m 644 docs/xml.html ${DESTDIR}${datadir}/doc/xmlada
++	${INSTALL} -m 644 docs/xml.info ${DESTDIR}${datadir}/doc/xmlada
++	${INSTALL} -m 644 distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
  
  ## Do the installation for an explicit target
  install_static: 
diff --git a/textproc/xmlada/patches/patch-ac b/textproc/xmlada/patches/patch-ac
new file mode 100644
index 00000000000..e40588cdc26
--- /dev/null
+++ b/textproc/xmlada/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2011/12/03 07:30:48 marino Exp $
+
+--- sax/sax.gpr.orig	2011-10-08 19:18:44.000000000 +0000
++++ sax/sax.gpr
+@@ -9,6 +9,7 @@ project Sax is
+    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");
+ 
+    package Builder  renames Shared.Builder;
+    package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-ad b/textproc/xmlada/patches/patch-ad
new file mode 100644
index 00000000000..eba3a019055
--- /dev/null
+++ b/textproc/xmlada/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2011/12/03 07:30:48 marino Exp $
+
+--- dom/dom.gpr.orig	2011-11-11 12:40:42.991596000 +0000
++++ dom/dom.gpr
+@@ -10,6 +10,7 @@ project Dom is
+    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");
+ 
+    package Builder  renames Shared.Builder;
+    package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-ae b/textproc/xmlada/patches/patch-ae
new file mode 100644
index 00000000000..fc4306dc6a2
--- /dev/null
+++ b/textproc/xmlada/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2011/12/03 07:30:48 marino Exp $
+
+--- input_sources/input_sources.gpr.orig	2011-10-08 19:18:37.000000000 +0000
++++ input_sources/input_sources.gpr
+@@ -8,6 +8,7 @@ project Input_Sources is
+    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");
+ 
+    package Builder  renames Shared.Builder;
+    package Compiler renames Shared.Compiler;
diff --git a/textproc/xmlada/patches/patch-af b/textproc/xmlada/patches/patch-af
new file mode 100644
index 00000000000..95508a736c8
--- /dev/null
+++ b/textproc/xmlada/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2011/12/03 07:30:48 marino Exp $
+
+--- schema/schema.gpr.orig	2011-10-08 19:18:59.000000000 +0000
++++ schema/schema.gpr
+@@ -10,6 +10,7 @@ project Schema is
+    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");
+ 
+    package Builder  renames Shared.Builder;
+    package Compiler renames Shared.Compiler;