Upgrade to 0.4.7a.

Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=506492>.

8 files changed, 50 insertions, 44 deletions

diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index ac8aa6fa5b59..a391c8a197a4 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	rkward
-PORTVERSION=	0.4.7
-PORTREVISION=	1
+DISTVERSION=	0.4.7a
+PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,12 +24,14 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--disable-fast-perl
 INSTALLS_ICONS=	yes
 
 WANT_FORTRAN=	yes #dummy but future use
 BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
-FC=		gfortran#42
-F77=		gfortran#42
+FC=		gfortran42
+F77=		gfortran42
+FORTRANLIBDIR2=	`${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
 CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 MAKE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 
@@ -48,6 +50,8 @@ PHP2FIX=	rkward/plugins/makemakefileam.php	\
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin/php|${LOCALBASE}/bin/php|'	\
 		${PHP2FIX:S|^|${WRKSRC}/|}
+	${REINPLACE_CMD} -e 's|-lgfortran|-L${FORTRANLIBDIR2} -lgfortran|'	\
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|rkward po doc debian|rkward po debian|'	\
 		${WRKSRC}/Makefile.in
diff --git a/math/rkward-kde4/distinfo b/math/rkward-kde4/distinfo
index be1517dbb43d..0796f855a3c2 100644
--- a/math/rkward-kde4/distinfo
+++ b/math/rkward-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (rkward-0.4.7.tar.gz) = aa353b6dab5ae7dc79af03579555bf99
-SHA256 (rkward-0.4.7.tar.gz) = 7085f8704faacd3f7130267f683d70d73031264e5e0484985ea771b6dde26fc6
-SIZE (rkward-0.4.7.tar.gz) = 1563708
+MD5 (rkward-0.4.7a.tar.gz) = 3f3844194ca58220fcc48561f043797a
+SHA256 (rkward-0.4.7a.tar.gz) = b113e70dcaefa334ad93900b0502f1c426204e98736476a4438cd5eac33d0aa0
+SIZE (rkward-0.4.7a.tar.gz) = 1568665
diff --git a/math/rkward-kde4/files/patch-configure b/math/rkward-kde4/files/patch-configure
index 769349f760eb..83de4447987c 100644
--- a/math/rkward-kde4/files/patch-configure
+++ b/math/rkward-kde4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Sep 17 17:21:28 2006
-+++ configure	Sun Sep 17 20:59:12 2006
-@@ -31790,7 +31790,7 @@
+--- configure.orig	Mon May  7 13:10:22 2007
++++ configure	Mon May 21 17:03:34 2007
+@@ -29251,7 +29251,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33809,7 +33809,7 @@
+@@ -31110,7 +31110,7 @@
    withval=$with_r_home; use_r_home="$withval"
  else
    use_r_home=`R CMD sh -c 'echo $R_HOME'`
@@ -18,7 +18,7 @@
  
  fi
  
-@@ -33888,7 +33888,7 @@
+@@ -31189,7 +31189,7 @@
    withval=$with_r_includes; use_r_includes="$withval"
  else
    use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
@@ -27,3 +27,12 @@
  
  fi
  
+@@ -33235,7 +33235,7 @@
+ 
+ 
+ 
+-CPPFLAGS+=" -DQT_NO_ASCII_CAST"
++CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST"
+ 
+ 
+ 
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rklocalesupport.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rklocalesupport.cpp
deleted file mode 100644
index 4d134a9f3568..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rklocalesupport.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- rkward/rbackend/rklocalesupport.cpp.orig	Mon Apr  2 21:59:00 2007
-+++ rkward/rbackend/rklocalesupport.cpp	Wed Apr 11 19:41:03 2007
-@@ -17,6 +17,7 @@
- 
- #include "rklocalesupport.h"
- 
-+#include <langinfo.h>
- #include <qtextcodec.h>
- 
- /* NOTE: This code in this file is an almost literal copy taken from setupLocaleMapper in qtextcodec.cpp in Qt 3.3.8 !*/
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index ac8aa6fa5b59..a391c8a197a4 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	rkward
-PORTVERSION=	0.4.7
-PORTREVISION=	1
+DISTVERSION=	0.4.7a
+PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,12 +24,14 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--disable-fast-perl
 INSTALLS_ICONS=	yes
 
 WANT_FORTRAN=	yes #dummy but future use
 BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
-FC=		gfortran#42
-F77=		gfortran#42
+FC=		gfortran42
+F77=		gfortran42
+FORTRANLIBDIR2=	`${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
 CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 MAKE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 
@@ -48,6 +50,8 @@ PHP2FIX=	rkward/plugins/makemakefileam.php	\
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin/php|${LOCALBASE}/bin/php|'	\
 		${PHP2FIX:S|^|${WRKSRC}/|}
+	${REINPLACE_CMD} -e 's|-lgfortran|-L${FORTRANLIBDIR2} -lgfortran|'	\
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|rkward po doc debian|rkward po debian|'	\
 		${WRKSRC}/Makefile.in
diff --git a/math/rkward/distinfo b/math/rkward/distinfo
index be1517dbb43d..0796f855a3c2 100644
--- a/math/rkward/distinfo
+++ b/math/rkward/distinfo
@@ -1,3 +1,3 @@
-MD5 (rkward-0.4.7.tar.gz) = aa353b6dab5ae7dc79af03579555bf99
-SHA256 (rkward-0.4.7.tar.gz) = 7085f8704faacd3f7130267f683d70d73031264e5e0484985ea771b6dde26fc6
-SIZE (rkward-0.4.7.tar.gz) = 1563708
+MD5 (rkward-0.4.7a.tar.gz) = 3f3844194ca58220fcc48561f043797a
+SHA256 (rkward-0.4.7a.tar.gz) = b113e70dcaefa334ad93900b0502f1c426204e98736476a4438cd5eac33d0aa0
+SIZE (rkward-0.4.7a.tar.gz) = 1568665
diff --git a/math/rkward/files/patch-configure b/math/rkward/files/patch-configure
index 769349f760eb..83de4447987c 100644
--- a/math/rkward/files/patch-configure
+++ b/math/rkward/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Sep 17 17:21:28 2006
-+++ configure	Sun Sep 17 20:59:12 2006
-@@ -31790,7 +31790,7 @@
+--- configure.orig	Mon May  7 13:10:22 2007
++++ configure	Mon May 21 17:03:34 2007
+@@ -29251,7 +29251,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33809,7 +33809,7 @@
+@@ -31110,7 +31110,7 @@
    withval=$with_r_home; use_r_home="$withval"
  else
    use_r_home=`R CMD sh -c 'echo $R_HOME'`
@@ -18,7 +18,7 @@
  
  fi
  
-@@ -33888,7 +33888,7 @@
+@@ -31189,7 +31189,7 @@
    withval=$with_r_includes; use_r_includes="$withval"
  else
    use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
@@ -27,3 +27,12 @@
  
  fi
  
+@@ -33235,7 +33235,7 @@
+ 
+ 
+ 
+-CPPFLAGS+=" -DQT_NO_ASCII_CAST"
++CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST"
+ 
+ 
+ 
diff --git a/math/rkward/files/patch-rkward_rbackend_rklocalesupport.cpp b/math/rkward/files/patch-rkward_rbackend_rklocalesupport.cpp
deleted file mode 100644
index 4d134a9f3568..000000000000
--- a/math/rkward/files/patch-rkward_rbackend_rklocalesupport.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- rkward/rbackend/rklocalesupport.cpp.orig	Mon Apr  2 21:59:00 2007
-+++ rkward/rbackend/rklocalesupport.cpp	Wed Apr 11 19:41:03 2007
-@@ -17,6 +17,7 @@
- 
- #include "rklocalesupport.h"
- 
-+#include <langinfo.h>
- #include <qtextcodec.h>
- 
- /* NOTE: This code in this file is an almost literal copy taken from setupLocaleMapper in qtextcodec.cpp in Qt 3.3.8 !*/