From f8ec71fe13d16318a550afb09c2c9d3fd49f436f Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 3 Oct 2008 16:43:27 +0000
Subject: Install only the newer PostgreSQL 7.1+ driver. Add DESTDIR support.
 Bump revision.

---
 databases/unixodbc/Makefile         | 10 +++++++---
 databases/unixodbc/distinfo         |  3 ++-
 databases/unixodbc/patches/patch-ab | 12 ++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 databases/unixodbc/patches/patch-ab

(limited to 'databases/unixodbc')

diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 56b26f1cdb1..26fc3cbd4ed 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/09/19 09:39:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/03 16:43:27 joerg Exp $
 
 DISTNAME=	unixODBC-2.2.12
 PKGNAME=	${DISTNAME:S/ODBC/odbc/}
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
@@ -9,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.unixodbc.org/
 COMMENT=	ODBC 2.x/3.x driver manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		iodbc-[0-9]*
 
 USE_LIBTOOL=		YES
@@ -72,14 +75,15 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g'
 SUBST_STAGE.paths=	post-patch
 
+INSTALLATION_DIRS=	${EGDIR}
+
 post-patch: fix-driver-installation
 
 post-extract:
 	${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/odbc.ini ${EGDIR}/odbc.ini
+	${INSTALL_DATA} ${WRKDIR}/odbc.ini ${DESTDIR}${EGDIR}/odbc.ini
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo
index 2e06ce097ae..d96e87c6d03 100644
--- a/databases/unixodbc/distinfo
+++ b/databases/unixodbc/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/02/09 07:06:33 adam Exp $
+$NetBSD: distinfo,v 1.5 2008/10/03 16:43:27 joerg Exp $
 
 SHA1 (unixODBC-2.2.12.tar.gz) = d1cb286fb538c664549153165e2b9183b58a627b
 RMD160 (unixODBC-2.2.12.tar.gz) = 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16
 Size (unixODBC-2.2.12.tar.gz) = 2798077 bytes
 SHA1 (patch-aa) = c83d0febf01dc079b9bfcdffb7ec5b022cbb9d90
+SHA1 (patch-ab) = 76209187c65256a6fd7157c87600be6ce44ad407
diff --git a/databases/unixodbc/patches/patch-ab b/databases/unixodbc/patches/patch-ab
new file mode 100644
index 00000000000..40446b484f1
--- /dev/null
+++ b/databases/unixodbc/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2008/10/03 16:43:27 joerg Exp $
+
+--- Drivers/Makefile.in.orig	2008-10-03 18:00:19.000000000 +0200
++++ Drivers/Makefile.in
+@@ -205,7 +205,6 @@ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ @DRIVERS_TRUE@SUBDIRS = \
+-@DRIVERS_TRUE@    PostgreSQL \
+ @DRIVERS_TRUE@    Postgre7.1 \
+ @DRIVERS_TRUE@    txt \
+ @DRIVERS_TRUE@    odbc \
-- 
cgit v1.2.3