3 files changed, 13 insertions, 5 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 8fc2fa7af37b..31e139421d0f 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icc
 PORTVERSION=	7.1.006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_p_${PORTVERSION}
diff --git a/lang/icc/files/patch-ia32::bin::icc b/lang/icc/files/patch-ia32::bin::icc
index 5f637a0b017d..20854225ee39 100644
--- a/lang/icc/files/patch-ia32::bin::icc
+++ b/lang/icc/files/patch-ia32::bin::icc
@@ -1,6 +1,6 @@
 --- ia32/bin/icc.orig	Fri Jan 10 16:57:18 2003
 +++ ia32/bin/icc	Fri Jan 10 17:09:38 2003
-@@ -1,34 +1,68 @@
+@@ -1,34 +1,72 @@
  #!/bin/sh
  
 +PREFIX=@@PREFIX@@
@@ -71,10 +71,14 @@
 +   unset val1
 +   set -- "$@" "-Qoption,ld,-MT"
 +  fi
++  if [ "${val1}" = "-pipe" ] ; then
++    unset val1
++    set -- "$@"
++  fi
 +  set -- "$@" "$val1"
 +  i=$(($i+1))
 + done
-+ exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin -I${PREFIX}/intel/compiler70/ia32/include -I${PREFIX}/intel/compiler70/ia32/include/substitute_headers "$@";
++ exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin "$@";
  else
 - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icc" <INSTALLDIR>/compiler70/ia32/bin/iccbin;
 + exec ${PREFIX}/intel/compiler70/ia32/bin/iccbin;
diff --git a/lang/icc/files/patch-ia32::bin::icpc b/lang/icc/files/patch-ia32::bin::icpc
index 712e1925aea8..a1539954756f 100644
--- a/lang/icc/files/patch-ia32::bin::icpc
+++ b/lang/icc/files/patch-ia32::bin::icpc
@@ -1,6 +1,6 @@
 --- ia32/bin/icpc.orig	Fri Jan 10 16:47:29 2003
 +++ ia32/bin/icpc	Fri Jan 10 17:19:03 2003
-@@ -1,34 +1,61 @@
+@@ -1,34 +1,65 @@
  #!/bin/sh
  
 +PREFIX=@@PREFIX@@
@@ -64,10 +64,14 @@
 +   unset val1
 +   set -- "$@" "-Qoption,ld,-MT"
 +  fi
++  if [ "${val1}" = "-pipe" ] ; then
++    unset val1
++    set -- "$@"
++  fi
 +  set -- "$@" "$val1"
 +  i=$(($i+1))
 + done
-+ exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin -I${PREFIX}/intel/compiler70/ia32/include -I${PREFIX}/intel/compiler70/ia32/include/substitute_headers "$@";
++ exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin "$@";
  else
 - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icpc" <INSTALLDIR>/compiler70/ia32/bin/icpcbin;
 + exec ${PREFIX}/intel/compiler70/ia32/bin/icpcbin;