diff options
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/buildlink2.mk | 39 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 70 |
2 files changed, 52 insertions, 57 deletions
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk index 90cbd93d28c..90bb8cc6efd 100644 --- a/devel/zlib/buildlink2.mk +++ b/devel/zlib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ .if !defined(ZLIB_BUILDLINK2_MK) ZLIB_BUILDLINK2_MK= # defined @@ -13,24 +13,6 @@ _ZLIB_H= /usr/include/zlib.h .if !defined(BUILDLINK_IS_BUILTIN.zlib) BUILDLINK_IS_BUILTIN.zlib= NO . if exists(${_ZLIB_H}) -BUILDLINK_IS_BUILTIN.zlib= YES -. endif -.endif - -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) -BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if defined(USE_ZLIB) -BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if !defined(BUILDLINK_USE_BUILTIN.zlib) -. if !empty(BUILDLINK_IS_BUILTIN.zlib:M[nN][oO]) -BUILDLINK_USE_BUILTIN.zlib= NO -. else -BUILDLINK_USE_BUILTIN.zlib= YES # # Create an appropriate name for the built-in package distributed # with the system. This package name can be used to check against @@ -67,14 +49,29 @@ _ZLIB_PKG= zlib-1.1.4nb1 . endif _ZLIB_DEPENDS= ${BUILDLINK_DEPENDS.zlib} -BUILDLINK_USE_BUILTIN.zlib!= \ +BUILDLINK_IS_BUILTIN.zlib!= \ if ${PKG_ADMIN} pmatch '${_ZLIB_DEPENDS}' ${_ZLIB_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi . endif -MAKEFLAGS+= BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib} +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.zlib=${BUILDLINK_IS_BUILTIN.zlib} +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.else +BUILDLINK_USE_BUILTIN.zlib= NO +.endif + +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mzlib) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif + +.if defined(USE_ZLIB) +BUILDLINK_USE_BUILTIN.zlib= NO .endif .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO]) diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index a8a54e96104..7b6653a13ff 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -19,27 +19,7 @@ _ZLIB_H= /usr/include/zlib.h BUILDLINK_IS_BUILTIN.zlib= NO . if exists(${_ZLIB_H}) BUILDLINK_IS_BUILTIN.zlib= YES -. endif -.endif - -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) -BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if defined(USE_ZLIB) -BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.zlib= YES -.endif - -.if !defined(BUILDLINK_USE_BUILTIN.zlib) -. if !empty(BUILDLINK_IS_BUILTIN.zlib:M[nN][oO]) -BUILDLINK_USE_BUILTIN.zlib= NO -. else -BUILDLINK_USE_BUILTIN.zlib= YES +. if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[nN][oO]) # # Create an appropriate name for the built-in package distributed # with the system. This package name can be used to check against @@ -67,27 +47,45 @@ _HAVE_CAN_2003_0107_FIX+= NetBSD-[2-9]*-* NetBSD-1[0-9]*-* # XXX zlib-1.1.4. # _HAVE_CAN_2003_0107_FIX+= FreeBSD-*-* OpenBSD-*-* -. if ${_ZLIB_VERSION} == "1.1.4" -. for _pattern_ in ${_HAVE_CAN_2003_0107_FIX} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. if ${_ZLIB_VERSION} == "1.1.4" +. for _pattern_ in ${_HAVE_CAN_2003_0107_FIX} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) _ZLIB_PKG= zlib-1.1.4nb1 -. endif -. endfor -. endif - -BUILDLINK_USE_BUILTIN.zlib?= YES -. for _depend_ in ${BUILDLINK_DEPENDS.zlib} -. if !empty(BUILDLINK_USE_BUILTIN.zlib:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.zlib!= \ +. endif +. endfor +. endif +. for _depend_ in ${BUILDLINK_DEPENDS.zlib} +. if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_IS_BUILTIN.zlib!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${_ZLIB_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi -. endif -. endfor +. endif +. endfor +. endif . endif -MAKEFLAGS+= BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib} +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.zlib=${BUILDLINK_IS_BUILTIN.zlib} +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.else +BUILDLINK_USE_BUILTIN.zlib= NO +.endif + +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mzlib) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif + +.if defined(USE_ZLIB) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif + +.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES .endif .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO]) |