summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorbrook <brook@pkgsrc.org>2014-09-19 22:47:06 +0000
committerbrook <brook@pkgsrc.org>2014-09-19 22:47:06 +0000
commit11211589c670ff03e381af39c22bb279e1474392 (patch)
tree3107fe888997a1f58a8d953d478e627a0c36b0f3 /math
parentadcb479b3fb7e3fb7bef02455e1210c1ea03aa7a (diff)
downloadpkgsrc-11211589c670ff03e381af39c22bb279e1474392.tar.gz
Move math/R-markdown to textproc/R-markdown and fix dependencies.
Note: this commit is part of reorganizing some of the recently imported R packages, which are being reimported into more appropriate categories (and removed from math) as a result of a recent discussion on tech-pkg and privately with wiz@. See the thread starting with: http://mail-index.netbsd.org/tech-pkg/2014/09/05/msg013558.html
Diffstat (limited to 'math')
-rw-r--r--math/Makefile3
-rw-r--r--math/R-knitr/Makefile6
-rw-r--r--math/R-markdown/DESCR3
-rw-r--r--math/R-markdown/Makefile17
-rw-r--r--math/R-markdown/distinfo5
5 files changed, 4 insertions, 30 deletions
diff --git a/math/Makefile b/math/Makefile
index de6f2d96a93..84072615c33 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.292 2014/09/19 22:34:44 brook Exp $
+# $NetBSD: Makefile,v 1.293 2014/09/19 22:47:06 brook Exp $
COMMENT= Mathematics
@@ -43,7 +43,6 @@ SUBDIR+= R-knitr
SUBDIR+= R-lmm
SUBDIR+= R-mapproj
SUBDIR+= R-maps
-SUBDIR+= R-markdown
SUBDIR+= R-mvtnorm
SUBDIR+= R-ncdf
SUBDIR+= R-pixmap
diff --git a/math/R-knitr/Makefile b/math/R-knitr/Makefile
index bf8ebf9cf19..6a148454a6d 100644
--- a/math/R-knitr/Makefile
+++ b/math/R-knitr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/09/19 22:34:44 brook Exp $
+# $NetBSD: Makefile,v 1.4 2014/09/19 22:47:06 brook Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -13,10 +13,10 @@ R_PKGVER= 1.6
DEPENDS+= R-evaluate>=0.5.3:../../math/R-evaluate
DEPENDS+= R-digest>=0.6.4:../../math/R-digest
-DEPENDS+= R-markdown>=0.6.5:../../math/R-markdown
-DEPENDS+= R-stringr>=0.6:../../math/R-stringr
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-stringr>=0.6:../../textproc/R-stringr
REPLACE_RSCRIPT+= inst/bin/knit
REPLACE_RSCRIPT+= inst/examples/knit-all.R
diff --git a/math/R-markdown/DESCR b/math/R-markdown/DESCR
deleted file mode 100644
index 21674fe8bd9..00000000000
--- a/math/R-markdown/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Markdown is a plain-text formatting syntax that can be converted to
-XHTML or other formats. This package provides R bindings to the
-Sundown markdown rendering library.
diff --git a/math/R-markdown/Makefile b/math/R-markdown/Makefile
deleted file mode 100644
index 716eef60890..00000000000
--- a/math/R-markdown/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/09/03 18:33:02 brook Exp $
-
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= ${R_HOMEPAGE_BASE}/markdown/
-COMMENT= Markdown rendering for R
-LICENSE= gnu-gpl-v2
-
-R_PKGNAME= markdown
-R_PKGVER= 0.7.4
-
-DEPENDS+= R-mime>=0.1.1:../../math/R-mime
-
-.include "../../math/R/Makefile.extension"
-.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-markdown/distinfo b/math/R-markdown/distinfo
deleted file mode 100644
index 591c9d32339..00000000000
--- a/math/R-markdown/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2014/09/03 18:33:02 brook Exp $
-
-SHA1 (R/markdown_0.7.4.tar.gz) = b9c9ad8c8c5e95f3e5ca3800565d031675724505
-RMD160 (R/markdown_0.7.4.tar.gz) = 6da8227d2495431349adc944842f8143e8b12d23
-Size (R/markdown_0.7.4.tar.gz) = 77898 bytes