pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk deprecate Zoularis: remove any tests for ZOULARIS* ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dd61ef7305b
branches:  trunk
changeset: 468469:3dd61ef7305b
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Feb 14 03:26:09 2004 +0000

description:
deprecate Zoularis: remove any tests for ZOULARIS* and bomb if
${LOCALBASE}/bsd/share/mk/zoularis.mk exists.

diffstat:

 mk/bsd.pkg.mk    |  24 ++++--------------------
 mk/bsd.prefs.mk  |  16 ++++++----------
 mk/defs.SunOS.mk |  20 +++++---------------
 3 files changed, 15 insertions(+), 45 deletions(-)

diffs (139 lines):

diff -r 6997744213a7 -r 3dd61ef7305b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Feb 14 03:17:35 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Feb 14 03:26:09 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1398 2004/02/14 02:28:19 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1399 2004/02/14 03:26:09 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -481,8 +481,8 @@
 MAKE_ENV+=             PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 MAKE_ENV+=             PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
 
-.if exists(${ZOULARISBASE}/bin/ftp)                    # Zoularis
-FETCH_CMD?=            ${ZOULARISBASE}/bin/ftp
+.if exists(${LOCALBASE}/bin/ftp)
+FETCH_CMD?=            ${LOCALBASE}/bin/ftp
 .else
 FETCH_CMD?=            /usr/bin/ftp
 .endif
@@ -783,12 +783,8 @@
 .endif
 
 # Check that we are using up-to-date pkg_* tools with this file.
-.PHONY: uptodate-pkgtools uptodate-zoularis
-.if defined(ZOULARIS_VERSION)
-uptodate-pkgtools: uptodate-zoularis
-.else
+.PHONY: uptodate-pkgtools
 uptodate-pkgtools:
-.endif
 .      if !defined(NO_PKGTOOLS_REQD_CHECK)
 .              if ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
 PKG_FAIL_REASON+='Error: The package tools installed on this system are out of date.'
@@ -799,18 +795,6 @@
 .              endif
 .      endif
 
-# Latest version of Zoularis required for this file.
-ZOULARIS_REQD=         20010323
-
-# Check that we are using up-to-date Zoularis.
-.if defined(ZOULARIS_VERSION)
-uptodate-zoularis:
-.      if ${ZOULARIS_VERSION} < ${ZOULARIS_REQD}
-PKG_FAIL_REASON+='Your Zoularis needs to be updated to the ${ZOULARIS_REQD:C|(....)(..)(..)|\1/\2/\3|} version.'
-PKG_FAIL_REASON+='The installed Zoularis was last updated on ${ZOULARIS_VERSION:C|(....)(..)(..)|\1/\2/\3|}.'
-.      endif
-.endif
-
 # Files to create for versioning and build information
 BUILD_VERSION_FILE=    ${WRKDIR}/.build_version
 BUILD_INFO_FILE=       ${WRKDIR}/.build_info
diff -r 6997744213a7 -r 3dd61ef7305b mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sat Feb 14 03:17:35 2004 +0000
+++ b/mk/bsd.prefs.mk   Sat Feb 14 03:26:09 2004 +0000
@@ -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 @@
 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=                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|/[^/]*/[^/]*$||}
diff -r 6997744213a7 -r 3dd61ef7305b mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Sat Feb 14 03:17:35 2004 +0000
+++ b/mk/defs.SunOS.mk  Sat Feb 14 03:26:09 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.79 2004/02/14 00:11:30 grant Exp $
+# $NetBSD: defs.SunOS.mk,v 1.80 2004/02/14 03:26:09 grant Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -26,7 +26,7 @@
 .if exists(${LOCALBASE}/bin/gtar)
 GTAR?=         ${LOCALBASE}/bin/gtar
 .else
-GTAR?=         ${ZOULARISBASE}/bin/tar
+GTAR?=         ${LOCALBASE}/bin/tar
 .endif
 .if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=   ${LOCALBASE}/bin/gunzip -f
@@ -49,10 +49,7 @@
 M4?=           /usr/ccs/bin/m4
 MAIL_CMD?=     /usr/bin/mailx
 MKDIR?=                /usr/bin/mkdir -p
-.if exists(${LOCALBASE}/sbin/mtree)
 MTREE?=                ${LOCALBASE}/sbin/mtree
-.endif
-MTREE?=                ${ZOULARISBASE}/bin/mtree
 MV?=           /usr/bin/mv
 NICE?=         /usr/xpg4/bin/nice
 .if exists(/usr/bin/gpatch)
@@ -181,16 +178,9 @@
 .endif
 
 LOCALBASE?=            ${DESTDIR}/usr/pkg
-.if !defined(ZOULARISBASE)
-.  if exists(${LOCALBASE}/bsd)
-ZOULARISBASE:=         ${LOCALBASE}/bsd
-.  else
-ZOULARISBASE:=         ${LOCALBASE}
-.  endif
-.endif
+
 .if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
-.elif exists(${ZOULARISBASE}/sbin/pkg_info)
-PKG_TOOLS_BIN?=                ${ZOULARISBASE}/sbin
+.else
+PKG_TOOLS_BIN?=                ${LOCALBASE}/bin
 .endif
-PKG_TOOLS_BIN?=                ${ZOULARISBASE}/bin



Home | Main Index | Thread Index | Old Index