diff options
| author | grant <grant> | 2004-02-14 03:26:09 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-02-14 03:26:09 +0000 |
| commit | 63f0fe1817851233e09df823842933a602d14a13 (patch) | |
| tree | 0a0d8285b7065135afa920b361aa93034a68e680 /mk/bsd.prefs.mk | |
| parent | bf5e517fd8c0a5eef41994822a3aada469eee2f6 (diff) | |
| download | pkgsrc-63f0fe1817851233e09df823842933a602d14a13.tar.gz | |
deprecate Zoularis: remove any tests for ZOULARIS* and bomb if
${LOCALBASE}/bsd/share/mk/zoularis.mk exists.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 0bf6c3ee5c7..332e5da6294 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.151 2004/02/13 18:00:29 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.152 2004/02/14 03:26:09 grant Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -159,8 +159,7 @@ LOWER_ARCH?= ${MACHINE_GNU_ARCH} MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} -# Needed on NetBSD and SunOS (zoularis) to prevent an "install:" target -# from being created in bsd.own.mk. +# Needed to prevent an "install:" target from being created in bsd.own.mk. NEED_OWN_INSTALL_TARGET=no # This prevents default use of the cross-tool harness in the "src" tree, @@ -437,13 +436,10 @@ USE_BUILDLINK3?= no # default to not using buildlink3 USE_BUILDLINK3= yes # pkgviews requires buildlink3 .endif -.if (${OPSYS} == SunOS) && !defined(ZOULARIS_VERSION) -. if !exists(${ZOULARISBASE}/share/mk/zoularis.mk) -ZOULARIS_VERSION= 20000522 -. else -. include "${ZOULARISBASE}/share/mk/zoularis.mk" -. endif -MAKEFLAGS+= ZOULARIS_VERSION=${ZOULARIS_VERSION} +.if exists(${LOCALBASE}/bsd/share/mk/zoularis.mk) +PKG_FAIL_REASON+= 'You appear to have a deprecated Zoularis installation.' +PKG_FAIL_REASON+= 'Please update your system to bootstrap-pkgsrc and remove the' +PKG_FAIL_REASON+= '${LOCALBASE}/bsd directory.' .endif _PKGSRCDIR?= ${.CURDIR:C|/[^/]*/[^/]*$||} |