diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
| commit | 317cc72791f8dcfcdd50f770e1ae9ccce68ddb47 (patch) | |
| tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /databases | |
| parent | e7133cac25a67cadb35ea338f0d9924c2a9da764 (diff) | |
| download | pkgsrc-317cc72791f8dcfcdd50f770e1ae9ccce68ddb47.tar.gz | |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/db/buildlink2.mk | 8 | ||||
| -rw-r--r-- | databases/db/buildlink3.mk | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk index 19ee559b856..299722efb3f 100644 --- a/databases/db/buildlink2.mk +++ b/databases/db/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:17:14 jlam Exp $ .if !defined(DB_BUILDLINK2_MK) DB_BUILDLINK2_MK= # defined @@ -35,11 +35,9 @@ _NEED_DB2= NO . endif .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mdb) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mdb) _NEED_DB2= YES -. endif .endif .if ${_NEED_DB2} == "YES" diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index fe0d69f34e9..ead05325e46 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,19 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB2_BUILDLINK3_MK:= ${DB2_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(DB2_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= db BUILDLINK_DEPENDS.db+= db>=2.7.3 BUILDLINK_PKGSRCDIR.db?= ../../databases/db .endif # DB2_BUILDLINK3_MK -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mdb) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mdb) BUILDLINK_USE_BUILTIN.db= NO -. endif .endif .if !defined(BUILDLINK_USE_BUILTIN.db) |