Also put libs in iodbc subdir, patch to ensure pkgconfigdir is not affected

bump PKGREVISION. Test built soprano

6 files changed, 99 insertions, 6 deletions

diff --git a/databases/iodbc/patches/patch-admin_Makefile.am b/databases/iodbc/patches/patch-admin_Makefile.am
new file mode 100644
index 00000000000..2f85c358dba
--- /dev/null
+++ b/databases/iodbc/patches/patch-admin_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-admin_Makefile.am,v 1.1 2012/03/15 14:50:56 abs Exp $
+
+--- admin/Makefile.am.orig	2009-09-09 22:01:16.000000000 +0000
++++ admin/Makefile.am
+@@ -76,7 +76,6 @@ EXTRA_DIST = \
+ 	$(srcdir)/libiodbc.spec.in \
+ 	$(srcdir)/libiodbc.pc.in
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libiodbc.pc
+ 
+ 
diff --git a/databases/iodbc/patches/patch-admin_Makefile.in b/databases/iodbc/patches/patch-admin_Makefile.in
new file mode 100644
index 00000000000..a9f88dbbf0d
--- /dev/null
+++ b/databases/iodbc/patches/patch-admin_Makefile.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-admin_Makefile.in,v 1.1 2012/03/15 14:50:56 abs Exp $
+
+--- admin/Makefile.in.orig	2009-09-10 14:34:57.000000000 +0000
++++ admin/Makefile.in
+@@ -254,6 +254,7 @@ inidir = @inidir@
+ install_sh = @install_sh@
+ lib_version = @lib_version@
+ libdir = @libdir@
++pkgconfigdir = @pkgconfigdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+@@ -280,7 +281,6 @@ EXTRA_DIST = \
+ 	$(srcdir)/libiodbc.spec.in \
+ 	$(srcdir)/libiodbc.pc.in
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libiodbc.pc
+ noinst_SCRIPTS = libiodbc.spec
+ all: all-am
diff --git a/databases/iodbc/patches/patch-configure b/databases/iodbc/patches/patch-configure
new file mode 100644
index 00000000000..54c3b973f6e
--- /dev/null
+++ b/databases/iodbc/patches/patch-configure
@@ -0,0 +1,49 @@
+$NetBSD: patch-configure,v 1.1 2012/03/15 14:50:56 abs Exp $
+
+--- configure.orig	2009-09-10 14:34:58.000000000 +0000
++++ configure
+@@ -891,6 +891,7 @@ DEFS
+ mandir
+ localedir
+ libdir
++pkgconfigdir
+ psdir
+ pdfdir
+ dvidir
+@@ -996,6 +997,7 @@ dvidir='${docdir}'
+ pdfdir='${docdir}'
+ psdir='${docdir}'
+ libdir='${exec_prefix}/lib'
++pkgconfigdir='${libdir}/pkgconfig'
+ localedir='${datarootdir}/locale'
+ mandir='${datarootdir}/man'
+ 
+@@ -1145,6 +1147,11 @@ do
+   -libdir=* | --libdir=* | --libdi=* | --libd=*)
+     libdir=$ac_optarg ;;
+ 
++  -pkgconfigdir | --pkgconfigdir | --pkgconfigdi | --pkgconfigd)
++    ac_prev=pkgconfigdir ;;
++  -pkgconfigdir=* | --pkgconfigdir=* | --pkgconfigdi=* | --pkgconfigd=*)
++    pkgconfigdir=$ac_optarg ;;
++
+   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+   | --libexe | --libex | --libe)
+     ac_prev=libexecdir ;;
+@@ -1381,7 +1388,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir pkgconfigdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1542,6 +1549,7 @@ Fine tuning of the installation director
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
++  --pkgconfigdir=DIR      pkgconfig [LIBDIR/pkgconfig]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
diff --git a/databases/iodbc/patches/patch-configure.in b/databases/iodbc/patches/patch-configure.in
new file mode 100644
index 00000000000..cc890e642a2
--- /dev/null
+++ b/databases/iodbc/patches/patch-configure.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-configure.in,v 1.1 2012/03/15 14:50:56 abs Exp $
+
+--- configure.in.orig	2009-09-10 13:08:59.000000000 +0000
++++ configure.in
+@@ -820,6 +820,7 @@ echo "${B}Installation paths${N}"
+ echo "AC_HELP_STRING(programs,		[${bindir}])"
+ echo "AC_HELP_STRING(include files, 	[${includedir}])"
+ echo "AC_HELP_STRING(libraries, 	[${libdir}])"
++echo "AC_HELP_STRING(pkgconfig, 	[${pkgconfigdir}])"
+ echo "AC_HELP_STRING(manual pages, 	[${mandir}])"
+ echo ""
+ echo "${B}Configuration files${N}"
diff --git a/databases/iodbc/patches/patch-aa b/databases/iodbc/patches/patch-include_sqltypes.h
index 19188d503a1..71033faad9a 100644
--- a/databases/iodbc/patches/patch-aa
+++ b/databases/iodbc/patches/patch-include_sqltypes.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2008/02/09 07:26:57 adam Exp $
+$NetBSD: patch-include_sqltypes.h,v 1.1 2012/03/15 14:50:56 abs Exp $
 
---- include/sqltypes.h.orig	2007-10-07 15:44:49.000000000 +0200
+--- include/sqltypes.h.orig	2009-09-09 20:06:24.000000000 +0000
 +++ include/sqltypes.h
-@@ -394,18 +394,7 @@ typedef unsigned short SQLWCHAR;
+@@ -400,18 +400,7 @@ typedef unsigned short SQLWCHAR;
  #else
  #  include <stdlib.h>
  
diff --git a/databases/iodbc/patches/patch-ac b/databases/iodbc/patches/patch-samples_Makefile.in
index 213145e7dd3..a8607fa767a 100644
--- a/databases/iodbc/patches/patch-ac
+++ b/databases/iodbc/patches/patch-samples_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2008/02/09 07:26:57 adam Exp $
+$NetBSD: patch-samples_Makefile.in,v 1.1 2012/03/15 14:50:56 abs Exp $
 
---- samples/Makefile.in.orig	2007-10-08 15:04:49.000000000 +0200
+--- samples/Makefile.in.orig	2009-09-10 14:34:57.000000000 +0000
 +++ samples/Makefile.in
-@@ -573,9 +573,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -627,9 +627,9 @@ uninstall-am: uninstall-binPROGRAMS
  
  
  install-exec-hook: