diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index b23d91989654..51fd7473db37 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -66,6 +66,8 @@ cran-auto-plist:
 .endif
 
 .if ${cran_ARGS:Mcompiles}
+NO_ARCH=	yes
+
 _USES_install+= 755:cran-strip
 cran-strip:
 	${FIND} ${STAGEDIR}${PREFIX}/${R_MOD_DIR} -name '*.so' -exec ${STRIP_CMD} {} +
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index de2b6fcd3179..e4b80dc8c613 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -23,6 +23,4 @@ TEST_DEPENDS=	R-cran-lmtest>0:finance/R-cran-lmtest \
 
 USES=		cran:auto-plist
 
-NO_ARCH=	yes
-
 .include <bsd.port.mk>
diff --git a/security/R-cran-openssl/Makefile b/security/R-cran-openssl/Makefile
index 8145e6f75595..a62780a6fb22 100644
--- a/security/R-cran-openssl/Makefile
+++ b/security/R-cran-openssl/Makefile
@@ -11,7 +11,10 @@ COMMENT=	Toolkit for Encryption, Signatures and Certificates Based on OpenSSL
 
 LICENSE=	MIT
 
-USES=		cran:auto-plist,compiles ssl
+TEST_DEPENDS=	bash:shells/bash
+
+USES=		cran:auto-plist,compiles shebangfix ssl
+SHEBANG_FILES=	${WRKSRC}/tests/google.dk/generate.bash
 
 R_POSTCMD_INSTALL_OPTIONS+=	--configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR=${OPENSSLLIB}"
 
diff --git a/textproc/R-cran-R2HTML/Makefile b/textproc/R-cran-R2HTML/Makefile
index d9444ae3b537..beec1676fc85 100644
--- a/textproc/R-cran-R2HTML/Makefile
+++ b/textproc/R-cran-R2HTML/Makefile
@@ -11,7 +11,6 @@ COMMENT=	HTML exportation for R objects
 
 LICENSE=	GPLv2
 
-USES=		cran
-NO_ARCH=	yes
+USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-R2HTML/pkg-plist b/textproc/R-cran-R2HTML/pkg-plist
deleted file mode 100644
index 51877d86a633..000000000000
--- a/textproc/R-cran-R2HTML/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-%%R_MOD_DIR%%/CITATION
-%%R_MOD_DIR%%/DESCRIPTION
-%%R_MOD_DIR%%/INDEX
-%%R_MOD_DIR%%/Meta/Rd.rds
-%%R_MOD_DIR%%/Meta/demo.rds
-%%R_MOD_DIR%%/Meta/hsearch.rds
-%%R_MOD_DIR%%/Meta/links.rds
-%%R_MOD_DIR%%/Meta/nsInfo.rds
-%%R_MOD_DIR%%/Meta/package.rds
-%%R_MOD_DIR%%/NAMESPACE
-%%R_MOD_DIR%%/NEWS
-%%R_MOD_DIR%%/R/R2HTML
-%%R_MOD_DIR%%/R/R2HTML.rdb
-%%R_MOD_DIR%%/R/R2HTML.rdx
-%%R_MOD_DIR%%/demo/dataframe.R
-%%R_MOD_DIR%%/demo/equations.R
-%%R_MOD_DIR%%/demo/grids.R
-%%R_MOD_DIR%%/doc/R2HTML.css
-%%R_MOD_DIR%%/doc/R2HTML.pdf
-%%R_MOD_DIR%%/doc/dynamic.html
-%%R_MOD_DIR%%/doc/dynamic_main.html
-%%R_MOD_DIR%%/doc/dynamic_menu.html
-%%R_MOD_DIR%%/doc/page1.html
-%%R_MOD_DIR%%/doc/page2.html
-%%R_MOD_DIR%%/doc/page3.html
-%%R_MOD_DIR%%/doc/page4.html
-%%R_MOD_DIR%%/help/AnIndex
-%%R_MOD_DIR%%/help/R2HTML.rdb
-%%R_MOD_DIR%%/help/R2HTML.rdx
-%%R_MOD_DIR%%/help/aliases.rds
-%%R_MOD_DIR%%/help/paths.rds
-%%R_MOD_DIR%%/html/00Index.html
-%%R_MOD_DIR%%/html/R.css
-%%R_MOD_DIR%%/output/ASCIIMathML.js
-%%R_MOD_DIR%%/output/Pastel.css
-%%R_MOD_DIR%%/output/R2HTML.css
-%%R_MOD_DIR%%/output/R2HTMLlogo.gif
-%%R_MOD_DIR%%/output/R2HTMLstuff.zip
-%%R_MOD_DIR%%/output/SciViews.css
-%%R_MOD_DIR%%/output/factor.gif
-%%R_MOD_DIR%%/output/gridR2HTML.css
-%%R_MOD_DIR%%/output/gridR2HTML.js
-%%R_MOD_DIR%%/output/numeric.gif
-%%R_MOD_DIR%%/output/runtime/lib/grid.js
-%%R_MOD_DIR%%/output/runtime/readme.txt
-%%R_MOD_DIR%%/output/runtime/styles/classic/Picasa.ini
-%%R_MOD_DIR%%/output/runtime/styles/classic/Thumbs.db
-%%R_MOD_DIR%%/output/runtime/styles/classic/gecko.xml
-%%R_MOD_DIR%%/output/runtime/styles/classic/grid.css
-%%R_MOD_DIR%%/output/runtime/styles/classic/grid.png
-%%R_MOD_DIR%%/output/runtime/styles/classic/icons.png
-%%R_MOD_DIR%%/output/runtime/styles/classic/loading.gif
-%%R_MOD_DIR%%/output/runtime/styles/flat/Picasa.ini
-%%R_MOD_DIR%%/output/runtime/styles/flat/Thumbs.db
-%%R_MOD_DIR%%/output/runtime/styles/flat/gecko.xml
-%%R_MOD_DIR%%/output/runtime/styles/flat/grid.css
-%%R_MOD_DIR%%/output/runtime/styles/flat/grid.png
-%%R_MOD_DIR%%/output/runtime/styles/flat/icons.png
-%%R_MOD_DIR%%/output/runtime/styles/flat/loading.gif
-%%R_MOD_DIR%%/output/runtime/styles/xp/Picasa.ini
-%%R_MOD_DIR%%/output/runtime/styles/xp/Thumbs.db
-%%R_MOD_DIR%%/output/runtime/styles/xp/gecko.xml
-%%R_MOD_DIR%%/output/runtime/styles/xp/grid.css
-%%R_MOD_DIR%%/output/runtime/styles/xp/grid.png
-%%R_MOD_DIR%%/output/runtime/styles/xp/icons.png
-%%R_MOD_DIR%%/output/runtime/styles/xp/loading.gif
-%%R_MOD_DIR%%/output/tablesort.htc
-%%R_MOD_DIR%%/samples/Pastel.css
-%%R_MOD_DIR%%/samples/R2HTML.css
-%%R_MOD_DIR%%/samples/essai-002.png
-%%R_MOD_DIR%%/samples/essai-004.png
-%%R_MOD_DIR%%/samples/essai-005.png
-%%R_MOD_DIR%%/samples/essai-006.png
-%%R_MOD_DIR%%/samples/example1-002.png
-%%R_MOD_DIR%%/samples/example1.html
-%%R_MOD_DIR%%/samples/example1.snw
-%%R_MOD_DIR%%/samples/example2-004.png
-%%R_MOD_DIR%%/samples/example2-007.png
-%%R_MOD_DIR%%/samples/example2.html
-%%R_MOD_DIR%%/samples/example2.snw
-%%R_MOD_DIR%%/samples/example3-001.png
-%%R_MOD_DIR%%/samples/example3-002.png
-%%R_MOD_DIR%%/samples/example3.html
-%%R_MOD_DIR%%/samples/example3.snw
-%%R_MOD_DIR%%/samples/index.html
-%%R_MOD_DIR%%/samples/toothbig.png