Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30058
Modified Files:
r-base.info r-base.patch
Log Message:
New upstream version.
Index: r-base.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/r-base.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- r-base.patch 27 Apr 2005 03:26:22 -0000 1.1
+++ r-base.patch 12 Jul 2005 19:54:21 -0000 1.2
@@ -1,63 +1,23 @@
---- R/configure.orig Fri Nov 12 05:43:57 2004
-+++ R/configure Fri Nov 12 06:53:30 2004
-@@ -28944,7 +28944,7 @@
-
- ## LIBR_LDFLAGS="-dynamiclib -install_name
${R_FRAMEWORK_DIR}/Versions/${PACKAGE_VERSION}/Resources/bin/libR.dylib
-compatibility_version ${PACKAGE_VERSION} -current_version ${PACKAGE_VERSION}"
- MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
-- LIBR_LDFLAGS="-dynamiclib -install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
-+ LIBR_LDFLAGS="-dynamiclib -install_name
${prefix}/R.framework/Versions/${PACKAGE_VERSION}/Resources/lib/libR.dylib
-compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
- ## fi
- ## <FIXME>
- ## We need '-framework Carbon' because currently the Quartz device
---- R/Makefile.in.orig Fri Nov 12 05:47:28 2004
-+++ R/Makefile.in Fri Nov 12 06:48:44 2004
-@@ -87,7 +87,8 @@
- $(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)"; \
+--- R/Makefile.in.orig Tue Jul 12 10:13:50 2005
++++ R/Makefile.in Tue Jul 12 10:15:21 2005
+@@ -85,7 +85,7 @@
+ $(INSTALL_DATA) $${f} "$(rhome)"; \
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
[EMAIL PROTECTED]@ @(sed 's/^LIBR =.*/LIBR = -framework R/' \
[EMAIL PROTECTED]@ @(sed 's/^LIBR =.*/LIBR = -framework R/' \
[EMAIL PROTECTED]@ @(sed 's|^LIBR =.*|LIBR = -F$(prefix)
-framework R|' \
[EMAIL PROTECTED]@ @(sed 's|^LIBR =.*|LIBR = -F$(prefix)
-framework R|' \
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf >
"$(rhome)/etc/Makeconf")
@WANT_R_FRAMEWORK_TRUE@ @(sed
's/Versions\/$(VERSION)\/Resources/Resources/' \
@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/R > \
-@@ -198,8 +199,8 @@
- @(cd "$(R_FRAMEWORK_DIR)/Resources/bin" && \
- sed 's/^args=/args=--gui=aqua/' < R > RAqua && \
- chmod 755 RAqua)
-- @(cd "$(R_FRAMEWORK_DIR)/Resources/lib" && \
-- install_name_tool -id
"$(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources/lib/libR.dylib"
../lib/libR.dylib)
-+#@(cd "$(R_FRAMEWORK_DIR)/Resources/lib" && \
-+# install_name_tool -id
"$(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources/lib/libR.dylib"
../lib/libR.dylib)
- @(sed 's/Versions\/$(VERSION)\/Resources/Resources/'
$(R_FRAMEWORK_DIR)/Resources/bin/RAqua > \
- $(R_FRAMEWORK_DIR)/Resources/bin/RRAqua)
- @(mv $(R_FRAMEWORK_DIR)/Resources/bin/RRAqua
$(R_FRAMEWORK_DIR)/Resources/bin/RAqua)
-@@ -213,18 +214,18 @@
- -change libR.dylib
"$(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources/lib/libR.dylib" \{\} \;)
-
- install-aqua:
-- @(rm -rf /Applications/R.app)
-- @(mkdir -p /Applications/R.app/Contents/Resources)
-+ @(rm -rf $(FINKPREFIX)/Applications/R.app)
-+ @(mkdir -p $(FINKPREFIX)/Applications/R.app/Contents/Resources)
- @(cd "$(srcdir)/src/modules/aqua/Contents" && \
-- cp PkgInfo /Applications/R.app/Contents)
-+ cp PkgInfo $(FINKPREFIX)/Applications/R.app/Contents)
- @(cd "$(top_builddir)/src/modules/aqua/Contents" && \
-- cp Info.plist /Applications/R.app/Contents)
-+ cp Info.plist $(FINKPREFIX)/Applications/R.app/Contents)
- @(cd "$(srcdir)/src/modules/aqua/Contents/Resources" && \
-- cp -R * /Applications/R.app/Contents/Resources)
-- @(mkdir -p /Applications/R.app/Contents/MacOS)
-- @test -f "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" \
-- || (echo "please, make install-R-framework first" && exit 1)
-- @(cd /Applications/R.app/Contents/MacOS && \
-- ln -f -n "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" R && \
-+ cp -R * $(FINKPREFIX)/Applications/R.app/Contents/Resources)
-+ @(mkdir -p $(FINKPREFIX)/Applications/R.app/Contents/MacOS)
[EMAIL PROTECTED] -f "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" \
-+# || (echo "please, make install-R-framework first" && exit 1)
-+ @(cd $(FINKPREFIX)/Applications/R.app/Contents/MacOS && \
-+ ln -f -s "$(R_FRAMEWORK_DIR)/Resources/bin/RAqua" R && \
- chmod 755 R)
- TAGS:
+--- R/configure.orig Tue Jul 12 10:20:37 2005
++++ R/configure Tue Jul 12 10:21:54 2005
+@@ -29327,7 +29327,8 @@
+ DYLIB_EXT=".dylib"
+ dylib_ldflags="-dynamiclib"
+ MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
+- LIBR_LDFLAGS="-dynamiclib -install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
++# LIBR_LDFLAGS="-dynamiclib -install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
++ LIBR_LDFLAGS="-dynamiclib -install_name
${prefix}/R.framework/Versions/${PACKAGE_VERSION}/Resources/lib/libR.dylib
-compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
+ RLAPACK_LDFLAGS="-install_name \$(Rexeclibdir)/libRlapack.dylib"
+ ;;
+ hpux*)
Index: r-base.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/r-base.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r-base.info 12 May 2005 12:44:40 -0000 1.2
+++ r-base.info 12 Jul 2005 19:54:21 -0000 1.3
@@ -1,11 +1,11 @@
Package: r-base
-Version: 2.0.1
-Revision: 4
+Version: 2.1.1
+Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: tcltk, tcltk-shlibs, readline-shlibs, libjpeg-shlibs, libpng3-shlibs,
pcre-shlibs
BuildDepends: readline, libjpeg, libpng3, tcltk-dev, g77, texinfo, pcre,
bzip2-dev, libncurses5, tetex-base
Source: http://cran.r-project.org/src/base/R-2/R-%v.tar.gz
-Source-MD5: fb47b1fdef4323031e24d541a2f36b2b
+Source-MD5: e755b0ba5851ec261000af6b5c510335
GCC: 3.3
Patch: %n.patch
SourceDirectory: R-%v
@@ -20,22 +20,15 @@
InstallScript: <<
#!/bin/sh
make install prefix=%i/Library/Frameworks
- make install-aqua FINKPREFIX=%i
perl -pi.bak -e 's|%i|%p|g' %i/Library/Frameworks/R.framework/Resources/bin/R
perl -pi.bak -e 's|%i|%p|g'
%i/Library/Frameworks/R.framework/Resources/bin/RAqua
perl -pi.bak -e 's|%i|%p|g'
%i/Library/Frameworks/R.framework/Resources/etc/Makeconf
mkdir -p %i/bin
ln -s %p/Library/Frameworks/R.framework/Resources/bin/R %i/bin/R
- /bin/rm -f %i/Applications/R.app/R.app
mkdir -p %i/share/man/man1
ln -s %p/Library/Frameworks/R.framework/Versions/%v/Resources/man1/R.1
%i/share/man/man1/R.1
-<<
-PostInstScript: <<
- mkdir -p /Applications/Fink
- ln -fs %p/Applications/R.app /Applications/Fink/R.app
-<<
-PreRmScript: <<
- /bin/rm -rf /Applications/Fink/R.app
+ # fix install_name in libR.dylib
+ install_name_tool -id
"%p/Library/Frameworks/R.framework/Versions/%v/Resources/lib/libR.dylib"
%i/Library/Frameworks/R.framework/Versions/%v/Resources/lib/libR.dylib
<<
Description: Environment for statistical computing
DescDetail: <<
@@ -54,15 +47,15 @@
an earlier version of r-recommended, remove it before installing this package.
Builds R Framework, installs in %p/Library/Frameworks.
-Installs R.app in %p/Applications, with a symlink in /Applications/Fink.
-command line R in %p/bin.
+
+R.app no longer included in the R source distribution. To install, go
+to http://www.rosuda.org/R/nightly, download and install R-GUI.dmg.
+You will then need to edit Info.plist inside the app bundle to point
+to %p/Library/R.Framework (instead of /Library/R.Framework).
<<
DescPort: <<
R_HOME_DIR variable in wrapper scripts must be re-set to installation
directory after make install.
- Patch to configure so libR.dylib gets an install_name.
- Patch to Makefile.in to get R.app to install in %i.
- Patch to Makefile.in to prevent addition of install_name to libR.dylib.
Patch to Makefile.in to add %p to framework path when building extensions.
<<
License: GPL
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
