summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_rolling-replace
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2015-02-12 08:22:16 +0000
committerabs <abs@pkgsrc.org>2015-02-12 08:22:16 +0000
commit3c5571cd8b1fad7b2dbeecfde564ff2159217b31 (patch)
tree1686b805df6abc57c135e2e22e73f71f39163b44 /pkgtools/pkg_rolling-replace
parent532d5d8e3daf30f596d515d5c04940ffcf76fe01 (diff)
downloadpkgsrc-3c5571cd8b1fad7b2dbeecfde564ff2159217b31.tar.gz
Update to pkg_rolling-replace-0.24.2
Add -B - to pass -B to pkg_chk when determining which packages to update
Diffstat (limited to 'pkgtools/pkg_rolling-replace')
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile4
-rw-r--r--pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.810
-rwxr-xr-xpkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh8
3 files changed, 15 insertions, 7 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index e9ba6c2ceb6..691cc61b97e 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2015/02/12 08:22:16 abs Exp $
-PKGNAME= pkg_rolling-replace-0.24.1
+PKGNAME= pkg_rolling-replace-0.24.2
CATEGORIES= pkgtools
MAINTAINER= ngoffee@bbn.com
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.8 b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.8
index 6967659c654..dcc4cb29de3 100644
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.8
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_rolling-replace.8,v 1.19 2010/02/01 19:06:43 sno Exp $
+.\" $NetBSD: pkg_rolling-replace.8,v 1.20 2015/02/12 08:22:16 abs Exp $
.Dd February 1, 2010
.Dt PKG_ROLLING-REPLACE 8
.Os
@@ -7,7 +7,7 @@
.Nd rebuild or update packages using 'make replace' in tsorted order
.Sh SYNOPSIS
.Nm
-.Op Fl Fhknrsuv
+.Op Fl BFhknrsuv
.Op Fl D Ar VARIABLE=VALUE
.Op Fl L Ar path
.Op Fl X Ar pkgs
@@ -70,6 +70,12 @@ assuming the pkgsrc tree is more recent than the currently installed
packages.)
.Ss Options
.Bl -tag -width xxxxxxxx
+.It Fl B
+Pass
+.Dq -B
+to
+.Xl pkg_chk 8
+to also mark any packages with any change in build version data.
.It Fl D Ar VARIABLE=VALUE
Passes VARIABLE=VALUE to each make call.
.Dq -D
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index b907436cda3..896bf2d8c64 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_rolling-replace.sh,v 1.33 2012/10/03 22:14:03 wiz Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.34 2015/02/12 08:22:16 abs Exp $
#<license>
# Copyright (c) 2006 BBN Technologies Corp. All rights reserved.
#
@@ -102,6 +102,7 @@ usage()
{
echo "Usage: pkg_rolling-replace [opts]
-h This help
+ -B Pass -B to pkg_chk (only applies with -u)
-F Fetch sources (including depends) only, don't build
-k Keep running, even on error
-n Don't actually do make replace
@@ -150,7 +151,7 @@ OPC='rr>' # continuation
# supported. Newer versions may or may not work (patches welcome).
check_packages_mismatched()
{
- ${PKG_CHK} -u -q | while read line; do
+ ${PKG_CHK} -u -q $opt_B | while read line; do
# duplicate output of pkg_chk to stderr (bypass $(...) or `...`)
echo "${OPC} $line" 1>&2
# Look for the first thing that looks like pkg-version rather
@@ -332,13 +333,14 @@ EXCLUDE=
MAKE_VAR="IN_PKG_ROLLING_REPLACE=1"
MAKE_VAR_SEP=" "
-args=$(getopt FhknursvD:x:X:L: $*)
+args=$(getopt BFhknursvD:x:X:L: $*)
if [ $? -ne 0 ]; then
opt_h=1
fi
set -- $args
while [ $# -gt 0 ]; do
case "$1" in
+ -B) opt_B=-B ;;
-F) opt_F=1 ;;
-h) opt_h=1 ;;
-k) opt_k=1 ;;