From 6aa29240e75d8d73f62a2033664a3e7ff3d01ac2 Mon Sep 17 00:00:00 2001
From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 13:21:33 +0000
Subject: [PATCH] tweaks for bulk builds

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@84 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 pkg/trunk/data/populate_licenses | 16 +++++++++++++
 pkg/trunk/data/populate_sysreq   | 39 ++++++++++++++++----------------
 pkg/trunk/exec/license           |  4 ++--
 pkg/trunk/exec/update_cache      |  2 +-
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/pkg/trunk/data/populate_licenses b/pkg/trunk/data/populate_licenses
index 37735a5..0a4878e 100644
--- a/pkg/trunk/data/populate_licenses
+++ b/pkg/trunk/data/populate_licenses
@@ -69,4 +69,20 @@ pkg UNCLEAR titecrm
 pkg UNCLEAR tlnise
 pkg UNLIMITED boolean
 pkg GPLQA regtest
+pkg GPL gllm
+pkg GPL rake
+pkg GPL Rigroup
+pkg GPL ICEinfer
+pkg GPL partsm
+pkg GPL timsac
+pkg GPL HTMLapplets
+pkg GPL moc
 ls
+pkg GPL ibdreg
+pkg AGPL accuracy
+pkg GPL TWIX
+pkg GPL aplpack
+accept distrib-noncomm
+accept GPL+ACM
+accept MCLUST
+accept UNCLEAR
diff --git a/pkg/trunk/data/populate_sysreq b/pkg/trunk/data/populate_sysreq
index f4db45b..17a9d49 100644
--- a/pkg/trunk/data/populate_sysreq
+++ b/pkg/trunk/data/populate_sysreq
@@ -1,32 +1,33 @@
 add build-essential gcc
 add build-essential gnu make
-add build-essential none
 add build-essential % if present
-add libquantlib0-dev quantlib%
-add pari-gp pari/gp
+add build-essential none
+add curl libcurl4-openssl-dev
+add ggobi ggobi
+add libatk1.0-dev atk
 add libcairo2-dev cairo
+add libdieharder-dev dieharder%
+add libfontconfig1-dev fontconfig
+add libfreetype6-dev freetype
+add libfreetype6-dev %freetype
 add libgd2-noxpm-dev libgd
-add libatk1.0-dev atk
-add libpango1.0-dev pango
-add libgtk2.0-dev gtk%
+add libgdal1-dev %gdal%
+add libgl1-mesa-dev opengl
 add libglade2-dev %glade
 add libglib2.0-dev glib
-add libgl1-mesa-dev opengl
 add libglu1-mesa-dev glu library
-add zlib1g-dev zlib
-add libpng12-dev libpng
-add libfreetype6-dev freetype
-add libgsl0-dev gnu scientific library
 add libgmp3-dev gmp
-add libgdal1-dev %gdal%
-add proj proj%
 add libgraphviz-dev graphviz
+add libgsl0-dev gnu gsl%
+add libgsl0-dev gnu scientific library
+add libgtk2.0-dev gtk%
+add libjpeg62-dev libjpeg%
 add libmagick9-dev imagemagick
-add curl libcurl4-openssl-dev
+add libpango1.0-dev pango
+add libpng12-dev libpng
+add libquantlib0-dev quantlib%
 add libxml2-dev libxml%
-add libfreetype6-dev %freetype
-add ggobi ggobi
-add libjpeg62-dev libjpeg%
-add libdieharder-dev dieharder%
 add msttcorefonts msttcorefonts
-add libfontconfig1-dev fontconfig
+add pari-gp pari/gp
+add proj proj%
+add zlib1g-dev zlib
diff --git a/pkg/trunk/exec/license b/pkg/trunk/exec/license
index e67ad3d..ece135a 100755
--- a/pkg/trunk/exec/license
+++ b/pkg/trunk/exec/license
@@ -78,7 +78,7 @@ exec_cmd <- function(argc, argv) {
         })())
         cleanup(tmp)
         if (inherits(success,'try-error')) {
-            stop(call.=F)
+            return()
         }
     } else if (cmd == 'view') {
         if (argc != 2) {
@@ -100,7 +100,7 @@ exec_cmd <- function(argc, argv) {
         })())
         cleanup(tmp)
         if (inherits(success,'try-error')) {
-            stop(call.=F)
+            return()
         }
     } else if (cmd == 'ls') {
         for (x in db_license_overrides()) print(x)
diff --git a/pkg/trunk/exec/update_cache b/pkg/trunk/exec/update_cache
index b7e7429..60c63c0 100755
--- a/pkg/trunk/exec/update_cache
+++ b/pkg/trunk/exec/update_cache
@@ -10,7 +10,7 @@ mirror <- 'http://cran.r-project.org/'
 
 message('updating list of available R packages...')
 available <- available.packages(contrib.url(mirror))
-#available <- rbind(available,available.packages(contrib.url('http://www.bioconductor.org/')))
+available <- rbind(available,available.packages(contrib.url('http://www.bioconductor.org/')))
 
 message('updating list of available R task views...')
 ctv.available <- available.views(repo=mirror)
-- 
2.39.5