[Gsrc-commit] trunk r4374: move r, adjust

[Carl Hansen]

------------------------------------------------------------
revno: 4374
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sun 2017-03-26 14:02:51 -0700
message:
  move r, adjust
removed:
  pkg/gnu/gnue.make.sh           
gnue.make.sh-20160617014725-uokjfnggs70iry9h-138
  pkg/gnu/guile-gnome-platform/files/ files-20160617014725-uokjfnggs70iry9h-982
  pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.2-fix-build.diff 
guilegnomeplatform2.-20160617014725-uokjfnggs70iry9h-2170
  pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.4-fix-build.diff 
guilegnomeplatform2.-20160617014725-uokjfnggs70iry9h-2171
  pkg/gnu/r/Makefile.old         
makefile.old-20160617014725-uokjfnggs70iry9h-1621
renamed:
  pkg/gnu/r/ => pkg/other/r/ r-20160617014725-uokjfnggs70iry9h-298
modified:
  pkg/gnu/fdisk/sha256sums       sha256sums-20160617014725-uokjfnggs70iry9h-622
  pkg/gnu/guile-gnome-platform/Makefile 
makefile-20160617014725-uokjfnggs70iry9h-981
  pkg/gnu/guile-gnome-platform/gpg-keyring 
gpgkeyring-20160617014725-uokjfnggs70iry9h-983
  pkg/gnu/guile-gnome-platform/sha256sums 
sha256sums-20160617014725-uokjfnggs70iry9h-986
  pkg/gnu/guile-gtksourceview/Makefile 
makefile-20160617014725-uokjfnggs70iry9h-990
  pkg/other/r/Makefile           makefile-20160617014725-uokjfnggs70iry9h-1617

=== modified file 'pkg/gnu/fdisk/sha256sums'
--- a/pkg/gnu/fdisk/sha256sums  2016-10-13 08:27:28 +0000
+++ b/pkg/gnu/fdisk/sha256sums  2017-03-26 21:02:51 +0000
@@ -1,3 +0,0 @@
-c963d84dff11c41210fff994742e9f90a72dfdcb0481bcc4b530223ed3511fb5  
download/gnufdisk-2.0.0a1.tar.gz
-390a11e3364f588514c2cc88f866601a63bbec6e04acf4031cb18ea5260e37f5  
download/gnufdisk-2.0.0a1-add-info-dir-entry.diff
-974a2a21436a5e6161985a12f60d6c6275d52910cd112b9478ae36ef28b6128e  
download/gnufdisk-2.0.0a1.tar.gz.sig

=== removed file 'pkg/gnu/gnue.make.sh'
--- a/pkg/gnu/gnue.make.sh      2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gnue.make.sh      1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-make -C gnue-appserver/   install
-make -C gnue-common/   install
-make -C gnue-designer/   install
-make -C gnue-forms/   install
-make -C gnue-navigator/   install
-make -C gnue-reports/   install

=== modified file 'pkg/gnu/guile-gnome-platform/Makefile'
--- a/pkg/gnu/guile-gnome-platform/Makefile     2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/guile-gnome-platform/Makefile     2017-03-26 21:02:51 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2016 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #

=== removed directory 'pkg/gnu/guile-gnome-platform/files'
=== removed file 
'pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.2-fix-build.diff'
--- 
a/pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.2-fix-build.diff 
    2016-06-17 19:08:15 +0000
+++ 
b/pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.2-fix-build.diff 
    1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-diff -x config.log -x config.status -ru 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c
---- 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c  
   2011-12-09 13:02:10.000000000 +0100
-+++ 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c  
   2012-12-16 14:33:37.272336113 +0100
-@@ -24,7 +24,7 @@
- 
- #include <guile-gnome-corba-generic.h>
- #include <guile-gnome-gobject.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <string.h>
- 
- static GQuark quark_corba_typecode = 0;
-diff -x config.log -x config.status -ru 
work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h 
work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h
---- work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h        
2012-05-07 17:29:35.000000000 +0200
-+++ work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h        
2012-12-16 14:32:16.455649093 +0100
-@@ -24,7 +24,7 @@
- #ifndef __GUILE_SUPPORT_H__
- #define __GUILE_SUPPORT_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <libguile.h>
- 

=== removed file 
'pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.4-fix-build.diff'
--- 
a/pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.4-fix-build.diff 
    2016-06-17 19:08:15 +0000
+++ 
b/pkg/gnu/guile-gnome-platform/files/guile-gnome-platform-2.16.4-fix-build.diff 
    1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-diff -x config.log -x config.status -ru 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c
---- 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c  
   2011-12-09 13:02:10.000000000 +0100
-+++ 
work/guile-gnome-platform-2.16.2/corba/gnome/corba/guile-gnome-corba-generic.c  
   2012-12-16 14:33:37.272336113 +0100
-@@ -24,7 +24,7 @@
- 
- #include <guile-gnome-corba-generic.h>
- #include <guile-gnome-gobject.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <string.h>
- 
- static GQuark quark_corba_typecode = 0;
-diff -x config.log -x config.status -ru 
work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h 
work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h
---- work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h        
2012-05-07 17:29:35.000000000 +0200
-+++ work/guile-gnome-platform-2.16.2/glib/gnome/gobject/guile-support.h        
2012-12-16 14:32:16.455649093 +0100
-@@ -24,7 +24,7 @@
- #ifndef __GUILE_SUPPORT_H__
- #define __GUILE_SUPPORT_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <libguile.h>
- 

=== modified file 'pkg/gnu/guile-gnome-platform/gpg-keyring'
Binary files a/pkg/gnu/guile-gnome-platform/gpg-keyring 2016-06-17 19:08:15 
+0000 and b/pkg/gnu/guile-gnome-platform/gpg-keyring        2017-03-26 21:02:51 
+0000 differ
=== modified file 'pkg/gnu/guile-gnome-platform/sha256sums'
--- a/pkg/gnu/guile-gnome-platform/sha256sums   2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/guile-gnome-platform/sha256sums   2017-03-26 21:02:51 +0000
@@ -1,3 +1,2 @@
 adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3  
download/guile-gnome-platform-2.16.4.tar.gz
-ddf95261e9560ecdf329d17b5c44577812f505250f0f85c19343cbe9eabaec22  
download/guile-gnome-platform-2.16.4-fix-build.diff
 d7f6a28620ac96c1b5bd0241c8c2a611cfeee31d2ac7667068f1c2f60ecd708b  
download/guile-gnome-platform-2.16.4.tar.gz.sig

=== modified file 'pkg/gnu/guile-gtksourceview/Makefile'
--- a/pkg/gnu/guile-gtksourceview/Makefile      2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/guile-gtksourceview/Makefile      2017-03-26 21:02:51 +0000
@@ -36,7 +36,7 @@
 LIBDEPS = guile guile-gnome-platform g-wrap gtksourceview
 
 ######################################################################
-
+FORCE_BUILD=y
 ifeq ($(FORCE_BUILD),y)
        include ../../../gar/gar.lib/auto.mk
 else

=== removed file 'pkg/gnu/r/Makefile.old'
--- a/pkg/gnu/r/Makefile.old    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/r/Makefile.old    1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Copyright © 2013, 2014, 2015 Brandon Invergo <address@hidden>
-#
-# This file is part of GSRC.
-#
-# GSRC is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GSRC is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
-
-NAME = R
-GARNAME = r
-UPSTREAMNAME = R
-GARVERSION = 3.2.0
-HOME_URL = http://www.gnu.org/software/r
-DESCRIPTION = Environment for statistical computing and graphics
-define BLURB
-R is a language and environment for statistical computing and
-graphics.  It provides a variety of statistical techniques, such as
-linear and nonlinear modeling, classical statistical tests,
-time-series analysis, classification and clustering.  It also provides
-robust support for producing publication-quality data plots.  A large
-amount of 3rd-party packages are available, greatly increasing its
-breadth and scope.
-endef
-
-######################################################################
-
-MASTER_SITES = http://cran.r-project.org/src/base/
-MASTER_SUBDIR = R-3/
-DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = 
-
-BUILDDEPS =
-LIBDEPS = gettext tcl tk readline
-
-######################################################################
-
-include ../../gar.lib/auto.mk
-include config.mk
-
-CONFIGURE_ARGS += --without-included-gettext

=== renamed directory 'pkg/gnu/r' => 'pkg/other/r'
=== modified file 'pkg/other/r/Makefile'
--- a/pkg/gnu/r/Makefile        2016-06-17 19:08:15 +0000
+++ b/pkg/other/r/Makefile      2017-03-26 21:02:51 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013, 2014, 2015, 2016 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014, 2015, 2016, 2017 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -19,7 +19,7 @@
 GARNAME = r
 UPSTREAMNAME = R
 GARVERSION = 3.3.0
-HOME_URL = http://www.gnu.org/software/r
+HOME_URL = http://cran.r-project.org 
 DESCRIPTION = Environment for statistical computing and graphics
 define BLURB
 R is a language and environment for statistical computing and
@@ -39,10 +39,12 @@
 SIGFILES = 
 
 BUILDDEPS =
-LIBDEPS = 
+LIBDEPS =  
+#gettext tcl tk readline
 
 ######################################################################
 
 include ../../../gar/gar.lib/auto.mk
 include config.mk
 
+# ?? CONFIGURE_ARGS += --without-included-gettext