gmkin is now in R-Forge

- Update installation instructions
- Bump version, as this is a remarkable change
- Update Makefile and NEWS
- Fix building the manual using the Makefile, pandoc was not found by
  tools::buildVignettes

4 files changed, 28 insertions, 17 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index 7c7f47a..13aa5af 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,14 +1,14 @@
 Package: gmkin
 Type: Package
 Title: GUI for Fitting Kinetic Models to Chemical Degradation Data with mkin
-Version: 0.5-6
-Date: 2014-10-22
+Version: 0.5-7
+Date: 2014-10-27
 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), 
                     email = "jranke@uni-bremen.de"),
              person("Eurofins Regulatory AG", role = "cph"))
 Description: This package contains a browser based graphical user interface 
-  for R package mkin, based on the gWidgetsWWW2 package on GitHub
-  (http://github.com/jverzani/gWidgetsWWW2/)
+  for R package mkin, based on the gWidgetsWWW2 package. Both gmkin and
+  gWidgetsWWW2 are developed on GitHub, but also available from R-Forge.
 Depends: mkin (>= 0.9-32), gWidgetsWWW2
 Suggests: knitr, rmarkdown
 License: GPL
diff --git a/GNUmakefile b/GNUmakefile
index 0c74591..e8e3692 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -12,6 +12,7 @@ RBIN ?= $(shell dirname "`which R`")
 #
 # Specify static documentation directories for subversion on r-forge
 RFSVN ?= $(HOME)/svn/kinfit.r-forge
+RFDIR ?= $(RFSVN)/pkg/gmkin
 SDDIR ?= $(RFSVN)/www/gmkin_static
 
 .PHONY: help
@@ -63,7 +64,7 @@ check-no-vignettes: build-no-vignettes
 	mv $(TGZ) $(TGZVNR)
 
 vignettes/gmkin_manual.html: vignettes/gmkin_manual.Rmd
-	"$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/gmkin_manual.Rmd', dir = 'vignettes')"
+	"$(RBIN)/Rscript" -e "rmarkdown::render(input = 'vignettes/gmkin_manual.Rmd')"
 
 vignettes: vignettes/gmkin_manual.html
 
@@ -75,7 +76,9 @@ move-sd: sd
 	cp -r inst/web/* $(SDDIR); cp gmkin_screenshot.png $(SDDIR); cd $(SDDIR) && svn add --force .
 
 r-forge: move-sd
-	cd $(RFSVN) && svn commit -m 'update gmkin static documentation from github repository'
+	git archive master > $(HOME)/gmkin.tar;\
+	cd $(RFDIR) && rm -r `ls` && tar -xf $(HOME)/gmkin.tar;\
+	svn add --force .; cd $(RFSVN) && svn commit -m 'update gmkin from github repository'
 
 release: r-forge build
 	cp $(TGZ) $(RFSVN)/www/repo/src/contrib; scp $(TGZ) qnap:projects/gmkin
diff --git a/NEWS.md b/NEWS.md
index 3c8d852..677faae 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,9 @@
+# CHANGES in gmkin VERSION 0.5-7
+
+## NEW FEATURES
+
+- Installation is further simplified, as both gmkin and gWidgetsWWW2 are now available from R-Forge.
+
 # CHANGES in gmkin VERSION 0.5-6
 
 ## NEW FEATURES
diff --git a/README.md b/README.md
index 6088e39..2cf3760 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ anything, it needs a resolution of 1380x900 pixels.
 
 The R package gWidgetsWWW2 is not available on CRAN because it contains 
 path names with more then 100 characters in the JavaScript files which limits
-its portability.  Also, it attaches an R object called `app` to the global
-environment in R, which is not allowed by the CRAN package policy. It is not
+its portability.  Also, it attaches some R objects to the search path, which is, 
+in its current form, not fully in line with the CRAN package policy. It is not
 a widely used library for creating graphical user interfaces, is not supported 
 by a commercial company and was used for gmkin simply because it makes it
 possible to create a reasonably complex user interface by just writing R code.
@@ -40,33 +40,35 @@ installation, please refer to the respective [FAQ entry](http://cran.r-project.o
 ### Installing gmkin using an additional repository
 
 Windows and Linux users running R 3.1.0 or later can make use of the gmkin
-package repository on r-forge. If you would like to test gmkin just once, open
-the R console and issue the commands
+package repository on R-Forge. If you would like to install gmkin just once, 
+you can install it using the command
 
 ```s
-setRepositories(addURLs = c(gmkin_repo = "http://kinfit.r-forge.r-project.org/repo"))
-install.packages("gmkin")
+install.packages("gmkin", repos = c("http://r-forge.r-project.org", getOption("repos")))
 ```
 
-This should pull the gmkin package and its dependencies, notably the
+I you have not set your CRAN mirror yet, you may have to select one from the list.
+This adds the R-Forge repository to your package sources for this installation only.
+It should pull the gmkin package and its dependencies, notably the
 gWidgetsWWW2 package which is not available from the CRAN archive (see above).
 Mac users that have the necessary development files installed can probably 
 install from the source files in this repository (not tested).
 
 ### Keeping it current
 
-If you would like to pull in new versions of gmkin from time to time, you could
-add this repository to your startup options, e.g. by including a command like
+If you would like to pull in new versions of gmkin or gWidgetsWWW2 from time to
+time, you could add the R-Forge repository to your startup options, e.g. by
+including a command like
 
 ```s
 options(repos = c(CRAN = "http://cran.rstudio.com", 
-                  gmkin_repo = "http://kinfit.r-forge.r-project.org/repo"))
+                  "R-Forge" = "http://r-forge.r-project.org"))
 ```
 
 to your startup options, e.g. to your `.Rprofile` file. For details, please
 consult the help page for this, e.g. by typing `?Startup` in R.
 
-You can than update your packages including gmkin by using `update.packages()`,
+You can then update your packages including gmkin by using `update.packages()`,
 please see its help files for details.
 
 The latest changes to gmkin are recorded in the