summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/Makefile3
-rw-r--r--math/R-highr/DESCR3
-rw-r--r--math/R-highr/Makefile15
-rw-r--r--math/R-highr/distinfo5
-rw-r--r--math/R-knitr/Makefile4
-rw-r--r--textproc/Makefile3
6 files changed, 5 insertions, 28 deletions
diff --git a/math/Makefile b/math/Makefile
index 384f782b375..de6f2d96a93 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2014/09/19 21:21:16 brook Exp $
+# $NetBSD: Makefile,v 1.292 2014/09/19 22:34:44 brook Exp $
COMMENT= Mathematics
@@ -36,7 +36,6 @@ SUBDIR+= R-geoR
SUBDIR+= R-geoRglm
SUBDIR+= R-gstat
SUBDIR+= R-gtools
-SUBDIR+= R-highr
SUBDIR+= R-httpRequest
SUBDIR+= R-hwde
SUBDIR+= R-intervals
diff --git a/math/R-highr/DESCR b/math/R-highr/DESCR
deleted file mode 100644
index 0b2b1e82243..00000000000
--- a/math/R-highr/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package provides syntax highlighting for R source code. Currently
-it supports LaTeX and HTML output. Source code of other languages can
-be supported via Andre Simon's Highlight package.
diff --git a/math/R-highr/Makefile b/math/R-highr/Makefile
deleted file mode 100644
index 1a5ccf2806f..00000000000
--- a/math/R-highr/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/09/03 18:21:45 brook Exp $
-
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= ${R_HOMEPAGE_BASE}/highr/
-COMMENT= Syntax highlighting for R
-# TODO: LICENSE= GPL
-
-R_PKGNAME= highr
-R_PKGVER= 0.3
-
-.include "../../math/R/Makefile.extension"
-.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-highr/distinfo b/math/R-highr/distinfo
deleted file mode 100644
index ca7a71ba8c6..00000000000
--- a/math/R-highr/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2014/09/03 18:21:45 brook Exp $
-
-SHA1 (R/highr_0.3.tar.gz) = 6e853ba30d3a2a29decd11b178b682c54841669a
-RMD160 (R/highr_0.3.tar.gz) = fefe2ef73790979ff3b069a42861c6dbed29ea96
-Size (R/highr_0.3.tar.gz) = 16400 bytes
diff --git a/math/R-knitr/Makefile b/math/R-knitr/Makefile
index c541394ecef..bf8ebf9cf19 100644
--- a/math/R-knitr/Makefile
+++ b/math/R-knitr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/09/19 20:36:54 brook Exp $
+# $NetBSD: Makefile,v 1.3 2014/09/19 22:34:44 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-highr>=0.3:../../math/R-highr
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
REPLACE_RSCRIPT+= inst/bin/knit
REPLACE_RSCRIPT+= inst/examples/knit-all.R
diff --git a/textproc/Makefile b/textproc/Makefile
index 2b711ee86c4..995d5b37864 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.802 2014/09/19 21:21:17 brook Exp $
+# $NetBSD: Makefile,v 1.803 2014/09/19 22:34:44 brook Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -10,6 +10,7 @@ SUBDIR+= GutenMark-words
SUBDIR+= Markdown
SUBDIR+= OdfConverter
SUBDIR+= R-formatR
+SUBDIR+= R-highr
SUBDIR+= R-stringr
SUBDIR+= WordNet
SUBDIR+= aiksaurus