diff options
author | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
commit | ff939e0dc77366add1742d37d4ed3fb8f9a9aba1 (patch) | |
tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 | |
parent | 46884894e5707d65635b725e008cf5fe441040cd (diff) | |
download | pkgsrc-ff939e0dc77366add1742d37d4ed3fb8f9a9aba1.tar.gz |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
-rw-r--r-- | archivers/bzip2/buildlink3.mk | 40 | ||||
-rw-r--r-- | converters/libiconv/buildlink3.mk | 40 | ||||
-rw-r--r-- | devel/binutils/buildlink3.mk | 40 | ||||
-rw-r--r-- | devel/gettext-lib/buildlink3.mk | 40 | ||||
-rw-r--r-- | devel/ncurses/buildlink3.mk | 44 | ||||
-rw-r--r-- | devel/readline/buildlink3.mk | 46 | ||||
-rw-r--r-- | devel/zlib/buildlink3.mk | 40 | ||||
-rw-r--r-- | fonts/Xft2/buildlink3.mk | 34 | ||||
-rw-r--r-- | fonts/fontconfig/buildlink3.mk | 34 | ||||
-rw-r--r-- | graphics/MesaLib/buildlink3.mk | 34 | ||||
-rw-r--r-- | graphics/freetype2/buildlink3.mk | 34 | ||||
-rw-r--r-- | graphics/glu/buildlink3.mk | 34 | ||||
-rw-r--r-- | net/libpcap/buildlink3.mk | 34 | ||||
-rw-r--r-- | security/PAM/buildlink3.mk | 34 | ||||
-rw-r--r-- | security/heimdal/buildlink3.mk | 34 | ||||
-rw-r--r-- | security/openssl/buildlink3.mk | 34 | ||||
-rw-r--r-- | textproc/expat/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/Xrender/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/randrext/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/render/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/xcursor/buildlink3.mk | 34 |
22 files changed, 422 insertions, 378 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index 57b813e838f..818bb26f489 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ @@ -38,33 +38,35 @@ BUILDLINK_IS_BUILTIN.bzip2= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2} .endif -.if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.bzip2= YES -.else -BUILDLINK_USE_BUILTIN.bzip2= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.bzip2) +. if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.bzip2= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.bzip2= NO -.endif -.if !empty(PREFER_NATIVE:Mbzip2) && \ - !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) +. endif + +. 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:Mbzip2) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.bzip2= NO -.endif - -.if defined(USE_BZIP2) +. 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 +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= YES +. if defined(USE_BZIP2) +BUILDLINK_USE_BUILTIN.bzip2= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO]) diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index d53caccf703..100ea810a8c 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -30,33 +30,35 @@ BUILDLINK_IS_BUILTIN.iconv= NO . endif .endif -.if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES -.else -BUILDLINK_USE_BUILTIN.iconv= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.iconv) +. if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.iconv= NO -.endif -.if !empty(PREFER_NATIVE:Miconv) && \ - !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +. endif + +. 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:Miconv) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= NO -.endif - -.if defined(USE_GNU_ICONV) +. 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 +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.iconv= YES +. if defined(USE_GNU_ICONV) +BUILDLINK_USE_BUILTIN.iconv= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index 0a763e11927..e240ae1c192 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -37,33 +37,35 @@ BUILDLINK_IS_BUILTIN.binutils= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils} .endif -.if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.binutils= YES -.else -BUILDLINK_USE_BUILTIN.binutils= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.binutils) +. if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.binutils= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.binutils= NO -.endif -.if !empty(PREFER_NATIVE:Mbinutils) && \ - !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +. endif + +. 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:Mbinutils) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.binutils= NO -.endif - -.if defined(USE_BINUTILS) +. 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 +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.binutils= YES +. if defined(USE_BINUTILS) +BUILDLINK_USE_BUILTIN.binutils= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO]) diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index 2016856b231..9855b406820 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -50,33 +50,35 @@ BUILDLINK_IS_BUILTIN.gettext= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.gettext=${BUILDLINK_IS_BUILTIN.gettext} .endif -.if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.gettext= YES -.else -BUILDLINK_USE_BUILTIN.gettext= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.gettext) +. if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.gettext= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.gettext= NO -.endif -.if !empty(PREFER_NATIVE:Mgettext) && \ - !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS]) +. endif + +. 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:Mgettext) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.gettext= NO -.endif - -.if defined(USE_GNU_GETTEXT) +. 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 +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.gettext= YES +. if defined(USE_GNU_GETTEXT) +BUILDLINK_USE_BUILTIN.gettext= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO]) diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index f34004151d5..ecca05c1389 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -91,36 +91,38 @@ BUILDLINK_IS_BUILTIN.ncurses= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses} .endif -.if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= YES -.else -BUILDLINK_USE_BUILTIN.ncurses= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.ncurses) +. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.ncurses= NO -.endif -.if !empty(PREFER_NATIVE:Mncurses) && \ - !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +. endif + +. 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:Mncurses) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= NO -.endif - -.if defined(USE_NCURSES) -. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \ - !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS]) +. 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 -.endif -.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.ncurses= YES +. if defined(USE_NCURSES) +. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \ + !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= NO +. endif +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO]) diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index 973f7714165..483077bacc3 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/17 15:57:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+ @@ -98,37 +98,39 @@ BUILDLINK_IS_BUILTIN.readline= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.readline=${BUILDLINK_IS_BUILTIN.readline} .endif -.if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.readline:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.readline= YES -.else -BUILDLINK_USE_BUILTIN.readline= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.readline) +. if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.readline= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.readline= NO -.endif -.if !empty(PREFER_NATIVE:Mreadline) && \ - !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +. endif + +. 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:Mreadline) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.readline= NO -.endif - -.if defined(USE_GNU_READLINE) -. if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) && \ - !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \ - !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS]) +. 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 -.endif -.if !empty(BUILDLINK_CHECK_BUILTIN.readline:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.readline= YES +. if defined(USE_GNU_READLINE) +. if !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) && \ + !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \ + !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= NO +. endif +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.readline:M[nN][oO]) diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index c6175d794bf..c9f47b1d6e7 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -69,33 +69,35 @@ BUILDLINK_IS_BUILTIN.zlib!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.zlib=${BUILDLINK_IS_BUILTIN.zlib} .endif -.if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= YES -.else -BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.zlib) +. if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.zlib= NO -.endif -.if !empty(PREFER_NATIVE:Mzlib) && \ - !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +. endif + +. 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:Mzlib) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if defined(USE_ZLIB) +. 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 +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.zlib= YES +. if defined(USE_ZLIB) +BUILDLINK_USE_BUILTIN.zlib= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO]) diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 64bf108ebba..3b72cb9dad6 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/02/17 16:48:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -90,29 +90,31 @@ BUILDLINK_IS_BUILTIN.Xft2!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xft2=${BUILDLINK_IS_BUILTIN.Xft2} .endif -.if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.else -BUILDLINK_USE_BUILTIN.Xft2= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.Xft2) +. if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.Xft2= NO -.endif -.if !empty(PREFER_NATIVE:MXft2) && \ - !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.endif -.if !empty(PREFER_PKGSRC:MXft2) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:MXft2) && \ + !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES +. endif +. if !empty(PREFER_PKGSRC:MXft2) +BUILDLINK_USE_BUILTIN.Xft2= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[nN][oO]) diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk index 11f198032be..f1042c82f02 100644 --- a/fonts/fontconfig/buildlink3.mk +++ b/fonts/fontconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/18 14:58:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ @@ -64,29 +64,31 @@ MAKEFLAGS+= \ BUILDLINK_IS_BUILTIN.fontconfig=${BUILDLINK_IS_BUILTIN.fontconfig} .endif -.if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES -.else -BUILDLINK_USE_BUILTIN.fontconfig= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.fontconfig) +. if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.fontconfig= NO -.endif -.if !empty(PREFER_NATIVE:Mfontconfig) && \ - !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES -.endif -.if !empty(PREFER_PKGSRC:Mfontconfig) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mfontconfig) && \ + !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES +. endif +. if !empty(PREFER_PKGSRC:Mfontconfig) +BUILDLINK_USE_BUILTIN.fontconfig= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[nN][oO]) diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index c08966469bd..d26c3e04bab 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ @@ -80,29 +80,31 @@ BUILDLINK_IS_BUILTIN.MesaLib!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib} .endif -.if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.MesaLib= YES -.else -BUILDLINK_USE_BUILTIN.MesaLib= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.MesaLib) +. if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.MesaLib= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.MesaLib= NO -.endif -.if !empty(PREFER_NATIVE:MMesaLib) && \ - !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[yY][eE][sS]) +. endif + +. 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:MMesaLib) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.MesaLib= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[nN][oO]) diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 8b8a87d7829..58860fc6992 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ @@ -59,29 +59,31 @@ BUILDLINK_IS_BUILTIN.freetype2!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.freetype2=${BUILDLINK_IS_BUILTIN.freetype2} .endif -.if !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]I) +.if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.freetype2= YES -.else -BUILDLINK_USE_BUILTIN.freetype2= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.freetype2) +. if !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]I) BUILDLINK_USE_BUILTIN.freetype2= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.freetype2= NO -.endif -.if !empty(PREFER_NATIVE:Mfreetype2) && \ - !empty(BUILDLINK_IS_BUILTIN.freetype2:M[yY][eE][sS]) +. endif + +. 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:Mfreetype2) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.freetype2= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[nN][oO]) diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 9d564bc993d..90739f0c13a 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ @@ -54,29 +54,31 @@ BUILDLINK_IS_BUILTIN.glu!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.glu=${BUILDLINK_IS_BUILTIN.glu} .endif -.if !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.glu= YES -.else -BUILDLINK_USE_BUILTIN.glu= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.glu) +. if !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.glu= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.glu= NO -.endif -.if !empty(PREFER_NATIVE:Mglu) && \ - !empty(BUILDLINK_IS_BUILTIN.glu:M[yY][eE][sS]) +. endif + +. 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:Mglu) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.glu= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.glu:M[nN][oO]) diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index d0a036491d9..8acb18903c7 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -20,29 +20,31 @@ BUILDLINK_IS_BUILTIN.libpcap= YES . endif .endif -.if !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES -.else -BUILDLINK_USE_BUILTIN.libpcap= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.libpcap) +. if !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.libpcap= NO -.endif -.if !empty(PREFER_NATIVE:Mlibpcap) && \ - !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +. endif + +. 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:Mlibpcap) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.libpcap:M[nN][oO]) diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index eca8411f143..8716a50b62d 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -20,29 +20,31 @@ BUILDLINK_IS_BUILTIN.pam= YES . endif .endif -.if !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES -.else -BUILDLINK_USE_BUILTIN.pam= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.pam) +. if !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.pam= NO -.endif -.if !empty(PREFER_NATIVE:Mpam) && \ - !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +. endif + +. 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:Mpam) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.pam:M[nN][oO]) diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index e18886777a0..f7575d77e61 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -74,29 +74,31 @@ BUILDLINK_IS_BUILTIN.heimdal!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.heimdal=${BUILDLINK_IS_BUILTIN.heimdal} .endif -.if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES -.else -BUILDLINK_USE_BUILTIN.heimdal= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.heimdal) +. if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.heimdal= NO -.endif -.if !empty(PREFER_NATIVE:Mheimdal) && \ - !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +. endif + +. 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:Mheimdal) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[nN][oO]) diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 9596663d053..163bd2ab162 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -110,29 +110,31 @@ BUILDLINK_IS_BUILTIN.openssl!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.openssl=${BUILDLINK_IS_BUILTIN.openssl} .endif -.if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES -.else -BUILDLINK_USE_BUILTIN.openssl= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.openssl) +. if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.openssl= NO -.endif -.if !empty(PREFER_NATIVE:Mopenssl) && \ - !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +. endif + +. 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:Mopenssl) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) +. 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 .endif .if !defined(_NEED_NEWER_OPENSSL) diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index 6fdb602e5d1..db6d64d3d98 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 10:55:02 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+ @@ -61,29 +61,31 @@ BUILDLINK_IS_BUILTIN.expat!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.expat=${BUILDLINK_IS_BUILTIN.expat} .endif -.if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.else -BUILDLINK_USE_BUILTIN.expat= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.expat) +. if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.expat= NO -.endif -.if !empty(PREFER_NATIVE:Mexpat) && \ - !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.endif -.if !empty(PREFER_PKGSRC:Mexpat) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mexpat) && \ + !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES +. endif +. if !empty(PREFER_PKGSRC:Mexpat) +BUILDLINK_USE_BUILTIN.expat= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.expat:M[nN][oO]) diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index ad199baed04..b8b25a734c4 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/17 13:44:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -90,29 +90,31 @@ BUILDLINK_IS_BUILTIN.Xrandr!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrandr=${BUILDLINK_IS_BUILTIN.Xrandr} .endif -.if !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrandr= YES -.else -BUILDLINK_USE_BUILTIN.Xrandr= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.Xrandr) +. if !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrandr= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.Xrandr= NO -.endif -.if !empty(PREFER_NATIVE:MXrandr) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrandr= YES -.endif -.if !empty(PREFER_PKGSRC:MXrandr) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrandr= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:MXrandr) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrandr= YES +. endif +. if !empty(PREFER_PKGSRC:MXrandr) +BUILDLINK_USE_BUILTIN.Xrandr= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.Xrandr:M[nN][oO]) diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index e077a14f24c..ff677aecef0 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2004/02/17 13:44:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -92,29 +92,31 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender=${BUILDLINK_IS_BUILTIN.Xrender} .endif -.if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES -.else -BUILDLINK_USE_BUILTIN.Xrender= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.Xrender) +. if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.Xrender= NO -.endif -.if !empty(PREFER_NATIVE:MXrender) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +. endif + +. 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:MXrender) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) +. 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 .endif .if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[nN][oO]) diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk index f02cde9287a..3e4c7ecc2f0 100644 --- a/x11/randrext/buildlink3.mk +++ b/x11/randrext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/16 21:50:26 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RANDREXT_BUILDLINK3_MK:= ${RANDREXT_BUILDLINK3_MK}+ @@ -51,29 +51,31 @@ BUILDLINK_IS_BUILTIN.randrext!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.randrext=${BUILDLINK_IS_BUILTIN.randrext} .endif -.if !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.randrext= YES -.else -BUILDLINK_USE_BUILTIN.randrext= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.randrext) +. if !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.randrext= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.randrext= NO -.endif -.if !empty(PREFER_NATIVE:Mrandr) && \ - !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.randrext= YES -.endif -.if !empty(PREFER_PKGSRC:Mrandr) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.randrext= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.randrext:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mrandr) && \ + !empty(BUILDLINK_IS_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.randrext= YES +. endif +. if !empty(PREFER_PKGSRC:Mrandr) +BUILDLINK_USE_BUILTIN.randrext= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.randrext:M[nN][oO]) diff --git a/x11/render/buildlink3.mk b/x11/render/buildlink3.mk index cd4e3e039db..5ea88adf8ff 100644 --- a/x11/render/buildlink3.mk +++ b/x11/render/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/02/17 08:59:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RENDER_BUILDLINK3_MK:= ${RENDER_BUILDLINK3_MK}+ @@ -51,29 +51,31 @@ BUILDLINK_IS_BUILTIN.render!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.render=${BUILDLINK_IS_BUILTIN.render} .endif -.if !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.render= YES -.else -BUILDLINK_USE_BUILTIN.render= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.render) +. if !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.render= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.render= NO -.endif -.if !empty(PREFER_NATIVE:Mrender) && \ - !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.render= YES -.endif -.if !empty(PREFER_PKGSRC:Mrender) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.render= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.render:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mrender) && \ + !empty(BUILDLINK_IS_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.render= YES +. endif +. if !empty(PREFER_PKGSRC:Mrender) +BUILDLINK_USE_BUILTIN.render= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.render:M[nN][oO]) diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index eb4b52b6630..970f07eb7a8 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 16:27:54 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -54,29 +54,31 @@ BUILDLINK_IS_BUILTIN.xcursor!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.xcursor=${BUILDLINK_IS_BUILTIN.xcursor} .endif -.if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.else -BUILDLINK_USE_BUILTIN.xcursor= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.xcursor) +. if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.xcursor= NO -.endif -.if !empty(PREFER_NATIVE:Mxcursor) && \ - !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.endif -.if !empty(PREFER_PKGSRC:Mxcursor) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mxcursor) && \ + !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES +. endif +. if !empty(PREFER_PKGSRC:Mxcursor) +BUILDLINK_USE_BUILTIN.xcursor= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO]) |