summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-04-25 01:11:11 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-04-25 01:11:11 +0000
commite0e6de4597a2079c59edd384a16eb3881a936aeb (patch)
treefe3bc851ed3dfde56acd924fc5b3a6392f559acc /databases
parente3db9d7b3c856d5e5414d1b7b92b1bc93c1ad1f2 (diff)
downloadpkgsrc-e0e6de4597a2079c59edd384a16eb3881a936aeb.tar.gz
bl3ify
Diffstat (limited to 'databases')
-rw-r--r--databases/unixodbc/Makefile4
-rw-r--r--databases/unixodbc/Makefile.common8
-rw-r--r--databases/unixodbc/buildlink3.mk21
3 files changed, 27 insertions, 6 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index e9d5ed0588f..3a7391941cc 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/25 01:11:11 xtraeme Exp $
PKGNAME= unixodbc-${ODBC_BASE_VERS}
PKGREVISION= 2
@@ -30,5 +30,5 @@ post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 0a7c387f161..45316372a7b 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/04/25 01:11:11 xtraeme Exp $
DISTNAME= unixODBC-${ODBC_DIST_VERS}
PKGREVISION= 1
@@ -16,7 +16,7 @@ HOMEPAGE?= http://www.unixodbc.org/
ODBC_DIST_VERS= 2.0.11
ODBC_BASE_VERS= ${ODBC_DIST_VERS}
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -58,8 +58,8 @@ fix-ltdl-and-lexlib:
${MV} -f $${file}.fixed $${file}; \
done
-.include "../../devel/libtool/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
CONFIGURE_ARGS+= --enable-gnuthreads
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
new file mode 100644
index 00000000000..544ec2019ac
--- /dev/null
+++ b/databases/unixodbc/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 01:11:11 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+UNIXODBC_BUILDLINK3_MK:= ${UNIXODBC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= unixodbc
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunixodbc}
+BUILDLINK_PACKAGES+= unixodbc
+
+.if !empty(UNIXODBC_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.unixodbc+= unixodbc>=2.0.11nb1
+BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc
+.endif # UNIXODBC_BUILDLINK3_MK
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}