CVS commit: pkgsrc/pkgtools/R2pkg/files

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Wed Mar 11 16:13:35 UTC 2020

Modified Files:
        pkgsrc/pkgtools/R2pkg/files: R2pkg.R

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/pkgtools/R2pkg/files/R2pkg.R

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.29 pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.30
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.29    Mon Jan 13 18:09:20 2020
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.R Wed Mar 11 16:13:35 2020
@@ -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 @@ make.df.depends <- function(df, DEPENDS)
     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)