svn commit: r351497 - in head/french/eficas: . files

[Thierry Thomas]

Author: thierry
Date: Thu Apr 17 20:57:37 2014
New Revision: 351497
URL: http://svnweb.freebsd.org/changeset/ports/351497
QAT: https://qat.redports.org/buildarchive/r351497/

Log:
  Unbreak with the work-around given by Vladimir Chukharev in PR ports/188114
  untill math/py-numpy is fixed.

Modified:
  head/french/eficas/Makefile
  head/french/eficas/files/patch-eficasQt

Modified: head/french/eficas/Makefile
==============================================================================
--- head/french/eficas/Makefile	Thu Apr 17 20:31:45 2014	(r351496)
+++ head/french/eficas/Makefile	Thu Apr 17 20:57:37 2014	(r351497)
@@ -15,9 +15,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${
 		bash:${PORTSDIR}/shells/bash					\
 		${PYNUMPY}
 
-BROKEN=		ImportError in numpy: cannot import name scimath
-
 USES=		shebangfix
+USE_GCC=	yes # To be removed - Needed as a work-around for numpy, see PR ports/188114
 USE_PYTHON=	yes
 SHEBANG_FILES=	eficas eficasQt
 REINPLACE_ARGS=	-i ""
@@ -50,7 +49,8 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/${FILE}
 .endfor
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|;s|%%PREFIX%%|${PREFIX}|'	\
-		-e 's|%%EFICASDIR%%|${EFICASDIR}|' ${WRKSRC}/eficasQt
+		-e 's|%%EFICASDIR%%|${EFICASDIR}|;s|%%GCC_RUNTIME%%|${_GCC_RUNTIME}|'	\
+		${WRKSRC}/eficasQt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${EFICASDIR}

Modified: head/french/eficas/files/patch-eficasQt
==============================================================================
--- head/french/eficas/files/patch-eficasQt	Thu Apr 17 20:31:45 2014	(r351496)
+++ head/french/eficas/files/patch-eficasQt	Thu Apr 17 20:57:37 2014	(r351497)
@@ -1,6 +1,6 @@
---- eficasQt.orig	2013-01-24 17:21:25.000000000 +0100
-+++ eficasQt	2013-03-16 16:07:04.000000000 +0100
-@@ -18,21 +18,16 @@
+--- eficasQt.orig	2014-04-17 22:44:45.000000000 +0200
++++ eficasQt	2014-04-17 22:49:47.000000000 +0200
+@@ -18,21 +18,19 @@
  # ==============================================================================
  
  set_prefix() {
@@ -15,6 +15,9 @@
  set_prefix $0
  
 -export ASTER_ROOT=$prefix
++# Work-around for the py-numpy breakage - see PR ports/188114
++FIXNUMPY=%%GCC_RUNTIME%%
++
 +export ASTER_ROOT=%%LOCALBASE%%/aster
  # set environment
 -if [ -f /etc/codeaster/profile.sh ]; then
@@ -27,10 +30,10 @@
  fi
  
  # start Python interpreter
-@@ -44,5 +39,5 @@
+@@ -44,5 +42,5 @@
  PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/UiQT4
  PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/Editeur
  
 -$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.py $*
-+$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $*
++LD_LIBRARY_PATH=$FIXNUMPY $PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $*