[pkgsrc/trunk]: pkgsrc/mk/bulk Replaced all references to pkglint with lintpk...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mk/bulk Replaced all references to pkglint with lintpk...
From: rillig <rillig%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:39:50 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a27d9957c22d
branches:  trunk
changeset: 537179:a27d9957c22d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jan 04 15:49:07 2008 +0000

description:
Replaced all references to pkglint with lintpkgsrc, which has its own
package since a few days.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |   4 ++--
 mk/bulk/build           |  10 +++++-----
 mk/bulk/mksandbox       |  12 ++++++------
 mk/bulk/post-build      |   4 ++--
 mk/bulk/pre-build       |  36 ++++++++++++++++++------------------
 mk/bulk/printdepends    |   4 ++--
 mk/bulk/printindex      |   4 ++--
 mk/bulk/upload          |  18 +++++++++---------
 8 files changed, 46 insertions(+), 46 deletions(-)

diffs (298 lines):

diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Fri Jan 04 15:49:07 2008 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.147 2007/12/02 12:58:25 wiz Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.148 2008/01/04 15:49:07 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -254,7 +254,7 @@
 .else
        @${BULK_MSG} "Extracting database for SPECIFIC_PKGS subset of pkgsrc"
        @${BULK_MSG_CONT} "along with their dependencies"
-.  for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl5 pkgtools/pkglint
+.  for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl5 pkgtools/lintpkgsrc
        @if [ ! -d ${PKGSRCDIR}/${__tmp__} ]; then \
                ${BULK_MSG} "WARN: Skipping nonexisting directory ${__tmp__}"; \
                ${ECHO} " 0 ${__tmp__} 0" >> ${BULKFILESDIR:Q}/${BROKENFILE:Q}; \
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/build
--- a/mk/bulk/build     Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/build     Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.102 2007/06/15 15:52:22 rillig Exp $
+# $NetBSD: build,v 1.103 2008/01/04 15:49:07 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -206,7 +206,7 @@
        # Set the paths to commonly used directories.
        #
        pkgsrc_dir="${USR_PKGSRC}"
-       pkglint_dir="${USR_PKGSRC}/pkgtools/pkglint"
+       lintpkgsrc_dir="${USR_PKGSRC}/pkgtools/lintpkgsrc"
 
        #
        # Set up variables specific for the bulk build.
@@ -226,7 +226,7 @@
 # Check that the package tools are up to date.
 check_tools () {
        echo "build> Checking if the pkgtools are up-to-date"
-       ( cd "${pkglint_dir}"                           \
+       ( cd "${lintpkgsrc_dir}"                                \
          && ${BMAKE} fetch >/dev/null 2>&1
        ) || {
          echo "build> Updating pkgtools"
@@ -264,7 +264,7 @@
                AWK GREP MAIL_CMD MKDIR PERL5 SED
                PKG_DELETE PKG_INFO PKGBASE"
 
-       values=`cd "$pkglint_dir" && $BMAKE show-vars VARNAMES="$vars" USE_TOOLS="awk grep mail mkdir perl sed"`
+       values=`cd "$lintpkgsrc_dir" && $BMAKE show-vars VARNAMES="$vars" USE_TOOLS="awk grep mail mkdir perl sed"`
 
        for v in $vars; do
                eval "read $v" || die "Could not read value for $v"
@@ -277,7 +277,7 @@
 $values
 EOF
        echo "------------------------------------------"
-       [ "$PKGBASE" = "pkglint" ] \
+       [ "$PKGBASE" = "lintpkgsrc" ] \
        || die  "Error reading the variables." \
                "Try running $0 with another shell."
 
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/mksandbox
--- a/mk/bulk/mksandbox Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/mksandbox Fri Jan 04 15:49:07 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.46 2007/05/19 14:09:54 wiz Exp $
+# $NetBSD: mksandbox,v 1.47 2008/01/04 15:49:07 rillig Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -184,11 +184,11 @@
 sandbox=$1
 sandbox_script="$sandbox/sandbox"
 
-packages=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=PACKAGES)`
-distfiles=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=DISTDIR)`
-localbase=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALBASE)`
-pkg_dbdir=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=PKG_DBDIR)`
-localpatches=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALPATCHES)`
+packages=`(cd $pkgsrc/pkgtools/lintpkgsrc; $bmakeprog show-var VARNAME=PACKAGES)`
+distfiles=`(cd $pkgsrc/pkgtools/lintpkgsrc; $bmakeprog show-var VARNAME=DISTDIR)`
+localbase=`(cd $pkgsrc/pkgtools/lintpkgsrc; $bmakeprog show-var VARNAME=LOCALBASE)`
+pkg_dbdir=`(cd $pkgsrc/pkgtools/lintpkgsrc; $bmakeprog show-var VARNAME=PKG_DBDIR)`
+localpatches=`(cd $pkgsrc/pkgtools/lintpkgsrc; $bmakeprog show-var VARNAME=LOCALPATCHES)`
 
 test -d "$localpatches" || echo "WARNING: LOCALPATCHES directory does not exist - ignoring"
 
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/post-build
--- a/mk/bulk/post-build        Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/post-build        Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.69 2007/10/07 12:59:13 kano Exp $
+# $NetBSD: post-build,v 1.70 2008/01/04 15:49:08 rillig Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -137,7 +137,7 @@
 sub get_mk_conf_vars (@) {
        my ($rest);
 
-       open(I, "set -e; . '$BULK_BUILD_CONF'; . '$vars{USR_PKGSRC}/mk/bulk/post-build-conf'; export_config_vars; cd $vars{USR_PKGSRC}/pkgtools/pkglint && $BMAKE show-vars BATCH=1 VARNAMES='".join(' 
', @_)."' |")
+       open(I, "set -e; . '$BULK_BUILD_CONF'; . '$vars{USR_PKGSRC}/mk/bulk/post-build-conf'; export_config_vars; cd $vars{USR_PKGSRC}/pkgtools/lintpkgsrc && $BMAKE show-vars BATCH=1 
VARNAMES='".join(' ', @_)."' |")
                or pb_die(undef, "Cannot get mk.conf variables.");
 
        foreach my $var (@_) {
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/pre-build
--- a/mk/bulk/pre-build Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/pre-build Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.70 2007/07/21 12:48:31 adrianp Exp $
+# $NetBSD: pre-build,v 1.71 2008/01/04 15:49:08 rillig Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -21,50 +21,50 @@
 PKG_ADMIN="pkg_admin"
 PKG_INFO="pkg_info"
 
-PKGLINT_PKG_DIR=${USR_PKGSRC}/pkgtools/pkglint
+some_package_dir=${USR_PKGSRC}/pkgtools/lintpkgsrc
 
 # Extract the name of the files used for the build log and broken build log.
 # These have defaults set by bsd.bulk-pkg.mk and may be overridden in
 # /etc/mk.conf
-BULKFILESDIR=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BULKFILESDIR )`;
+BULKFILESDIR=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=BULKFILESDIR )`;
 if [ "$BULKFILESDIR" = "" ]; then
        echo "pre-build> Had problems determining the directory of .broken* files"
        exit 1
 fi
-BROKENF=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BROKENFILE )`;
+BROKENF=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=BROKENFILE )`;
 if [ "$BROKENF" = "" ]; then
        echo "pre-build> Had problems determining the name of the .broken files"
        exit 1
 fi
-NOTAVAILF=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=NOT_AVAILABLE_FILE )`;
+NOTAVAILF=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=NOT_AVAILABLE_FILE )`;
 if [ "$NOTAVAILF" = "" ]; then
        echo "pre-build> Had problems determining the name of the .bulk-not_available files"
        exit 1
 fi
-BRKWRKLOG=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BROKENWRKLOG )`;
+BRKWRKLOG=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=BROKENWRKLOG )`;
 if [ "$BRKWRKLOG" = "" ]; then
        echo "pre-build> Had problems determining the name of the .broken.work files"
        exit 1
 fi
-BLDLOG=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BUILDLOG )`;
+BLDLOG=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=BUILDLOG )`;
 if [ "$BLDLOG" = "" ]; then
        echo "pre-build> Had problems determining the name of the .make files"
        exit 1
 fi
-LINTPKGSRC_DB=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=LINTPKGSRC_DB )`;
+LINTPKGSRC_DB=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=LINTPKGSRC_DB )`;
 if [ "$LINTPKGSRC_DB" = "" ]; then
        echo "pre-build> Had problems determining the name of the .lintpkgsrc.db file"
        exit 1
 fi
-STARTFILE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=STARTFILE )`;
+STARTFILE=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=STARTFILE )`;
 if [ "$STARTFILE" = "" ]; then
        echo "pre-build> Had problems determining the name of the .start file"
        exit 1
 fi
 
-LOCALBASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=LOCALBASE )`;
-X11BASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=X11BASE )`;
-DISTDIR=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=DISTDIR )`;
+LOCALBASE=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=LOCALBASE )`;
+X11BASE=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=X11BASE )`;
+DISTDIR=`( cd ${some_package_dir} ; ${BMAKE} show-var VARNAME=DISTDIR )`;
 
 # Create ${BULKFILESDIR} if necessary
 echo "pre-build> Creating ${BULKFILESDIR} if necessary"
@@ -129,9 +129,9 @@
 #
 # Clean out everything and its mother
 #
-PKG_DBDIR=`(cd "${PKGLINT_PKG_DIR}" && ${BMAKE} show-var VARNAME=PKG_DBDIR)`
-DEPOTBASE=`(cd "${PKGLINT_PKG_DIR}" && ${BMAKE} show-var VARNAME=DEPOTBASE)`
-PKG_TOOLS_BIN=`(cd "${PKGLINT_PKG_DIR}" && ${BMAKE} show-var VARNAME=PKG_TOOLS_BIN)`
+PKG_DBDIR=`(cd "${some_package_dir}" && ${BMAKE} show-var VARNAME=PKG_DBDIR)`
+DEPOTBASE=`(cd "${some_package_dir}" && ${BMAKE} show-var VARNAME=DEPOTBASE)`
+PKG_TOOLS_BIN=`(cd "${some_package_dir}" && ${BMAKE} show-var VARNAME=PKG_TOOLS_BIN)`
 
 for dbdir in "${PKG_DBDIR}" "${DEPOTBASE}"; do
        echo "pre-build> Removing all installed packages in ${dbdir}"
@@ -197,12 +197,12 @@
 #
 # Remove old/broken distfiles and binary packages
 #
-PACKAGES=`( cd "${PKGLINT_PKG_DIR}" && ${BMAKE} show-var VARNAME=PACKAGES )`
+PACKAGES=`( cd "${some_package_dir}" && ${BMAKE} show-var VARNAME=PACKAGES )`
 
 case "$LINTPKGSRC_CACHE$PRUNEDISTFILES$PRUNEPACKAGES" in
 *yes*|*YES*)
-       # install pkglint to support any of these options
-       ( cd "${PKGLINT_PKG_DIR}" && ${BMAKE} PRECLEAN=yes bulk-install )
+       # install lintpkgsrc to support any of these options
+       ( cd "${USR_PKGSRC}/pkgtools/lintpkgsrc" && ${BMAKE} PRECLEAN=yes bulk-install )
        ;;
 esac
 
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/printdepends
--- a/mk/bulk/printdepends      Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/printdepends      Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printdepends,v 1.24 2007/01/08 21:36:07 rillig Exp $
+# $NetBSD: printdepends,v 1.25 2008/01/04 15:49:08 rillig Exp $
 #
 
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -112,7 +112,7 @@
 # Get additional system information
 #
 
-cd "${pkgsrcdir}/pkgtools/pkglint"
+cd "${pkgsrcdir}/pkgtools/lintpkgsrc"
 GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep`
 MKDIR=`${BMAKE} show-var VARNAME=MKDIR USE_TOOLS=mkdir`
 SED=`${BMAKE} show-var VARNAME=SED USE_TOOLS=sed`
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/printindex
--- a/mk/bulk/printindex        Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/printindex        Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printindex,v 1.30 2006/12/10 13:59:31 rillig Exp $
+# $NetBSD: printindex,v 1.31 2008/01/04 15:49:08 rillig Exp $
 #
 
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
 # Get additional system information
 #
 
-cd "${pkgsrcdir}/pkgtools/pkglint"
+cd "${pkgsrcdir}/pkgtools/lintpkgsrc"
 BULK_PREREQ=`${BMAKE} show-var VARNAME=BULK_PREREQ`
 GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep`
 MKDIR=`${BMAKE} show-var VARNAME=MKDIR USE_TOOLS=mkdir`
diff -r 873e9be6bde4 -r a27d9957c22d mk/bulk/upload
--- a/mk/bulk/upload    Fri Jan 04 15:42:34 2008 +0000
+++ b/mk/bulk/upload    Fri Jan 04 15:49:07 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.41 2007/10/09 19:19:13 martti Exp $
+# $NetBSD: upload,v 1.42 2008/01/04 15:49:08 rillig Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -151,9 +151,9 @@
 
 _INFO_VER=`${PKG_INFO} -V`;
 if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then
-       REQUIRED_PACKAGES="pkgtools/pkglint net/rsync security/audit-packages"
+       REQUIRED_PACKAGES="pkgtools/lintpkgsrc net/rsync security/audit-packages"
 else
-       REQUIRED_PACKAGES="pkgtools/pkglint net/rsync"
+       REQUIRED_PACKAGES="pkgtools/lintpkgsrc net/rsync"
 fi
 
 opsys=`uname -s`
@@ -229,11 +229,11 @@
 
 # May be different than $USR_PKGSRC:
 echo "upload> Running ${BMAKE} to get the pkgsrc variables"
-pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR`
-packages=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=PACKAGES`
-distdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DISTDIR`
-gzip_cmd=`cd pkgtools/pkglint; ${BMAKE} show-var VARNAME=GZIP_CMD USE_TOOLS=gzip`
-pkg_info=`cd pkgtools/pkglint && ${BMAKE} show-var VARNAME=PKG_INFO`
+pkgsrcdir=`cd pkgtools/lintpkgsrc ; ${BMAKE} show-var VARNAME=_PKGSRCDIR`
+packages=`cd pkgtools/lintpkgsrc ; ${BMAKE} show-var VARNAME=PACKAGES`
+distdir=`cd pkgtools/lintpkgsrc ; ${BMAKE} show-var VARNAME=DISTDIR`
+gzip_cmd=`cd pkgtools/lintpkgsrc; ${BMAKE} show-var VARNAME=GZIP_CMD USE_TOOLS=gzip`
+pkg_info=`cd pkgtools/lintpkgsrc && ${BMAKE} show-var VARNAME=PKG_INFO`
 
 # Pull in some pkgs needed
 for pkg in ${REQUIRED_PACKAGES}; do
@@ -260,7 +260,7 @@
 
 case $LINTPKGSRC_CACHE in
 yes|YES)
-       lintpkgsrc_cache="-I `cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=LINTPKGSRC_DB`"
+       lintpkgsrc_cache="-I `cd pkgtools/lintpkgsrc ; ${BMAKE} show-var VARNAME=LINTPKGSRC_DB`"
        ;;
 *)
        lintpkgsrc_cache=''
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang Full DESTDIR support for erlang packages.
Next by Date: [pkgsrc/trunk]: pkgsrc/misc/getopt Add DESTDIR support.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang Full DESTDIR support for erlang packages.
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc/getopt Add DESTDIR support.
Indexes:
Home | Main Index | Thread Index | Old Index