CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   brook
Date:           Wed Jul 31 20:46:05 UTC 2019

Modified Files:
        pkgsrc/doc: CHANGES-2019
        pkgsrc/print/R-knitr: Makefile distinfo

Log Message:
R-knitr: update to version 1.23.

Update to the canonical form of an R package and fix the LICENSE
field.


To generate a diff of this commit:
cvs rdiff -u -r1.3205 -r1.3206 pkgsrc/doc/CHANGES-2019
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/R-knitr/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/R-knitr/distinfo

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

Modified files:

Index: pkgsrc/doc/CHANGES-2019
diff -u pkgsrc/doc/CHANGES-2019:1.3205 pkgsrc/doc/CHANGES-2019:1.3206
--- pkgsrc/doc/CHANGES-2019:1.3205      Wed Jul 31 20:44:34 2019
+++ pkgsrc/doc/CHANGES-2019     Wed Jul 31 20:46:05 2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.3205 2019/07/31 20:44:34 brook Exp $
+$NetBSD: CHANGES-2019,v 1.3206 2019/07/31 20:46:05 brook Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -5162,3 +5162,4 @@ Changes to the packages collection and i
        Updated math/R-zoo to 1.8.6 [brook 2019-07-31]
        Updated misc/R-pillar to 1.4.2 [brook 2019-07-31]
        Updated net/R-pbdZMQ to 0.3.3 [brook 2019-07-31]
+       Updated print/R-knitr to 1.23 [brook 2019-07-31]

Index: pkgsrc/print/R-knitr/Makefile
diff -u pkgsrc/print/R-knitr/Makefile:1.6 pkgsrc/print/R-knitr/Makefile:1.7
--- pkgsrc/print/R-knitr/Makefile:1.6   Sat Jul 28 14:40:52 2018
+++ pkgsrc/print/R-knitr/Makefile       Wed Jul 31 20:46:05 2019
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2018/07/28 14:40:52 brook Exp $
+# $NetBSD: Makefile,v 1.7 2019/07/31 20:46:05 brook Exp $
 
-CATEGORIES=    print
+CATEGORIES=    print R
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      ${R_HOMEPAGE_BASE}/knitr/
 COMMENT=       General-purpose package for dynamic report generation in R
-LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3
+LICENSE=       gnu-gpl-v1 OR gnu-gpl-v2 OR gnu-gpl-v3
 
 R_PKGNAME=     knitr
-R_PKGVER=      1.15.1
+R_PKGVER=      1.23
 
 DEPENDS+=      R-evaluate>=0.10:../../devel/R-evaluate
+DEPENDS+=      R-xfun>=0.8:../../devel/R-xfun
 DEPENDS+=      R-digest>=0.6.4:../../security/R-digest
 DEPENDS+=      R-formatR>=0.10:../../textproc/R-formatR
-DEPENDS+=      R-highr>=0.3:../../textproc/R-highr
-DEPENDS+=      R-markdown>=0.6.5:../../textproc/R-markdown
+DEPENDS+=      R-highr>=0.8:../../textproc/R-highr
+DEPENDS+=      R-markdown>=1.0:../../textproc/R-markdown
 DEPENDS+=      R-stringr>=0.6:../../textproc/R-stringr
-DEPENDS+=      R-yaml>=2.1.5:../../textproc/R-yaml
+DEPENDS+=      R-yaml>=2.1.19:../../textproc/R-yaml
+
+USE_LANGUAGES= # none
 
 REPLACE_RSCRIPT+=      inst/bin/knit
 REPLACE_RSCRIPT+=      inst/examples/knit-all.R

Index: pkgsrc/print/R-knitr/distinfo
diff -u pkgsrc/print/R-knitr/distinfo:1.5 pkgsrc/print/R-knitr/distinfo:1.6
--- pkgsrc/print/R-knitr/distinfo:1.5   Sat Mar 11 12:42:19 2017
+++ pkgsrc/print/R-knitr/distinfo       Wed Jul 31 20:46:05 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/03/11 12:42:19 wen Exp $
+$NetBSD: distinfo,v 1.6 2019/07/31 20:46:05 brook Exp $
 
-SHA1 (R/knitr_1.15.1.tar.gz) = d1b33ad7682eb287918748217eaf872dc7a88aff
-RMD160 (R/knitr_1.15.1.tar.gz) = 8741a44082652d7335a3593ba5838fbca390dffc
-SHA512 (R/knitr_1.15.1.tar.gz) = 164ef112cac815c56eacfc57568fd9bce740b5a0436a689a59c23b502a37d5f12bf18932092845ddd42e6d4b38afffb4bcad9fe718d0f1e40b6075eb98592e92
-Size (R/knitr_1.15.1.tar.gz) = 1027808 bytes
+SHA1 (R/knitr_1.23.tar.gz) = 736badb51c0de0d51d9310989e74ceb99a97be53
+RMD160 (R/knitr_1.23.tar.gz) = 9045b9ef208cccd3bfab651c56006f869c2581f0
+SHA512 (R/knitr_1.23.tar.gz) = 8a612d7ae8417a83694992f107a258df6b849b2dfc1ad8d05190e889f620643abd0fa24a84ad8acd084c55b5d8ee259865591788bae2ea12a2c2f2249b0f84c5
+Size (R/knitr_1.23.tar.gz) = 880134 bytes