From 1495313243443dbbb2eaba7cb639ca400e1dab53 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Mon, 19 Oct 2009 08:37:39 +0000
Subject: Install include/unixodbc_conf.h to make include/sql.h header usable.

Bump PKGREVISION since PLIST has changed.
---
 databases/unixodbc/Makefile         |  3 ++-
 databases/unixodbc/PLIST            |  3 ++-
 databases/unixodbc/distinfo         |  4 ++--
 databases/unixodbc/patches/patch-aa | 17 +++++++++--------
 4 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'databases/unixodbc')

diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index e2459ad49b6..d3adcd64982 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2009/10/17 01:59:14 taca Exp $
+# $NetBSD: Makefile,v 1.25 2009/10/19 08:37:39 taca Exp $
 
 DISTNAME=	unixODBC-2.2.14
 PKGNAME=	${DISTNAME:S/ODBC/odbc/}
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST
index 8719e0f3078..419ce30ef54 100644
--- a/databases/unixodbc/PLIST
+++ b/databases/unixodbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/10/17 01:59:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/10/19 08:37:39 taca Exp $
 bin/dltest
 bin/isql
 bin/iusql
@@ -11,6 +11,7 @@ include/sql.h
 include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
+include/unixodbc_conf.h
 include/uodbc_extras.h
 include/uodbc_stats.h
 lib/libboundparam.la
diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo
index a393bb3d419..923eb19778a 100644
--- a/databases/unixodbc/distinfo
+++ b/databases/unixodbc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2009/10/17 01:59:15 taca Exp $
+$NetBSD: distinfo,v 1.8 2009/10/19 08:37:39 taca Exp $
 
 SHA1 (unixODBC-2.2.14.tar.gz) = ab18464c83d30d7b38b8bb58e1dd01e3ec211488
 RMD160 (unixODBC-2.2.14.tar.gz) = e2a2d2de636a8b2ee1002cac809ba2a38d7eb4de
 Size (unixODBC-2.2.14.tar.gz) = 2189755 bytes
-SHA1 (patch-aa) = 7be18cbd46160aaf0bc1f2db56cb8089970b403a
+SHA1 (patch-aa) = db3b99dc6afe4263c41423ef276dba8c98a55877
 SHA1 (patch-ab) = 7a35dcbc76b7d8b6b50bb1685180874f70c51141
 SHA1 (patch-ac) = 2e754242b2a1c90fb07e4cabb0bd537fd8eeb1a2
diff --git a/databases/unixodbc/patches/patch-aa b/databases/unixodbc/patches/patch-aa
index 19e6efd5a9c..0973bdbfa79 100644
--- a/databases/unixodbc/patches/patch-aa
+++ b/databases/unixodbc/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2009/10/17 01:59:15 taca Exp $
+$NetBSD: patch-aa,v 1.5 2009/10/19 08:37:39 taca Exp $
 
 --- Makefile.in.orig	2008-11-20 01:11:38.000000000 +0900
 +++ Makefile.in
-@@ -615,7 +615,7 @@ install-data: install-data-recursive
- uninstall: uninstall-recursive
+@@ -700,9 +700,6 @@ uninstall-info: uninstall-info-recursive
  
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
  
- installcheck: installcheck-recursive
- install-strip:
+ install-data-am:
+-	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
+-	-touch $(DESTDIR)${sysconfdir}/odbc.ini
+-	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
+ 	$(DESTDIR)${bindir}/odbc_config --header > $(DESTDIR)${includedir}/unixodbc_conf.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
cgit v1.2.3