diff options
Diffstat (limited to 'databases')
-rw-r--r-- | databases/db/buildlink3.mk | 12 | ||||
-rw-r--r-- | databases/db3/buildlink3.mk | 14 | ||||
-rw-r--r-- | databases/db4/buildlink3.mk | 17 | ||||
-rw-r--r-- | databases/dbxml/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/gnome-mime-data/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/libgda/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/libgnomedb/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/mysql-client/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/openldap/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/p5-DBI/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/postgresql-lib/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/rrdtool/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/tcl-postgresql/buildlink3.mk | 5 |
13 files changed, 41 insertions, 52 deletions
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index d2512a82cc8..7b76c35ce95 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+ @@ -16,12 +16,10 @@ BUILDLINK_PACKAGES+= db2 BUILDLINK_PKGBASE.db2?= db BUILDLINK_DEPENDS.db2+= db>=2.7.3 BUILDLINK_PKGSRCDIR.db2?= ../../databases/db - -.if defined(USE_DB185) -BUILDLINK_INCDIRS.db2?= include/db2 -BUILDLINK_TRANSFORM+= l:db:db2 -.endif - +. if defined(USE_DB185) +BUILDLINK_INCDIRS.db2?= include/db2 +BUILDLINK_TRANSFORM+= l:db:db2 +. endif .endif # DB_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index 69bd9f16bff..0ddccdba878 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 18:06:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db3 .endif @@ -13,12 +15,10 @@ BUILDLINK_PACKAGES+= db3 .if !empty(DB3_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 - -.if defined(USE_DB185) -BUILDLINK_INCDIRS.db3?= include/db3 -BUILDLINK_TRANSFORM+= l:db:db3 -.endif - +. if defined(USE_DB185) +BUILDLINK_INCDIRS.db3?= include/db3 +BUILDLINK_TRANSFORM+= l:db:db3 +. endif .endif # DB3_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 9a515cf7893..363385bf3af 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/03/12 21:35:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db4 .endif @@ -13,13 +15,12 @@ BUILDLINK_PACKAGES+= db4 .if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db4+= db4>=4.2.52 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 - -.if defined(USE_DB185) -BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 # older ones didn't enable 1.85 compat -BUILDLINK_INCDIRS.db4?= include/db4 -BUILDLINK_TRANSFORM+= l:db:db4 -.endif - +. if defined(USE_DB185) +BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 # older ones didn't enable + # db-1.85 compat +BUILDLINK_INCDIRS.db4?= include/db4 +BUILDLINK_TRANSFORM+= l:db:db4 +. endif .endif # DB4_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/dbxml/buildlink3.mk b/databases/dbxml/buildlink3.mk index 760c19d01c8..794b8486b1d 100644 --- a/databases/dbxml/buildlink3.mk +++ b/databases/dbxml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DBXML_BUILDLINK3_MK:= ${DBXML_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= dbxml .if !empty(DBXML_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.dbxml+= dbxml>=1.2.0 BUILDLINK_PKGSRCDIR.dbxml?= ../../databases/dbxml +.endif # DBXML_BUILDLINK3_MK .include "../../databases/db4/buildlink3.mk" .include "../../textproc/libpathan/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" -.endif # DBXML_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk index de2c610a1c5..c5f3b9b4ed8 100644 --- a/databases/gnome-mime-data/buildlink3.mk +++ b/databases/gnome-mime-data/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gnome-mime-data .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0 BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data +.endif # GNOME_MIME_DATA_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" -.endif # GNOME_MIME_DATA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk index cfcb2deece8..f68793294fb 100644 --- a/databases/libgda/buildlink3.mk +++ b/databases/libgda/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 14:00:29 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgda .if !empty(LIBGDA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgda+= libgda>=1.0.3 BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda +.endif # LIBGDA_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.endif # LIBGDA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk index 34024f41fc4..b17ebf9e0fa 100644 --- a/databases/libgnomedb/buildlink3.mk +++ b/databases/libgnomedb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 14:01:34 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgnomedb .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomedb+= libgnomedb>=1.0.3 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb +.endif # LIBGNOMEDB_BUILDLINK3_MK .include "../../databases/libgda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtksourceview/buildlink3.mk" -.endif # LIBGNOMEDB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk index 69fa5cd982c..955ea2c358e 100644 --- a/databases/mysql-client/buildlink3.mk +++ b/databases/mysql-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= mysql-client BUILDLINK_DEPENDS.mysql-client+= mysql-client>=3.23.58 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql +.endif # MYSQL_CLIENT_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # MYSQL_CLIENT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk index cb66ceb0733..7f06d3ba5d5 100644 --- a/databases/openldap/buildlink3.mk +++ b/databases/openldap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ @@ -15,6 +15,7 @@ BUILDLINK_PACKAGES+= openldap .if !empty(OPENLDAP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.openldap+= openldap>=2.1.22 BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap +.endif # OPENLDAP_BUILDLINK3_MK .if defined(USE_SASL2) && (${USE_SASL2} == "YES") . include "../../security/cyrus-sasl2/buildlink3.mk" @@ -23,6 +24,4 @@ BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap .endif .include "../../security/openssl/buildlink3.mk" -.endif # OPENLDAP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk index 80c46a2c73a..06d17796350 100644 --- a/databases/p5-DBI/buildlink3.mk +++ b/databases/p5-DBI/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/12 22:01:08 heinz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+ @@ -18,9 +18,8 @@ BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/auto/DBI # We want all of the arch-dependent DBI files. BUILDLINK_CONTENTS_FILTER.p5-DBI?= ${GREP} '/auto/DBI/' +.endif # P5_DBI_BUILDLINK3_MK .include "../../lang/perl5/buildlink3.mk" -.endif # P5_DBI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk index d2d293ccff5..44542141619 100644 --- a/databases/postgresql-lib/buildlink3.mk +++ b/databases/postgresql-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= postgresql-lib BUILDLINK_DEPENDS.postgresql-lib+= postgresql-lib>=7.3.1 BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql +.endif # POSTGRESQL_LIB_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" -.endif # POSTGRESQL_LIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk index 46fbad0209f..eede9d83d2c 100644 --- a/databases/rrdtool/buildlink3.mk +++ b/databases/rrdtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= rrdtool .if !empty(RRDTOOL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.rrdtool+= rrdtool>=1.0.40 BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool +.endif # RRDTOOL_BUILDLINK3_MK .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../www/cgilib/buildlink3.mk" -.endif # RRDTOOL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/tcl-postgresql/buildlink3.mk b/databases/tcl-postgresql/buildlink3.mk index b44389694ef..621864184d7 100644 --- a/databases/tcl-postgresql/buildlink3.mk +++ b/databases/tcl-postgresql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/17 15:45:49 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_POSTGRESQL_BUILDLINK3_MK:= ${TCL_POSTGRESQL_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= tcl-postgresql .if !empty(TCL_POSTGRESQL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tcl-postgresql+= tcl-postgresql>=7.3.1 BUILDLINK_PKGSRCDIR.tcl-postgresql?= ../../databases/tcl-postgresql +.endif # TCL_POSTGRESQL_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" -.endif # TCL_POSTGRESQL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |