diff -ruN R-2.12.0-orig/Makeconf.in R-2.12.0/Makeconf.in
--- R-2.12.0-orig/Makeconf.in	2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/Makeconf.in	2010-10-30 15:41:20.000000000 +0900
@@ -83,7 +83,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 -ruN R-2.12.0-orig/Makefile.fw R-2.12.0/Makefile.fw
--- R-2.12.0-orig/Makefile.fw	2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/Makefile.fw	2010-10-30 16:05:35.000000000 +0900
@@ -37,27 +37,27 @@
 	  ln -f -s -n Versions/Current/Resources Resources)
 	@## the resulting libR will point dyld to the fat libR regardless of its origin
 	@(cd "$(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 "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
 	@( otool=otool ; if otool -D "$(Rexeclibdir)/libR.dylib"|grep 'not an object'>/dev/null; then otool=otool64; fi; \
 	   for lib in Rlapack Rblas R; do \
 	   if test -e "$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO) "  lib$${lib}"; \
 	    find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
 	    xargs -n 1 install_name_tool -change \
 	    `$${otool} -L $(Rexeclibdir)/lib$${lib}.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
-	    "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
+	    "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
 	    find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
 	    xargs -n 1 install_name_tool -change lib$${lib}.dylib \
-	    "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
-	    install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
+	    "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
+	    install_name_tool -id "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
 	    "$(Rexeclibdir)/lib$${lib}.dylib"; \
 	    if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
-	      $(top_srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$(Rexeclibdir)/lib$${lib}.dylib"; \
-	      install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
+	      $(top_srcdir)/tools/updatefat "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$(Rexeclibdir)/lib$${lib}.dylib"; \
+	      install_name_tool -id "@PREFIX@/Library/Frameworks/R.framework//Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
 	      "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"; \
 	    fi; \
 	    for rexe in `ls "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)"/Resources/bin/exec/*/R "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/exec/R" 2>/dev/null`; do \
 	     install_name_tool -change lib$${lib}.dylib \
-	     "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$$rexe" ; \
+	     "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$$rexe" ; \
 	    done; \
            fi; \
           done)
@@ -66,7 +66,7 @@
 	  chmod a+r $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders/config.h; \
 	  find $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders -name .svn | xargs rm -rf)
 	@(install_name_tool -change libR.dylib \
-	    "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
+	    "@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
 	    $(Rexecbindir2)/R)
 	@(if [ -n "${R_ARCH}" ]; then \
 	  rm -rf $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders${R_ARCH} && \
diff -ruN R-2.12.0-orig/configure R-2.12.0/configure
--- R-2.12.0-orig/configure	2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/configure	2010-10-30 15:53:48.000000000 +0900
@@ -25402,7 +25402,7 @@
 main_ld="${CC}"
 shlib_ld="${CC}"
 shlib_cxxld="${CXX}"
-SHLIB_EXT=".so"
+SHLIB_EXT=".dylib"
 SHLIB_LIBADD=
 use_exportfiles=no
 
@@ -25952,7 +25952,8 @@
     DYLIB_EXT=".dylib"
     dylib_ldflags="${darwin_dylib_ldflags}"
     MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed  -e "s/[\.][1-9]$/.0/"`
-    LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION}  -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
+    # LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION}  -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
+    LIBR_LDFLAGS="-dynamiclib -single_module -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 libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
     ## don't use version in libRblas so we can replace it with any BLAS implementation
     RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
diff -ruN R-2.12.0-orig/src/nmath/standalone/Makefile.in R-2.12.0/src/nmath/standalone/Makefile.in
--- R-2.12.0-orig/src/nmath/standalone/Makefile.in	2010-10-30 15:40:11.000000000 +0900
+++ R-2.12.0/src/nmath/standalone/Makefile.in	2010-10-30 16:08:55.000000000 +0900
@@ -125,7 +125,7 @@
 install: installdirs install-header @WANT_R_FRAMEWORK_FALSE@ install-pc
 @WANT_R_FRAMEWORK_FALSE@	@!(test -f $(libRmath_la)) || $(SHELL) $(top_srcdir)/tools/copy-if-change $(libRmath_la) $(DESTDIR)$(libdir)/$(libRmath_la)
 @WANT_R_FRAMEWORK_FALSE@	@!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(DESTDIR)$(libdir)/libRmath.a
-@WANT_R_FRAMEWORK_TRUE@	@!(test -f $(libRmath_la)) || cp $(libRmath_la) $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) && install_name_tool -id $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la)
+@WANT_R_FRAMEWORK_TRUE@	@!(test -f $(libRmath_la)) || cp $(libRmath_la) $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) && install_name_tool -id @PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la)
 @WANT_R_FRAMEWORK_TRUE@	@!(test -f libRmath.a) || $(SHELL) $(top_srcdir)/tools/copy-if-change libRmath.a $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRmath.a
 
 install-strip: installdirs install-header install-pc
@@ -149,12 +149,12 @@
 @WANT_R_FRAMEWORK_TRUE@	@$(MKINSTALLDIRS) $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib
 
 ## ?= is not portable make syntax, so we conditionalize this.
-@WANT_R_FRAMEWORK_TRUE@RMATH_FRAMEWORK_DIR ?= /Library/Frameworks/Rmath.framework
+@WANT_R_FRAMEWORK_TRUE@RMATH_FRAMEWORK_DIR ?= $(DESTDIR)/Library/Frameworks/Rmath.framework
 install-Rmath-framework: $(libRmath_la)
 	@(cd ../../include; $(MAKE) Rmath.h)
 	@$(MKINSTALLDIRS) $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Headers
 	@cp $(libRmath_la) $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
-	@install_name_tool -id $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
+	@install_name_tool -id @PREFIX@/Library/Frameworks/Rmath.framework/Versions/$(VERSION)/Rmath $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Headers/Rmath.h
 	@rm -f $(RMATH_FRAMEWORK_DIR)/Versions/Current $(RMATH_FRAMEWORK_DIR)/Headers $(RMATH_FRAMEWORK_DIR)/Rmath
 	@ln -sf $(VERSION) $(RMATH_FRAMEWORK_DIR)/Versions/Current
diff -ruN R-2.12.0-orig/src/scripts/R.sh.in R-2.12.0/src/scripts/R.sh.in
--- R-2.12.0-orig/src/scripts/R.sh.in	2010-10-30 15:40:11.000000000 +0900
+++ R-2.12.0/src/scripts/R.sh.in	2010-10-30 15:57:53.000000000 +0900
@@ -1,6 +1,8 @@
 #!@R_SHELL@
 # Shell wrapper for R executable.
 
+# export PATH=@PREFIX@/var/lib/fink/path-prefix-10.6:$PATH
+
 R_HOME_DIR=
 if test "${R_HOME_DIR}" = "@prefix@/@LIBnn@/R"; then
    case "@R_OS@" in