diff options
32 files changed, 432 insertions, 108 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk index 28ed9e56b6c..4a81d2dd85e 100644 --- a/archivers/bzip2/buildlink2.mk +++ b/archivers/bzip2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2004/02/12 02:35:06 jlam Exp $ .if !defined(BZIP2_BUILDLINK2_MK) BZIP2_BUILDLINK2_MK= # defined @@ -28,13 +28,28 @@ _BUILTIN_BZIP2= 0 .endfor .if ${_BUILTIN_BZIP2} == "0" -_NEED_BZIP2= YES +_NEED_BZIP2= YES .else -_NEED_BZIP2= NO +_NEED_BZIP2= NO +.endif + +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_BZIP2} != 0 +_NEED_BZIP= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_BZIP= YES +.endif +.if !empty(PREFER_NATIVE:Mbzip2) && \ + ${_BUILTIN_BZIP2} != 0 +_NEED_BZIP= NO +.endif +.if !empty(PREFER_PKGSRC:Mbzip2) +_NEED_BZIP= YES .endif .if defined(USE_BZIP2) -_NEED_BZIP2= YES +_NEED_BZIP2= YES .endif .if ${_NEED_BZIP2} == "YES" diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index a8284bf9d32..57b813e838f 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ @@ -44,8 +44,18 @@ BUILDLINK_USE_BUILTIN.bzip2= YES BUILDLINK_USE_BUILTIN.bzip2= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbzip2) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.bzip2= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.bzip2= NO +.endif +.if !empty(PREFER_NATIVE:Mbzip2) && \ + !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.bzip2= YES +.endif +.if !empty(PREFER_PKGSRC:Mbzip2) BUILDLINK_USE_BUILTIN.bzip2= NO .endif diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk index ccb964c9021..7872c81b97d 100644 --- a/converters/libiconv/buildlink2.mk +++ b/converters/libiconv/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.17 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ .if !defined(ICONV_BUILDLINK2_MK) ICONV_BUILDLINK2_MK= # defined @@ -29,18 +29,32 @@ _BLNK_LIBICONV_FOUND= NO .endfor .if ${_BUILTIN_ICONV} == "YES" -_NEED_ICONV= NO +_NEED_ICONV= NO .else -_NEED_ICONV= YES +_NEED_ICONV= YES .endif +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_ICONV} == "YES" +_NEED_ICONV= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_ICONV= YES +.endif +.if !empty(PREFER_NATIVE:Miconv) && \ + ${_BUILTIN_ICONV} == "YES" +_NEED_ICONV= NO +.endif +.if !empty(PREFER_PKGSRC:Miconv) +_NEED_ICONV= YES +.endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ !empty(PREFER_PKGSRC:Miconv) -_NEED_ICONV= YES +_NEED_ICONV= YES .endif .if defined(USE_GNU_ICONV) -_NEED_ICONV= YES +_NEED_ICONV= YES .endif .if ${_NEED_ICONV} == "YES" diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index f72f13a3d36..d53caccf703 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -36,8 +36,18 @@ BUILDLINK_USE_BUILTIN.iconv= YES BUILDLINK_USE_BUILTIN.iconv= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Miconv) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.iconv= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.iconv= NO +.endif +.if !empty(PREFER_NATIVE:Miconv) && \ + !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.iconv= YES +.endif +.if !empty(PREFER_PKGSRC:Miconv) BUILDLINK_USE_BUILTIN.iconv= NO .endif diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk index a4e80734cc5..96240fc9fd3 100644 --- a/devel/binutils/buildlink2.mk +++ b/devel/binutils/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $ .if !defined(BINUTILS_BUILDLINK2_MK) BINUTILS_BUILDLINK2_MK= # defined @@ -31,8 +31,18 @@ _NEED_BINUTILS= NO _NEED_BINUTILS= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_BINUTILS} == "YES" +_NEED_BINUTILS= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_BINUTILS= YES +.endif +.if !empty(PREFER_NATIVE:Mbinutils) && \ + ${_BUILTIN_BINUTILS} == "YES" +_NEED_BINUTILS= NO +.endif +.if !empty(PREFER_PKGSRC:Mbinutils) _NEED_BINUTILS= YES .endif diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index 4dd4af7b804..0a763e11927 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -43,8 +43,18 @@ BUILDLINK_USE_BUILTIN.binutils= YES BUILDLINK_USE_BUILTIN.binutils= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= NO +.endif +.if !empty(PREFER_NATIVE:Mbinutils) && \ + !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= YES +.endif +.if !empty(PREFER_PKGSRC:Mbinutils) BUILDLINK_USE_BUILTIN.binutils= NO .endif diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk index 458a25bc3f0..1a093544492 100644 --- a/devel/cdk/buildlink2.mk +++ b/devel/cdk/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.9 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 02:35:06 jlam Exp $ .if !defined(CDK_BUILDLINK2_MK) CDK_BUILDLINK2_MK= # defined @@ -20,8 +20,18 @@ _NEED_CDK= NO _NEED_CDK= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mcdk) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_CDK} == "YES" +_NEED_CDK= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_CDK= YES +.endif +.if !empty(PREFER_NATIVE:Mcdk) && \ + ${_BUILTIN_CDK} == "YES" +_NEED_CDK= NO +.endif +.if !empty(PREFER_PKGSRC:Mcdk) _NEED_CDK= YES .endif diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk index 07592619993..bcbe65a48ea 100644 --- a/devel/gettext-lib/buildlink2.mk +++ b/devel/gettext-lib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.29 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.30 2004/02/12 02:35:06 jlam Exp $ .if !defined(GETTEXT_BUILDLINK2_MK) GETTEXT_BUILDLINK2_MK= # defined @@ -47,8 +47,18 @@ _NEED_GNU_GETTEXT= NO _NEED_GNU_GETTEXT= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mgettext) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_GETTEXT} == "YES" +_NEED_GNU_GETTEXT= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_GNU_GETTEXT= YES +.endif +.if !empty(PREFER_NATIVE:Mgettext) && \ + ${_BUILTIN_GETTEXT} == "YES" +_NEED_GNU_GETTEXT= NO +.endif +.if !empty(PREFER_PKGSRC:Mgettext) _NEED_GNU_GETTEXT= YES .endif diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index 9ed24b3d317..2016856b231 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -56,8 +56,18 @@ BUILDLINK_USE_BUILTIN.gettext= YES BUILDLINK_USE_BUILTIN.gettext= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mgettext) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.gettext= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.gettext= NO +.endif +.if !empty(PREFER_NATIVE:Mgettext) && \ + !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.gettext= YES +.endif +.if !empty(PREFER_PKGSRC:Mgettext) BUILDLINK_USE_BUILTIN.gettext= NO .endif diff --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk index 78634ad0da9..d2a528ae8ee 100644 --- a/devel/libevent/buildlink2.mk +++ b/devel/libevent/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:06 jlam Exp $ # # This Makefile fragment is included by packages that use libevent. # @@ -17,13 +17,23 @@ _BUILTIN_LIBEVENT= NO .endif .if ${_BUILTIN_LIBEVENT} == "YES" -_NEED_LIBEVENT= NO +_NEED_LIBEVENT= NO .else -_NEED_LIBEVENT= YES +_NEED_LIBEVENT= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibevent) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_LIBEVENT} == "YES" +_NEED_LIBEVENT= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_LIBEVENT= YES +.endif +.if !empty(PREFER_NATIVE:Mlibevent) && \ + ${_BUILTIN_LIBEVENT} == "YES" +_NEED_LIBEVENT= NO +.endif +.if !empty(PREFER_PKGSRC:Mlibevent) _NEED_LIBEVENT= YES .endif diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk index 1455fcc4305..71eb42bbb51 100644 --- a/devel/ncurses/buildlink2.mk +++ b/devel/ncurses/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.19 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 02:35:06 jlam Exp $ # # Optionally define: # @@ -62,14 +62,24 @@ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses} .endif .if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) -_NEED_NCURSES= NO +_NEED_NCURSES= NO .else -_NEED_NCURSES= YES +_NEED_NCURSES= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mncurses) -_NEED_NCURSES= YES +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_NCURSES} == "YES" +_NEED_NCURSES= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_NCURSES= YES +.endif +.if !empty(PREFER_NATIVE:Mncurses) && \ + ${_BUILTIN_NCURSES} == "YES" +_NEED_NCURSES= NO +.endif +.if !empty(PREFER_PKGSRC:Mncurses) +_NEED_NCURSES= YES .endif .if ${_NEED_NCURSES} == "YES" diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index d3f3df47188..e3a8854f906 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -97,8 +97,18 @@ BUILDLINK_USE_BUILTIN.ncurses= YES BUILDLINK_USE_BUILTIN.ncurses= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mncurses) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= NO +.endif +.if !empty(PREFER_NATIVE:Mncurses) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= YES +.endif +.if !empty(PREFER_PKGSRC:Mncurses) BUILDLINK_USE_BUILTIN.ncurses= NO .endif diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk index f395cbe82c7..8e2bc27d47d 100644 --- a/devel/readline/buildlink2.mk +++ b/devel/readline/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:06 jlam Exp $ # # Optionally define USE_GNU_READLINE to force use of GNU readline. # @@ -37,8 +37,18 @@ _NEED_GNU_READLINE= NO _NEED_GNU_READLINE= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mreadline) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_READLINE} == "YES" +_NEED_GNU_READLINE= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_GNU_READLINE= YES +.endif +.if !empty(PREFER_NATIVE:Mreadline) && \ + ${_BUILTIN_READLINE} == "YES" +_NEED_GNU_READLINE= NO +.endif +.if !empty(PREFER_PKGSRC:Mreadline) _NEED_GNU_READLINE= YES .endif diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index f64d39b6e48..b16b90e848b 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $ # # Optionally define USE_GNU_READLINE to force use of GNU readline. # @@ -45,8 +45,18 @@ BUILDLINK_USE_BUILTIN.readline= YES BUILDLINK_USE_BUILTIN.readline= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mreadline) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= NO +.endif +.if !empty(PREFER_NATIVE:Mreadline) && \ + !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= YES +.endif +.if !empty(PREFER_PKGSRC:Mreadline) BUILDLINK_USE_BUILTIN.readline= NO .endif diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk index 90bb8cc6efd..0a156635c07 100644 --- a/devel/zlib/buildlink2.mk +++ b/devel/zlib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ .if !defined(ZLIB_BUILDLINK2_MK) ZLIB_BUILDLINK2_MK= # defined @@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.zlib= YES BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${BUILDLINK_IS_BUILTIN.zlib} == "YES" +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif +.if !empty(PREFER_NATIVE:Mzlib) && \ + ${BUILDLINK_IS_BUILTIN.zlib} == "YES" +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO .endif diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 7b6653a13ff..c6175d794bf 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -75,8 +75,18 @@ BUILDLINK_USE_BUILTIN.zlib= YES BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif +.if !empty(PREFER_NATIVE:Mzlib) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO .endif diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 58ae99ab19e..c08966469bd 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ @@ -86,8 +86,18 @@ BUILDLINK_USE_BUILTIN.MesaLib= YES BUILDLINK_USE_BUILTIN.MesaLib= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MMesaLib) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.MesaLib= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.MesaLib= NO +.endif +.if !empty(PREFER_NATIVE:MMesaLib) && \ + !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.MesaLib= YES +.endif +.if !empty(PREFER_PKGSRC:MMesaLib) BUILDLINK_USE_BUILTIN.MesaLib= NO .endif diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk index 0f442ad7bfa..fed2614cd76 100644 --- a/graphics/freetype2/buildlink2.mk +++ b/graphics/freetype2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.16 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.17 2004/02/12 02:35:06 jlam Exp $ .if !defined(FREETYPE2_BUILDLINK2_MK) FREETYPE2_BUILDLINK2_MK= # defined @@ -45,7 +45,7 @@ _BUILTIN_FREETYPE2!= \ ${ECHO} "NO"; \ fi . endif -MAKEFLAGS+= _BUILTIN_FREETYPE=${_BUILTIN_FREETYPE} +MAKEFLAGS+= _BUILTIN_FREETYPE2=${_BUILTIN_FREETYPE2} .endif .if !empty(_BUILTIN_FREETYPE2:M[yY][eE][sS]) @@ -54,8 +54,18 @@ _NEED_FREETYPE2= NO _NEED_FREETYPE2= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mfreetype2) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_FREETYPE2} == "YES" +_NEED_FREETYPE2= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_FREETYPE2= YES +.endif +.if !empty(PREFER_NATIVE:Mfreetype2) && \ + ${_BUILTIN_FREETYPE2} == "YES" +_NEED_FREETYPE2= NO +.endif +.if !empty(PREFER_PKGSRC:Mfreetype2) _NEED_FREETYPE2= YES .endif diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 7ddaad003c6..8b8a87d7829 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ @@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.freetype2= YES BUILDLINK_USE_BUILTIN.freetype2= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mfreetype2) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= NO +.endif +.if !empty(PREFER_NATIVE:Mfreetype2) && \ + !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.freetype2= YES +.endif +.if !empty(PREFER_PKGSRC:Mfreetype2) BUILDLINK_USE_BUILTIN.freetype2= NO .endif diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 290e9b871c1..9d564bc993d 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ @@ -60,8 +60,18 @@ BUILDLINK_USE_BUILTIN.glu= YES BUILDLINK_USE_BUILTIN.glu= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mglu) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.glu= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.glu= NO +.endif +.if !empty(PREFER_NATIVE:Mglu) && \ + !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.glu= YES +.endif +.if !empty(PREFER_PKGSRC:Mglu) BUILDLINK_USE_BUILTIN.glu= NO .endif diff --git a/mail/libmilter/buildlink2.mk b/mail/libmilter/buildlink2.mk index c1d5790f352..6c7d8049c98 100644 --- a/mail/libmilter/buildlink2.mk +++ b/mail/libmilter/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:06 jlam Exp $ # # This Makefile fragment is included by packages that use libmilter. # @@ -28,8 +28,18 @@ _NEED_LIBMILTER= NO _NEED_LIBMILTER= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibmilter) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_LIBMILTER} == "YES" +_NEED_LIBMILTER= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_LIBMILTER= YES +.endif +.if !empty(PREFER_NATIVE:Mlibmilter) && \ + ${_BUILTIN_LIBMILTER} == "YES" +_NEED_LIBMILTER= NO +.endif +.if !empty(PREFER_PKGSRC:Mlibmilter) _NEED_LIBMILTER= YES .endif diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index b50fef00358..e3da7475cbc 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.213 2004/02/07 15:21:52 uebayasi Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.214 2004/02/12 02:35:06 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -120,13 +120,18 @@ PKGSRC_RUN_TEST?= no # Default: no PREFER_PKGSRC?= no +PREFER_NATIVE?= yes +# +# When building packages, whether to prefer the pkgsrc or native +# versions of software that's also part of the base system. Its value +# can be either yes/no, or a list of packages as named in the +# BUILDLINK_PACKAGES line in a package's buildlink[23].mk file. +# Preferences are determined by the most specific instance of the +# package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is +# specified in neither or in both variables, then PREFER_PKGSRC has +# precedence over PREFER_NATIVE. # -# When building packages, whether or not to prefer the pkgsrc versions of -# software that's also part of the base system. Its value can be either -# yes/no, or a list of packages as named in the BUILDLINK_PACKAGES line -# in a package's buildlink[23].mk file. # Possible: yes, no, or a list of packages -# Default: no #WRKOBJDIR= /usr/tmp # build here instead of in pkgsrc diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk index 5e89f709db8..991610b0cc5 100644 --- a/net/hesiod/buildlink2.mk +++ b/net/hesiod/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:06 jlam Exp $ .if !defined(HESIOD_BUILDLINK2_MK) HESIOD_BUILDLINK2_MK= # defined @@ -20,8 +20,18 @@ _NEED_HESIOD= NO _NEED_HESIOD= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mhesiod) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_HESIOD} == "YES" +_NEED_HESIOD= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_HESIOD= YES +.endif +.if !empty(PREFER_NATIVE:Mhesiod) && \ + ${_BUILTIN_HESIOD} == "YES" +_NEED_HESIOD= NO +.endif +.if !empty(PREFER_PKGSRC:Mhesiod) _NEED_HESIOD= YES .endif diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk index 2d72563273f..f4947ac123d 100644 --- a/net/libpcap/buildlink2.mk +++ b/net/libpcap/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:07 jlam Exp $ .if !defined(LIBPCAP_BUILDLINK2_MK) LIBPCAP_BUILDLINK2_MK= # defined @@ -20,8 +20,18 @@ _NEED_LIBPCAP= NO _NEED_LIBPCAP= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibpcap) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_LIBPCAP} == "YES" +_NEED_LIBPCAP= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_LIBPCAP= YES +.endif +.if !empty(PREFER_NATIVE:Mlibpcap) && \ + ${_BUILTIN_LIBPCAP} == "YES" +_NEED_LIBPCAP= NO +.endif +.if !empty(PREFER_PKGSRC:Mlibpcap) _NEED_LIBPCAP= YES .endif diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index 3a00ea7ece8..d0a036491d9 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -26,8 +26,18 @@ BUILDLINK_USE_BUILTIN.libpcap= YES BUILDLINK_USE_BUILTIN.libpcap= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibpcap) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.libpcap= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.libpcap= NO +.endif +.if !empty(PREFER_NATIVE:Mlibpcap) && \ + !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.libpcap= YES +.endif +.if !empty(PREFER_PKGSRC:Mlibpcap) BUILDLINK_USE_BUILTIN.libpcap= NO .endif diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk index f2348d0f858..c429fb3ae90 100644 --- a/security/PAM/buildlink2.mk +++ b/security/PAM/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:07 jlam Exp $ .if !defined(PAM_BUILDLINK2_MK) PAM_BUILDLINK2_MK= # defined @@ -20,8 +20,18 @@ _NEED_PAM= NO _NEED_PAM= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mpam) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_PAM} == "YES" +_NEED_PAM= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_PAM= YES +.endif +.if !empty(PREFER_NATIVE:Mpam) && \ + ${_BUILTIN_PAM} == "YES" +_NEED_PAM= NO +.endif +.if !empty(PREFER_PKGSRC:Mpam) _NEED_PAM= YES .endif diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index b80345cf8ab..eca8411f143 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -26,8 +26,18 @@ BUILDLINK_USE_BUILTIN.pam= YES BUILDLINK_USE_BUILTIN.pam= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mpam) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.pam= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.pam= NO +.endif +.if !empty(PREFER_NATIVE:Mpam) && \ + !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.pam= YES +.endif +.if !empty(PREFER_PKGSRC:Mpam) BUILDLINK_USE_BUILTIN.pam= NO .endif diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index a69fee08e9a..e18886777a0 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -80,8 +80,18 @@ BUILDLINK_USE_BUILTIN.heimdal= YES BUILDLINK_USE_BUILTIN.heimdal= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mheimdal) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.heimdal= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.heimdal= NO +.endif +.if !empty(PREFER_NATIVE:Mheimdal) && \ + !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.heimdal= YES +.endif +.if !empty(PREFER_PKGSRC:Mheimdal) BUILDLINK_USE_BUILTIN.heimdal= NO .endif diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk index 7d6e0412657..da625632074 100644 --- a/security/openssl/buildlink2.mk +++ b/security/openssl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.21 2004/02/12 02:35:07 jlam Exp $ .if !defined(OPENSSL_BUILDLINK2_MK) OPENSSL_BUILDLINK2_MK= # defined @@ -105,8 +105,18 @@ _NEED_OPENSSL= NO _NEED_OPENSSL= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mopenssl) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_OPENSSL} == "YES" +_NEED_OPENSSL= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_OPENSSL= YES +.endif +.if !empty(PREFER_NATIVE:Mopenssl) && \ + ${_BUILTIN_OPENSSL} == "YES" +_NEED_OPENSSL= NO +.endif +.if !empty(PREFER_PKGSRC:Mopenssl) _NEED_OPENSSL= YES .endif diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index a559c5a66f8..9596663d053 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -116,8 +116,18 @@ BUILDLINK_USE_BUILTIN.openssl= YES BUILDLINK_USE_BUILTIN.openssl= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mopenssl) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.openssl= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.openssl= NO +.endif +.if !empty(PREFER_NATIVE:Mopenssl) && \ + !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.openssl= YES +.endif +.if !empty(PREFER_PKGSRC:Mopenssl) BUILDLINK_USE_BUILTIN.openssl= NO .endif diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk index d20401f7c15..b84104bf4c6 100644 --- a/x11/Xrender/buildlink2.mk +++ b/x11/Xrender/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ .if !defined(XRENDER_BUILDLINK2_MK) XRENDER_BUILDLINK2_MK= # defined @@ -51,8 +51,18 @@ _NEED_XRENDER= NO _NEED_XRENDER= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_XRENDER} == "YES" +_NEED_XRENDER= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_XRENDER= YES +.endif +.if !empty(PREFER_NATIVE:MXrender) && \ + ${_BUILTIN_XRENDER} == "YES" +_NEED_XRENDER= NO +.endif +.if !empty(PREFER_PKGSRC:MXrender) _NEED_XRENDER= YES .endif diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 14249369e16..51c66796cd9 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -62,8 +62,18 @@ BUILDLINK_USE_BUILTIN.Xrender= YES BUILDLINK_USE_BUILTIN.Xrender= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= NO +.endif +.if !empty(PREFER_NATIVE:MXrender) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= YES +.endif +.if !empty(PREFER_PKGSRC:MXrender) BUILDLINK_USE_BUILTIN.Xrender= NO .endif |