[pkgsrc/trunk]: pkgsrc/pkgtools/R2pkg/files Select fields explicitly from df....

[brook <brook%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70655d0778e8
branches:  trunk
changeset: 412716:70655d0778e8
user:      brook <brook%pkgsrc.org@localhost>
date:      Wed Mar 11 16:13:35 2020 +0000

description:
Select fields explicitly from df.depends in make.df.depends().

The function make.df.depends() constructs a dataframe for DEPENDS lines in
the updated Makefile.  That dataframe is combined with other dataframes for
different portions of the Makefile.  Consequently, all the dataframes must
have the same fields or combining with rbind() fails.  Previously, the
dataframe had the wrong set of fields; this explicitly selects the correct
set that matches the other dataframes so that they can all be combined
correctly.

diffstat:

 pkgtools/R2pkg/files/R2pkg.R |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r a6fe3749b202 -r 70655d0778e8 pkgtools/R2pkg/files/R2pkg.R
--- a/pkgtools/R2pkg/files/R2pkg.R      Wed Mar 11 15:40:36 2020 +0000
+++ b/pkgtools/R2pkg/files/R2pkg.R      Wed Mar 11 16:13:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg.R,v 1.29 2020/01/13 18:09:20 rillig Exp $
+# $NetBSD: R2pkg.R,v 1.30 2020/03/11 16:13:35 brook Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -712,6 +712,8 @@
     df.depends$key <- NULL
     df.depends <- df.depends[!duplicated(df.depends),]
     df.depends$order <- find.order(df, 'depends', 'order')
+    fields <- c('new_line', 'order', 'category', 'depends', 'buildlink3.mk')
+    df.depends <- df.depends[,fields]
   }
   # message('===> df.depends:')
   # str(df.depends)