Import of pkgsrc-2015Q1

pkgtools/pkg_rolling-replace/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2014/03/03 04:50:47 obache 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
@@ -10,8 +10,6 @@ LICENSE=	modified-bsd
 DEPENDS+=	pkg_chk>=1.76:../../pkgtools/pkg_chk
 DEPENDS+=	pkg_tarup>=1.6.6:../../pkgtools/pkg_tarup
 
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
 USE_TOOLS+=	patch
 
 WRKSRC=		${WRKDIR}

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

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 ;;