Update to R 2.6.2.

Changes are basically bugfixes.

pkgsrc changes:
  Don't bother patching configure.ac - it was only part of the changes
being made to configure so don't pretend you could use it to regerate
configure.
  Use -fPIC rather than -fpic for NetBSD powerpc.  Should fix PR 38032.

5 files changed, 66 insertions, 73 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index efea99fe059..474efc77f2f 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2008/03/07 16:11:39 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2008/03/15 22:16:41 markd Exp $
 
-DISTNAME=		R-2.6.0
-PKGREVISION=		2
+DISTNAME=		R-2.6.2
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
diff --git a/math/R/PLIST b/math/R/PLIST
index 901ddf7533d..e82624da225 100644
--- a/math/R/PLIST
+++ b/math/R/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/11/03 20:14:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/03/15 22:16:41 markd Exp $
 bin/R
 bin/Rscript
 lib/R/COPYING
@@ -2568,6 +2568,7 @@ lib/R/library/boot/latex/wool.tex
 lib/R/library/boot/man/boot.Rd.gz
 lib/R/library/boot/po/en@quot/LC_MESSAGES/R-boot.mo
 lib/R/library/boot/po/fr/LC_MESSAGES/R-boot.mo
+lib/R/library/boot/po/ru/LC_MESSAGES/R-boot.mo
 lib/R/library/class/CITATION
 lib/R/library/class/CONTENTS
 lib/R/library/class/DESCRIPTION
@@ -2594,6 +2595,8 @@ lib/R/library/class/R-ex/multiedit.R
 lib/R/library/class/R-ex/olvq1.R
 lib/R/library/class/R-ex/reduce.nn.R
 lib/R/library/class/R/class
+lib/R/library/class/R/class.rdb
+lib/R/library/class/R/class.rdx
 lib/R/library/class/help/AnIndex
 lib/R/library/class/help/SOM
 lib/R/library/class/help/batchSOM
@@ -2868,7 +2871,6 @@ lib/R/library/codetools/Meta/nsInfo.rds
 lib/R/library/codetools/Meta/package.rds
 lib/R/library/codetools/NAMESPACE
 lib/R/library/codetools/R-ex/checkUsage.R
-lib/R/library/codetools/R-ex/codetools.R
 lib/R/library/codetools/R-ex/findGlobals.R
 lib/R/library/codetools/R-ex/showTree.R
 lib/R/library/codetools/R/codetools
@@ -3637,6 +3639,7 @@ lib/R/library/grDevices/latex/xyTable.tex
 lib/R/library/grDevices/latex/xyz.coords.tex
 lib/R/library/grDevices/libs/grDevices.so
 lib/R/library/grDevices/man/grDevices.Rd.gz
+lib/R/library/grDevices/po/de/LC_MESSAGES/R-grDevices.mo
 lib/R/library/grDevices/po/en@quot/LC_MESSAGES/R-grDevices.mo
 lib/R/library/grDevices/po/en@quot/LC_MESSAGES/grDevices.mo
 lib/R/library/grDevices/po/en_GB/LC_MESSAGES/R-grDevices.mo
@@ -3929,6 +3932,7 @@ lib/R/library/graphics/latex/units.tex
 lib/R/library/graphics/latex/xspline.tex
 lib/R/library/graphics/latex/zAxis.tex
 lib/R/library/graphics/man/graphics.Rd.gz
+lib/R/library/graphics/po/de/LC_MESSAGES/R-graphics.mo
 lib/R/library/graphics/po/en@quot/LC_MESSAGES/R-graphics.mo
 lib/R/library/graphics/po/fr/LC_MESSAGES/R-graphics.mo
 lib/R/library/graphics/po/it/LC_MESSAGES/R-graphics.mo
@@ -3962,7 +3966,6 @@ lib/R/library/grid/R-ex/grid.edit.R
 lib/R/library/grid/R-ex/grid.frame.R
 lib/R/library/grid/R-ex/grid.get.R
 lib/R/library/grid/R-ex/grid.grab.R
-lib/R/library/grid/R-ex/grid.grob.R
 lib/R/library/grid/R-ex/grid.layout.R
 lib/R/library/grid/R-ex/grid.lines.R
 lib/R/library/grid/R-ex/grid.locator.R
@@ -4237,6 +4240,7 @@ lib/R/library/grid/latex/widthDetails.tex
 lib/R/library/grid/latex/xDetails.tex
 lib/R/library/grid/libs/grid.so
 lib/R/library/grid/man/grid.Rd.gz
+lib/R/library/grid/po/de/LC_MESSAGES/R-grid.mo
 lib/R/library/grid/po/en@quot/LC_MESSAGES/R-grid.mo
 lib/R/library/grid/po/en@quot/LC_MESSAGES/grid.mo
 lib/R/library/grid/po/fr/LC_MESSAGES/R-grid.mo
@@ -4287,6 +4291,7 @@ lib/R/library/lattice/R-ex/qq.R
 lib/R/library/lattice/R-ex/qqmath.R
 lib/R/library/lattice/R-ex/rfs.R
 lib/R/library/lattice/R-ex/shingles.R
+lib/R/library/lattice/R-ex/simpleTheme.R
 lib/R/library/lattice/R-ex/singer.R
 lib/R/library/lattice/R-ex/splom.R
 lib/R/library/lattice/R-ex/strip.default.R
@@ -4301,6 +4306,7 @@ lib/R/library/lattice/data/Rdata.rdb
 lib/R/library/lattice/data/Rdata.rds
 lib/R/library/lattice/data/Rdata.rdx
 lib/R/library/lattice/demo/intervals.R
+lib/R/library/lattice/demo/labels.R
 lib/R/library/lattice/demo/lattice.R
 lib/R/library/lattice/demo/panel.R
 lib/R/library/lattice/help/AnIndex
@@ -4353,6 +4359,7 @@ lib/R/library/lattice/help/qqmath
 lib/R/library/lattice/help/rfs
 lib/R/library/lattice/help/shingles
 lib/R/library/lattice/help/simpleKey
+lib/R/library/lattice/help/simpleTheme
 lib/R/library/lattice/help/singer
 lib/R/library/lattice/help/splom
 lib/R/library/lattice/help/strip.default
@@ -4413,6 +4420,7 @@ lib/R/library/lattice/html/qqmath.html
 lib/R/library/lattice/html/rfs.html
 lib/R/library/lattice/html/shingles.html
 lib/R/library/lattice/html/simpleKey.html
+lib/R/library/lattice/html/simpleTheme.html
 lib/R/library/lattice/html/singer.html
 lib/R/library/lattice/html/splom.html
 lib/R/library/lattice/html/strip.default.html
@@ -4472,6 +4480,7 @@ lib/R/library/lattice/latex/qqmath.tex
 lib/R/library/lattice/latex/rfs.tex
 lib/R/library/lattice/latex/shingles.tex
 lib/R/library/lattice/latex/simpleKey.tex
+lib/R/library/lattice/latex/simpleTheme.tex
 lib/R/library/lattice/latex/singer.tex
 lib/R/library/lattice/latex/splom.tex
 lib/R/library/lattice/latex/strip.default.tex
@@ -4708,6 +4717,8 @@ lib/R/library/methods/latex/validObject.tex
 lib/R/library/methods/latex/zBasicFunsList.tex
 lib/R/library/methods/libs/methods.so
 lib/R/library/methods/man/methods.Rd.gz
+lib/R/library/methods/po/de/LC_MESSAGES/R-methods.mo
+lib/R/library/methods/po/de/LC_MESSAGES/methods.mo
 lib/R/library/methods/po/en@quot/LC_MESSAGES/R-methods.mo
 lib/R/library/methods/po/en@quot/LC_MESSAGES/methods.mo
 lib/R/library/methods/po/fr/LC_MESSAGES/R-methods.mo
@@ -5141,7 +5152,6 @@ lib/R/library/nlme/R-ex/pdMatrix.R
 lib/R/library/nlme/R-ex/pdMatrix.reStruct.R
 lib/R/library/nlme/R-ex/pdNatural.R
 lib/R/library/nlme/R-ex/pdSymm.R
-lib/R/library/nlme/R-ex/phenoModel.R
 lib/R/library/nlme/R-ex/plot.ACF.R
 lib/R/library/nlme/R-ex/plot.Variogram.R
 lib/R/library/nlme/R-ex/plot.augPred.R
@@ -5165,7 +5175,6 @@ lib/R/library/nlme/R-ex/print.summary.pdMat.R
 lib/R/library/nlme/R-ex/print.varFunc.R
 lib/R/library/nlme/R-ex/qqnorm.gls.R
 lib/R/library/nlme/R-ex/qqnorm.lme.R
-lib/R/library/nlme/R-ex/quinModel.R
 lib/R/library/nlme/R-ex/random.effects.R
 lib/R/library/nlme/R-ex/ranef.lmList.R
 lib/R/library/nlme/R-ex/ranef.lme.R
@@ -6293,6 +6302,8 @@ lib/R/library/spatial/R-ex/trls.influence.R
 lib/R/library/spatial/R-ex/trmat.R
 lib/R/library/spatial/R-ex/variogram.R
 lib/R/library/spatial/R/spatial
+lib/R/library/spatial/R/spatial.rdb
+lib/R/library/spatial/R/spatial.rdx
 lib/R/library/spatial/help/AnIndex
 lib/R/library/spatial/help/Kaver
 lib/R/library/spatial/help/Kenvl
@@ -6456,6 +6467,8 @@ lib/R/library/splines/latex/splines-package.tex
 lib/R/library/splines/latex/xyVector.tex
 lib/R/library/splines/libs/splines.so
 lib/R/library/splines/man/splines.Rd.gz
+lib/R/library/splines/po/de/LC_MESSAGES/R-splines.mo
+lib/R/library/splines/po/de/LC_MESSAGES/splines.mo
 lib/R/library/splines/po/en@quot/LC_MESSAGES/R-splines.mo
 lib/R/library/splines/po/en@quot/LC_MESSAGES/splines.mo
 lib/R/library/splines/po/fr/LC_MESSAGES/R-splines.mo
@@ -7810,7 +7823,6 @@ lib/R/library/survival/R-ex/survexp.us.R
 lib/R/library/survival/R-ex/survfit.R
 lib/R/library/survival/R-ex/survobrien.R
 lib/R/library/survival/R-ex/survreg.R
-lib/R/library/survival/R-ex/survreg.control.R
 lib/R/library/survival/R-ex/survreg.distributions.R
 lib/R/library/survival/R-ex/survreg.old.R
 lib/R/library/survival/R-ex/tcut.R
@@ -8643,6 +8655,7 @@ lib/R/share/licenses/GPL-3
 lib/R/share/licenses/LGPL-2
 lib/R/share/licenses/LGPL-2.1
 lib/R/share/licenses/LGPL-3
+lib/R/share/licenses/license.db
 lib/R/share/locale/de/LC_MESSAGES/R.mo
 lib/R/share/locale/en/LC_MESSAGES/R.mo
 lib/R/share/locale/en@quot/LC_MESSAGES/R.mo
@@ -8882,6 +8895,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/splines/po/fr
 @dirrm lib/R/library/splines/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/splines/po/en@quot
+@dirrm lib/R/library/splines/po/de/LC_MESSAGES
+@dirrm lib/R/library/splines/po/de
 @dirrm lib/R/library/splines/po
 @dirrm lib/R/library/splines/man
 @dirrm lib/R/library/splines/libs
@@ -8986,6 +9001,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/methods/po/fr
 @dirrm lib/R/library/methods/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/methods/po/en@quot
+@dirrm lib/R/library/methods/po/de/LC_MESSAGES
+@dirrm lib/R/library/methods/po/de
 @dirrm lib/R/library/methods/po
 @dirrm lib/R/library/methods/man
 @dirrm lib/R/library/methods/libs
@@ -9023,6 +9040,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/grid/po/fr
 @dirrm lib/R/library/grid/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/grid/po/en@quot
+@dirrm lib/R/library/grid/po/de/LC_MESSAGES
+@dirrm lib/R/library/grid/po/de
 @dirrm lib/R/library/grid/po
 @dirrm lib/R/library/grid/man
 @dirrm lib/R/library/grid/libs
@@ -9048,6 +9067,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/graphics/po/fr
 @dirrm lib/R/library/graphics/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/graphics/po/en@quot
+@dirrm lib/R/library/graphics/po/de/LC_MESSAGES
+@dirrm lib/R/library/graphics/po/de
 @dirrm lib/R/library/graphics/po
 @dirrm lib/R/library/graphics/man
 @dirrm lib/R/library/graphics/latex
@@ -9074,6 +9095,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/grDevices/po/en_GB
 @dirrm lib/R/library/grDevices/po/en@quot/LC_MESSAGES
 @dirrm lib/R/library/grDevices/po/en@quot
+@dirrm lib/R/library/grDevices/po/de/LC_MESSAGES
+@dirrm lib/R/library/grDevices/po/de
 @dirrm lib/R/library/grDevices/po
 @dirrm lib/R/library/grDevices/man
 @dirrm lib/R/library/grDevices/libs
@@ -9142,6 +9165,8 @@ man/man1/Rscript.1
 @dirrm lib/R/library/class/R
 @dirrm lib/R/library/class/Meta
 @dirrm lib/R/library/class
+@dirrm lib/R/library/boot/po/ru/LC_MESSAGES
+@dirrm lib/R/library/boot/po/ru
 @dirrm lib/R/library/boot/po/fr/LC_MESSAGES
 @dirrm lib/R/library/boot/po/fr
 @dirrm lib/R/library/boot/po/en@quot/LC_MESSAGES
diff --git a/math/R/distinfo b/math/R/distinfo
index b6a320223fa..d9ffa99fa01 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.36 2008/03/07 16:11:39 jlam Exp $
+$NetBSD: distinfo,v 1.37 2008/03/15 22:16:41 markd Exp $
 
-SHA1 (R-2.6.0.tar.gz) = ff51578fc630e65ce0e2bb92b0e1f8324c94925d
-RMD160 (R-2.6.0.tar.gz) = 54b3d183dfb15af7f861e7b62904998865ad194c
-Size (R-2.6.0.tar.gz) = 15447985 bytes
-SHA1 (patch-aa) = 0e1deea1411b5d1c31c9cc46708c08cc20d5c8c5
+SHA1 (R-2.6.2.tar.gz) = 3d06b12cbf1dab25ddd759522157e6cc6a8eae19
+RMD160 (R-2.6.2.tar.gz) = 7956c284aad3c2d4fc85d566b45e2ba308dffefb
+Size (R-2.6.2.tar.gz) = 15569391 bytes
 SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06
-SHA1 (patch-ac) = 5c0013236b2effaabb381a2426565bd1f73f5d5e
+SHA1 (patch-ac) = fb35ac7a2d22a4cc60704ce06a0471fab2e64ac0
 SHA1 (patch-ad) = 666dccbc9741b90bc7af11e51ccf25240906da8b
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
deleted file mode 100644
index 11d1185ff3a..00000000000
--- a/math/R/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.19 2008/03/07 16:11:39 jlam Exp $
-
---- configure.ac.orig	2007-09-21 14:05:04.000000000 +1200
-+++ configure.ac
-@@ -260,7 +260,7 @@ AC_ARG_ENABLE([BLAS-shlib],
- [use_blas_shlib="unset"])
- 
- if test "${want_R_shlib}" = yes; then
--  LIBR="-L\$(R_HOME)/lib\$(R_ARCH) -lR"
-+  LIBR="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH) -lR"
- else
-   LIBR=
- fi
-@@ -817,13 +817,6 @@ case "${host_cpu}" in
-       R_PROG_CC_FLAG([-ieee_with_inexact],
-                      R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
-     fi
--    if test "${G77}" = yes; then
--      R_PROG_F77_FLAG([-mieee],
--                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-mieee]))
--    else
--      R_PROG_F77_FLAG([-fpe3],
--                      R_SH_VAR_ADD(R_XTRA_FFLAGS, [-fpe3]))
--    fi
-     if test "${GXX}" = yes; then
-       R_PROG_CXX_FLAG([-mieee],
-                       R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
-@@ -1380,6 +1373,7 @@ rm -f libconftest${DYLIB_EXT} conftest.c
-     fcpicflags=
-     ;;
-   netbsd*)
-+    fpicflags="-fPIC"
-     if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
-       main_ldflags="-export-dynamic"
-       shlib_ldflags="-shared"
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 74966ad7610..334f8016579 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
+$NetBSD: patch-ac,v 1.22 2008/03/15 22:16:41 markd Exp $
 
---- configure.orig	2007-09-26 14:06:08.000000000 +1200
+--- configure.orig	2008-01-30 23:43:09.000000000 +1300
 +++ configure
-@@ -2659,7 +2659,7 @@ fi
+@@ -2672,7 +2672,7 @@ fi
  
  
  if test "${want_R_shlib}" = yes; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  else
    LIBR=
  fi
-@@ -8432,7 +8432,7 @@ darwin* | rhapsody*)
+@@ -8445,7 +8445,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -11104,7 +11104,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11117,7 +11117,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -11682,7 +11682,7 @@ kfreebsd*-gnu)
+@@ -11695,7 +11695,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -14170,7 +14170,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14183,7 +14183,7 @@ if test -z "$aix_libpath"; then aix_libp
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -14881,7 +14881,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14894,7 +14894,7 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -15492,7 +15492,7 @@ kfreebsd*-gnu)
+@@ -15505,7 +15505,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -65,7 +65,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -18170,7 +18170,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18183,7 +18183,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -74,7 +74,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -18748,7 +18748,7 @@ kfreebsd*-gnu)
+@@ -18761,7 +18761,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -83,7 +83,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -20548,7 +20548,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20561,7 +20561,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -92,7 +92,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -21126,7 +21126,7 @@ kfreebsd*-gnu)
+@@ -21139,7 +21139,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -32398,6 +32398,7 @@ cat > conftest.c <<EOF
+@@ -32411,6 +32411,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -109,7 +109,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  int main () {
    exit(0);
  }
-@@ -32475,6 +32476,9 @@ cat > conftest.c <<EOF
+@@ -32488,6 +32489,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -119,7 +119,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -32572,6 +32576,9 @@ typedef struct {
+@@ -32585,6 +32589,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -129,7 +129,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -33739,183 +33746,6 @@ echo "${ECHO_T}no" >&6; }
+@@ -33752,183 +33759,6 @@ echo "${ECHO_T}no" >&6; }
  fi
  
      fi
@@ -313,7 +313,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
      if test "${GXX}" = yes; then
        ac_safe=_mieee
  { echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -34380,7 +34210,7 @@ _ACEOF
+@@ -34393,7 +34223,7 @@ _ACEOF
      if test "${GCC}" = yes; then
        ## only Apple build of gcc supports (and needs?) -no-cpp-precomp
        ${CC} --version|grep Apple >/dev/null 2>/dev/null
@@ -322,7 +322,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
          separator=""
  test -z "${separator}" && separator=" "
  if test -z "${R_XTRA_CPPFLAGS}"; then
-@@ -35551,7 +35381,7 @@ echo "$as_me: WARNING: Use of flat names
+@@ -35564,7 +35394,7 @@ echo "$as_me: WARNING: Use of flat names
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
@@ -331,15 +331,20 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
      ## Only sure for FreeBSD 3 and above.
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
-@@ -35640,6 +35470,7 @@ echo "$as_me: WARNING: Use of flat names
+@@ -35653,6 +35483,12 @@ echo "$as_me: WARNING: Use of flat names
      fcpicflags=
      ;;
    netbsd*)
 +    fpicflags="-fPIC"
++    case "${host_cpu}" in
++      powerpc*)
++	cpicflags="-fPIC"
++	;;
++    esac
      if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
        main_ldflags="-export-dynamic"
        shlib_ldflags="-shared"
-@@ -35739,7 +35570,7 @@ fi
+@@ -35752,7 +35588,7 @@ fi
  : ${FPICFLAGS="${fpicflags}"}
  if test -z "${FPICFLAGS}"; then
    case "${host_os}" in
@@ -348,7 +353,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
        ;;
      *)
        { echo "$as_me:$LINENO: WARNING: I could not determine FPICFLAGS." >&5
-@@ -42894,6 +42725,15 @@ cat > conftest.c <<EOF
+@@ -42907,6 +42743,15 @@ cat > conftest.c <<EOF
  #endif
  extern void F77_SYMBOL(test1)(int *iflag);
  
@@ -364,7 +369,7 @@ $NetBSD: patch-ac,v 1.21 2008/03/07 16:11:39 jlam Exp $
  int main () {
    int iflag;
    F77_SYMBOL(test1)(&iflag);
-@@ -42958,6 +42798,14 @@ else
+@@ -42971,6 +42816,14 @@ else
  #else
  # define F77_SYMBOL(x)   x
  #endif