 @@ -1,14 +1,14 @@
-# $NetBSD: R2pkg.R,v 1.22 2019/10/19 18:43:51 rillig Exp $
+# $NetBSD: R2pkg.R,v 1.23 2019/10/19 19:10:31 rillig Exp $
+#
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #	Brook Milligan.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. Neither the name of the author nor the names of any contributors
 @@ -598,36 +598,26 @@ write.Makefile <- function(orig_mklines,
     varassign('LICENSE', license),
     '',
     dependencies[1],
     varassign('USE_LANGUAGES', use_languages),
     '',
     '.include "../../math/R/Makefile.extension"',
     dependencies[2],
     '.include "../../mk/bsd.pkg.mk"',
     recursive = TRUE)
   writeLines(lines, 'Makefile')
+}
 construct.line <- function(df,key,value)
   key <- df[df$key==key,'key']
   operator <- df[df$key==key,'operator']
   delimiter <- df[df$key==key,'delimiter']
   value <- df[df$key==key,value]
   df$new_line[df$key==key] <- paste0(key,operator,delimiter,value)
   df
 element <- function(mklines, varname, field, quiet=FALSE)
+{
   i <- match(varname, mklines$key, 0)
   if (i != 0 && mklines$key_value[i])
     return(mklines[i, field])
   if (!quiet)
+    {
       if (i == 0)
         level.warning(varname, ' not found')
       else
         level.warning(varname, ' is not a key-value field')
+    }
 @@ -675,57 +665,37 @@ make.new_license <- function(df,license)
 license.in.pkgsrc <- function(license) { license %in% sapply(licenses,'[',1) }
 make.license <- function(df)
+{
   # message('===> make.license():')
   old_license <- element(df,'LICENSE','old_value')
   old_todo <- element(df,'LICENSE','old_todo')
   new_license <- element(df,'LICENSE','new_value')
   old_known <- license.in.pkgsrc(old_license)
   new_known <- license.in.pkgsrc(new_license)
-  if (old_known && new_known)
+  license <- if (!old_known)
     paste0(new_license, '\t# [R2pkg] previously: ', old_license)
-      if (case.insensitive.equals(old_license,new_license))
+  else if (!new_known)
     paste0(old_license, '\t# [R2pkg] updated to: ', new_license)
-          license <- old_license
+  else if (case.insensitive.equals(old_license, new_license))
-          todo <- old_todo
+    old_license
       else
           license <- paste0(new_license,'\t# [R2pkg] previously: ',old_license)
           todo <- old_todo
   else if (old_known && !new_known)
       license <- paste0(old_license,'\t# [R2pkg] updated to: ',new_license)
       todo <- '# TODO: '
   else if (!old_known && new_known)
       license <- paste0(new_license,'\t# [R2pkg] previously: ',old_license)
       todo <- ''
   else
     paste0(new_license, '\t# [R2pkg] previously: ', old_license)
       license <- paste0(new_license,'\t# [R2pkg] previously: ',old_license)
       todo <- '# TODO: '
   df$value[df$key == 'LICENSE'] <- license
-  df$todo[df$key == 'LICENSE'] <- todo
+  df$todo[df$key == 'LICENSE'] <- if (new_known) old_todo else '# TODO: '
   df
+}
 make.r_pkgver <- function(df) element(df,'R_PKGVER','new_value')
 find.order <- function(df,key,field)
+{
   x <- df[,key]
   value <- match(TRUE,x)
   if (!is.na(value))
     value <- df[value,field]
   value

 @@ -1,14 +1,14 @@
-# $NetBSD: R2pkg_test.R,v 1.17 2019/10/19 18:43:51 rillig Exp $
+# $NetBSD: R2pkg_test.R,v 1.18 2019/10/19 19:10:31 rillig Exp $
+#
 # Copyright (c) 2019
 #	Roland Illig.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. Neither the name of the author nor the names of any contributors
 @@ -569,29 +569,26 @@ test_that('write.Makefile', {
         'CATEGORIES=\tcategory',
         '',
         'MAINTAINER=\t',  # FIXME
         'COMMENT=\tNA',  # FIXME
         'LICENSE=\tNA',  # FIXME
         '',
         'USE_LANGUAGES=\t# none',
         '',
         '.include "../../math/R/Makefile.extension"',
         '.include "../../mk/bsd.pkg.mk"'
     ))
 })
 # test_that('construct.line', {
 # })
 test_that('element', {
     mklines <- make_mklines(
         'COMMENT=\tThe comment',
         'EMPTY=')
     expect_equal(element(mklines, 'COMMENT', 'order'), 1)
     expect_equal(element(mklines, 'COMMENT', 'old_value'), 'The comment')
     expect_equal(element(mklines, 'UNKNOWN', 'order'), '???')  # FIXME: should be a number
     expect_equal(element(mklines, 'EMPTY', 'old_value'), '')
 })
 # test_that('make.categories', {
 # })
 @@ -609,28 +606,80 @@ test_that('make.comment', {
     mklines$new_value[[1]] <- 'old Comment'
     expect_equal(make.comment(mklines), 'Old comment')
 })
 # test_that('make.new_license', {
 # })
 # test_that('license.marked.todo', {
 # })
 # test_that('license.in.pkgsrc', {
 # })
-# test_that('make.license', {
+test_that('make.license, old and new known and equal', {
-# })
+    mklines <- make_mklines(
         'LICENSE=\tgnu-gpl-v2')
     mklines$new_value <- 'gnu-gpl-v2'
     updated <- make.license(mklines)
     expect_equal(updated$value, 'gnu-gpl-v2')
     expect_equal(updated$todo, '')
 })
 test_that('make.license, old and new known and changed', {
     mklines <- make_mklines(
         'LICENSE=\tgnu-gpl-v2')
     mklines$new_value <- 'gnu-gpl-v3'
     updated <- make.license(mklines)
     expect_equal(updated$value, 'gnu-gpl-v3\t# [R2pkg] previously: gnu-gpl-v2')
     expect_equal(updated$todo, '')
 })
 test_that('make.license, old known, new unknown', {
     mklines <- make_mklines(
         'LICENSE=\tgnu-gpl-v2')
     mklines$new_value <- 'unknown-license'
     updated <- make.license(mklines)
     expect_equal(updated$value, 'gnu-gpl-v2\t# [R2pkg] updated to: unknown-license')
     expect_equal(updated$todo, '# TODO: ')
 })
 test_that('make.license, old unknown, new known', {
     mklines <- make_mklines(
         'LICENSE=\tunknown-license')
     mklines$new_value <- 'gnu-gpl-v2'
     updated <- make.license(mklines)
     expect_equal(updated$value, 'gnu-gpl-v2\t# [R2pkg] previously: unknown-license')
     expect_equal(updated$todo, '')
 })
 test_that('make.license, old unknown, new also unknown', {
     mklines <- make_mklines(
         'LICENSE=\tunknown-license')
     mklines$new_value <- 'new-unknown'
     updated <- make.license(mklines)
     expect_equal(updated$value, 'new-unknown\t# [R2pkg] previously: unknown-license')
     expect_equal(updated$todo, '# TODO: ')
 })
 # test_that('make.r_pkgver', {
 # })
 test_that('find.order', {
     mklines <- make_mklines(
         'CATEGORIES=',
         'HOMEPAGE=',
         'USE_TOOLS+=',
         '.include "other.mk"',
         '# comment')
     vars_order <- find.order(mklines, 'key_value', 'order')