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

bump PKGREVISION. Test built soprano

10 files changed, 118 insertions, 18 deletions

diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile
index 8d44bb110e6..eaf0d80e8fc 100644
--- a/databases/iodbc/Makefile
+++ b/databases/iodbc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/03/15 12:54:09 abs Exp $
+# $NetBSD: Makefile,v 1.20 2012/03/15 14:50:56 abs Exp $
 
 DISTNAME=	libiodbc-3.52.7
 PKGNAME=	${DISTNAME:S/^lib//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/
 
@@ -17,6 +17,8 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-gui
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/iodbc
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/iodbc
+CONFIGURE_ARGS+=	--pkgconfigdir=${PREFIX}/lib/pkgconfig
 CONFIGURE_ARGS+=	--with-iodbc-inidir=${PKG_SYSCONFDIR}
 
 DL_AUTO_VARS=		yes
diff --git a/databases/iodbc/PLIST b/databases/iodbc/PLIST
index fd57154f7b3..10cd6e7ba44 100644
--- a/databases/iodbc/PLIST
+++ b/databases/iodbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/15 12:54:09 abs Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/15 14:50:56 abs Exp $
 bin/iodbc-config
 bin/iodbctest
 bin/iodbctestw
@@ -13,10 +13,10 @@ include/iodbc/sql.h
 include/iodbc/sqlext.h
 include/iodbc/sqltypes.h
 include/iodbc/sqlucode.h
-lib/libiodbc.la
-lib/libiodbcinst.la
-lib/libodbc.a
-lib/libodbc.so
+lib/iodbc/libiodbc.la
+lib/iodbc/libiodbcinst.la
+lib/iodbc/libodbc.a
+lib/iodbc/libodbc.so
 lib/pkgconfig/libiodbc.pc
 man/man1/iodbc-config.1
 man/man1/iodbctest.1
diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk
index cf844a7f2a7..3bb393f9afa 100644
--- a/databases/iodbc/buildlink3.mk
+++ b/databases/iodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/03/15 12:54:09 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2012/03/15 14:50:56 abs Exp $
 
 BUILDLINK_TREE+=	iodbc
 
@@ -6,7 +6,8 @@ BUILDLINK_TREE+=	iodbc
 IODBC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
-BUILDLINK_INCDIRS.iodbc?=	${PG_SUBPREFIX}/include
+BUILDLINK_INCDIRS.iodbc?=	${PREFIX}/include
+BUILDLINK_LIBDIRS.iodbc?=	${PREFIX}/lib
 BUILDLINK_PKGSRCDIR.iodbc?=	../../databases/iodbc
 
 # ODBC drivers don't need these bits, but ODBC clients do.
diff --git a/databases/iodbc/distinfo b/databases/iodbc/distinfo
index 93ebb86245e..d8a140480b3 100644
--- a/databases/iodbc/distinfo
+++ b/databases/iodbc/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.7 2009/10/17 02:01:50 taca Exp $
+$NetBSD: distinfo,v 1.8 2012/03/15 14:50:56 abs Exp $
 
 SHA1 (libiodbc-3.52.7.tar.gz) = 53988878b6897d5ce7b8f62138f1f7e0e40b7d4f
 RMD160 (libiodbc-3.52.7.tar.gz) = 7bdac0e18dd65debd41059ceb59b4653bed4774b
 Size (libiodbc-3.52.7.tar.gz) = 1038710 bytes
-SHA1 (patch-aa) = 7fc72be935b3e19a836f20edf8efac05d22c643f
-SHA1 (patch-ac) = ff520f920c9aa9db44ce315219836dc4e98af9cd
+SHA1 (patch-admin_Makefile.am) = 50df99ec7a592b77b235c907e6b599f533466786
+SHA1 (patch-admin_Makefile.in) = 065fb31beacdf6a1cb4350fdfd5d8aedf99ae16f
+SHA1 (patch-configure) = 47df9401022a8cf4ad31a7de48bcccacde5befc2
+SHA1 (patch-configure.in) = dfcf36e845fbea146021bd3eb80a92e8225556d6
+SHA1 (patch-include_sqltypes.h) = 92db8703b7b88eb7e4ec8dca9c5dc3f207cc0234
+SHA1 (patch-samples_Makefile.in) = 59b8f2e03fe6c92d9e10f86cd57d5d563d0eaf14
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: