Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv756
Modified Files:
r-base215.info r-base30.info
Added Files:
r-base30.patch
Log Message:
Fix revision numbers
Index: r-base30.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/r-base30.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- r-base30.info 21 May 2013 23:02:05 -0000 1.1
+++ r-base30.info 6 Jun 2013 02:14:13 -0000 1.2
@@ -1,11 +1,11 @@
Info2: <<
Package: r-base30
Version: 3.0.1
-Revision: 2
+Revision: 4
Description: R Framework
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: %N-shlibs (=%v-%r)
-BuildDepends: bzip2-dev, cairo, glib2-dev, gcc48-compiler, libgettext8-dev,
libiconv-dev, libncurses5, libjpeg9, libpng15, pango1-xft2-ft219-dev, pcre,
pkgconfig, readline6, tcltk-dev, x11-dev, fink (>= 0.28.1),
fink-package-precedence, flag-sort (>= 0.5), glitz
+BuildDepends: bzip2-dev, cairo, glib2-dev, gcc48-compiler, libgettext8-dev,
libiconv-dev, libncurses5, libjpeg9, liblzma5, libpng15, pango1-xft2-ft219-dev,
pcre, pkgconfig, readline6, tcltk-dev, x11-dev, fink (>= 0.28.1),
fink-package-precedence, flag-sort (>= 0.5), glitz
Source: http://cran.r-project.org/src/base/R-3/R-%v.tar.gz
Source-MD5: 36d51544b007fff26c7fbf36b02ea5ad
@@ -13,7 +13,7 @@
PatchFile-MD5: 1307e3f8ea068e3a30bce0511369a511
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v
-SetCC: flag-sort -r gcc
+SetCC: flag-sort -r gcc -ffor-scope
SetCXX: flag-sort -r g++
ConfigureParams: <<
@@ -68,7 +68,7 @@
# Move site-library out of R
pushd Library/Frameworks/R.framework/Resources/
- ln -s %p/lib/R/3.0/site-library site-library
+ ln -s %p/lib/R/$FW_VER/site-library site-library
popd
# Make more version specific symlink
@@ -107,16 +107,16 @@
chmod 755 Library/Frameworks/R.framework/Resources/library
# Satisfy validation
- rm -rf
Library/Frameworks/R.framework/Versions/3.0/Resources/library/Matrix/include
+ rm -rf
Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/Matrix/include
# AKH: fix install_names
- cd %i/Library/Frameworks/R.framework/Versions/3.0/Resources/library
+ cd %i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/3.0/Resources/library/grDevices/libs/cairo.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/grDevices/libs/cairo.dylib
\
grDevices/libs/cairo.dylib
# Fix the framework path
- perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/3.0/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/3.0/Resources/etc/Makeconf
+ perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/etc/Makeconf
<<
@@ -127,7 +127,7 @@
SplitOff: <<
Package: %N-shlibs
Description: R Libraries
- Depends: bzip2-shlibs, cairo-shlibs, gcc48-shlibs, glib2-shlibs,
libgettext8-shlibs, libiconv, libjpeg9-shlibs, libpng15-shlibs, libtiff-shlibs,
pango1-xft2-ft219-shlibs, pcre-shlibs, readline6-shlibs, tcltk
+ Depends: bzip2-shlibs, cairo-shlibs, gcc48-shlibs, glib2-shlibs,
libgettext8-shlibs, libiconv, libjpeg9-shlibs, liblzma5-shlibs,
libpng15-shlibs, libtiff-shlibs, pango1-xft2-ft219-shlibs, pcre-shlibs,
readline6-shlibs, tcltk
Files: <<
Library/Frameworks/R.framework/Versions/3.0/Resources/lib
Library/Frameworks/R.framework/Versions/3.0/Resources/library
--- NEW FILE: r-base30.patch ---
diff -uNr R-2.15.0/Makeconf.in R-2.15.0.fink/Makeconf.in
--- R-2.15.0/Makeconf.in 2012-03-01 18:02:30.000000000 -0500
+++ R-2.15.0.fink/Makeconf.in 2012-04-13 20:43:42.000000000 -0400
@@ -75,7 +75,7 @@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
SHELL = @R_SHELL@
-SHLIB_EXT = @SHLIB_EXT@
+SHLIB_EXT = .dylib
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_FFLAGS = @SHLIB_FFLAGS@
SHLIB_LD = @SHLIB_LD@
diff -uNr R-2.15.0/Makefile.fw R-2.15.0.fink/Makefile.fw
--- R-2.15.0/Makefile.fw 2011-10-02 18:02:39.000000000 -0400
+++ R-2.15.0.fink/Makefile.fw 2012-04-13 20:43:42.000000000 -0400
@@ -8,7 +8,7 @@
install install-strip: install-R-framework
@(sed 's|^LIBR =.*|LIBR = -F$(R_FRAMEWORK_DIR)/.. -framework
R|' \
- $(top_builddir)/etc/Makeconf >
"$(rhome)/etc${R_ARCH}/Makeconf")
+ $(top_builddir)/etc/Makeconf >
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/etc${R_ARCH}/Makeconf")
@(sed 's/Versions\/$(FW_VERSION)\/Resources/Resources/' \
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/R" > \
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/RR")
@@ -37,7 +37,7 @@
ln -f -s -n Versions/Current/Resources Resources)
@## the resulting libR will point dyld to the fat libR regardless of
its origin
@(cd "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/lib" && \
- install_name_tool -id
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib"
$(Rexeclibdir)/libR.dylib)
+ install_name_tool -id
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib"
$(DESTDIR)$(Rexeclibdir)/libR.dylib)
@( otool=otool ; if otool -D "$(DESTDIR)$(Rexeclibdir)/libR.dylib"|grep
'not an object'>/dev/null; then otool=otool64; fi; \
for lib in Rlapack Rblas R; do \
if test -e "$(DESTDIR)$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO)
" lib$${lib}"; \
diff -uNr R-2.15.0/configure R-2.15.0.fink/configure
--- R-2.15.0/configure 2012-03-22 19:05:53.000000000 -0400
+++ R-2.15.0.fink/configure 2012-04-13 20:43:42.000000000 -0400
@@ -26017,7 +26017,7 @@
main_ld="${CC}"
shlib_ld="${CC}"
shlib_cxxld="${CXX}"
-SHLIB_EXT=".so"
+SHLIB_EXT=".dylib"
SHLIB_LIBADD=
use_exportfiles=no
Index: r-base215.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/r-base215.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- r-base215.info 22 May 2013 03:31:28 -0000 1.3
+++ r-base215.info 6 Jun 2013 02:14:13 -0000 1.4
@@ -1,7 +1,7 @@
Info2: <<
Package: r-base215
Version: 2.15.3
-Revision: 4
+Revision: 104
Description: R Framework
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: %N-shlibs (=%v-%r)
@@ -13,7 +13,7 @@
PatchFile-MD5: 81f9fc3bc5834d89b1472b71ce799f9f
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v
-SetCC: flag-sort -r gcc
+SetCC: flag-sort -r gcc -ffor-scope
SetCXX: flag-sort -r g++
ConfigureParams: <<
@@ -68,8 +68,7 @@
# Move site-library out of R
pushd Library/Frameworks/R.framework/Resources/
- # ln -s %p/lib/R/2.15/site-library site-library
- ln -s %p/lib/R/site-library site-library
+ ln -s %p/lib/R/$FW_VER/site-library site-library
popd
# Make more version specific symlink
@@ -107,19 +106,19 @@
chmod 755 Library/Frameworks/R.framework/Resources/library
# Satisfy validation
- rm -rf
Library/Frameworks/R.framework/Versions/2.15/Resources/library/Matrix/include
+ rm -rf
Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/Matrix/include
# AKH: fix install_names
- cd %i/Library/Frameworks/R.framework/Versions/2.15/Resources/library
+ cd %i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/grDevices/libs/cairo.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/grDevices/libs/cairo.dylib
\
grDevices/libs/cairo.dylib
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/parallel/libs/parallel.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/parallel/libs/parallel.dylib
\
parallel/libs/parallel.dylib
# Fix the framework path
- perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/2.15/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/2.15/Resources/etc/Makeconf
+ perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/etc/Makeconf
<<
RunTimeVars: <<
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
