- update to 7.0.082

- fix [dfi]vec.h with stlport-iostreams
- do not install a Windows header (mathf.h)
- do not install libompstub (depends on pthread_atfork(), see PR 17437)

Submitted by:	marius@alchemy.franken.de

- point to the icc errata after make install

20 files changed, 156 insertions, 42 deletions

diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 7d3d6a6d6722..7c1cb2e17640 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.0.078
-PORTREVISION=	1
+PORTVERSION=	7.0.082
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pu_${PORTVERSION}
@@ -61,12 +60,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.0-78.i386.rpm
-#	intel-ildb7-7.0-156.i386.rpm \
-#	intel-isubh7-7.0-78.i386.rpm \
-#	intel-ecc7-7.0-78.ia64.rpm \
-#	intel-eldb7-7.0-156.ia64.rpm \
-#	intel-esubh7-7.0-78.ia64.rpm
+	intel-icc7-7.0-82.i386.rpm
+#	intel-ildb7-7.0-164.i386.rpm \
+#	intel-isubh7-7.0-82.i386.rpm \
+#	intel-ecc7-7.0-82.ia64.rpm \
+#	intel-eldb7-7.0-164.ia64.rpm \
+#	intel-esubh7-7.0-82.ia64.rpm
 	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
 		cpio -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
@@ -103,7 +102,7 @@ post-patch:
 .for i in icc.cfg icpc.cfg
 	@${REINPLACE_CMD} -i "" -e 's:-Xlinker -rpath -Xlinker <INSTALLDIR>/${COMPILERDIR}/ia32/lib::g' \
 		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
-	@${ECHO} -e "-Qlocation,ld,${PREFIX}/intel/${COMPILERDIR}/ia32/bin/ldwrapper\n\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+	@${ECHO} -e "-Qlocation,ld,${PREFIX}/intel/${COMPILERDIR}/ia32/bin/ldwrapper\n\n-Ulinux\n-U__linux__\n-U__linux\n-U__gnu_linux__\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .if ${OSVERSION} >= 500039
 	@${ECHO} -e "-D__wchar_t=__ct_rune_t\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endif
@@ -126,7 +125,7 @@ do-build:
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c
 .else
-.for i in libcxa.a libimf.a libirc.a libircmt.a libompstub.a libunwind.a
+.for i in libcxa.a libimf.a libirc.a libircmt.a libunwind.a
 	@${OBJCOPY} --redefine-sym stdin=__stdinp \
 		--redefine-sym stdout=__stdoutp \
 		--redefine-sym stderr=__stderrp \
@@ -161,5 +160,9 @@ post-install:
 	@${ECHO_CMD}
 	@${ECHO_CMD} "WARNING: If you use icc while having linux_devtools installed, icc will use"
 	@${ECHO_CMD} "the wrong includes and therefore will generate bogus (not working) binaries!"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "If you encounter further problems with icc please consult the errata at"
+	@${ECHO_CMD} "http://support.intel.com/support/performancetools/c/C_Compiler_Errata.htm"
+	@${ECHO_CMD} "first."
 
 .include <bsd.port.post.mk>
diff --git a/lang/icc/distinfo b/lang/icc/distinfo
index 1e5e6fb3ced0..8c37b8146c19 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pu_7.0.078.tar) = d89198776a948895597c39b83daa923c
+MD5 (l_cc_pu_7.0.082.tar) = 7f066133cf978c550fd34353da482660
diff --git a/lang/icc/files/cpio-exclude b/lang/icc/files/cpio-exclude
index be25b951fc6a..6f8fc41c5875 100644
--- a/lang/icc/files/cpio-exclude
+++ b/lang/icc/files/cpio-exclude
@@ -29,12 +29,14 @@
 */opt/intel/%%COMPILERDIR%%/ia32/include/list.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/locale
 */opt/intel/%%COMPILERDIR%%/ia32/include/map
+*/opt/intel/%%COMPILERDIR%%/ia32/include/mathf.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/memory
 */opt/intel/%%COMPILERDIR%%/ia32/include/numeric
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/ostream
 */opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/regex.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/set
 */opt/intel/%%COMPILERDIR%%/ia32/include/slist
 */opt/intel/%%COMPILERDIR%%/ia32/include/sstream
@@ -82,6 +84,7 @@
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libompstub.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so.3
 */opt/intel/%%COMPILERDIR%%/man/man1/ecc.1
diff --git a/lang/icc/files/patch-ia32::bin::icc b/lang/icc/files/patch-ia32::bin::icc
index 55406344c471..596787d71cc3 100644
--- a/lang/icc/files/patch-ia32::bin::icc
+++ b/lang/icc/files/patch-ia32::bin::icc
@@ -1,12 +1,19 @@
 --- ia32/bin/icc.orig	Fri Jan 10 16:57:18 2003
 +++ ia32/bin/icc	Fri Jan 10 17:09:38 2003
-@@ -1,29 +1,62 @@
+@@ -1,34 +1,68 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc/files/patch-ia32::bin::icpc b/lang/icc/files/patch-ia32::bin::icpc
index 49c3609b345b..a4cc5026d007 100644
--- a/lang/icc/files/patch-ia32::bin::icpc
+++ b/lang/icc/files/patch-ia32::bin::icpc
@@ -1,12 +1,19 @@
 --- ia32/bin/icpc.orig	Fri Jan 10 16:47:29 2003
 +++ ia32/bin/icpc	Fri Jan 10 17:19:03 2003
-@@ -1,29 +1,55 @@
+@@ -1,34 +1,61 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc/files/patch-ia32::include::dvec.h b/lang/icc/files/patch-ia32::include::dvec.h
index 0dd3c423d040..e269b138b912 100644
--- a/lang/icc/files/patch-ia32::include::dvec.h
+++ b/lang/icc/files/patch-ia32::include::dvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -50,10 +50,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM)
++#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM) || defined(_STLP_IOSTREAM)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD
+ #endif
diff --git a/lang/icc/files/patch-ia32::include::fvec.h b/lang/icc/files/patch-ia32::include::fvec.h
index 2a68afbc28e9..fdbb75016ce2 100644
--- a/lang/icc/files/patch-ia32::include::fvec.h
+++ b/lang/icc/files/patch-ia32::include::fvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -53,10 +53,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD
+ #endif
diff --git a/lang/icc/files/patch-ia32::include::ivec.h b/lang/icc/files/patch-ia32::include::ivec.h
index 50ec1c1ead5b..716ae2bc1c7b 100644
--- a/lang/icc/files/patch-ia32::include::ivec.h
+++ b/lang/icc/files/patch-ia32::include::ivec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -36,10 +36,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD
+ #endif
diff --git a/lang/icc/files/patch-ia32::include::yvals.h b/lang/icc/files/patch-ia32::include::yvals.h
index e566d6000799..b212cdf178b5 100644
--- a/lang/icc/files/patch-ia32::include::yvals.h
+++ b/lang/icc/files/patch-ia32::include::yvals.h
@@ -172,11 +172,11 @@
 -typedef wchar_t _Wchart;
 -typedef wchar_t _Wintt;
 -    #else /* _HAS_WCHAR_TYPE */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -    #endif /* _HAS_WCHAR_TYPE */
 -  #else /* __cplusplus */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -  #endif /* __cplusplus */
 - #endif /* __CYGWIN__ */
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index d6a2ff6148e1..293956e4f108 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -732,7 +732,6 @@ intel/%%COMPILERDIR%%/ia32/include/exception
 intel/%%COMPILERDIR%%/ia32/include/fvec.h
 intel/%%COMPILERDIR%%/ia32/include/ivec.h
 intel/%%COMPILERDIR%%/ia32/include/math.h
-intel/%%COMPILERDIR%%/ia32/include/mathf.h
 intel/%%COMPILERDIR%%/ia32/include/mathimf.h
 intel/%%COMPILERDIR%%/ia32/include/mmintrin.h
 intel/%%COMPILERDIR%%/ia32/include/new
@@ -759,7 +758,6 @@ intel/%%COMPILERDIR%%/ia32/lib/libcxa.so.3
 intel/%%COMPILERDIR%%/ia32/lib/libimf.a
 intel/%%COMPILERDIR%%/ia32/lib/libirc.a
 intel/%%COMPILERDIR%%/ia32/lib/libircmt.a
-intel/%%COMPILERDIR%%/ia32/lib/libompstub.a
 intel/%%COMPILERDIR%%/ia32/lib/libsvml.a
 intel/%%COMPILERDIR%%/ia32/lib/libunwind.a
 @dirrm intel/%%COMPILERDIR%%/ia32/lib
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index 7d3d6a6d6722..7c1cb2e17640 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.0.078
-PORTREVISION=	1
+PORTVERSION=	7.0.082
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pu_${PORTVERSION}
@@ -61,12 +60,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.0-78.i386.rpm
-#	intel-ildb7-7.0-156.i386.rpm \
-#	intel-isubh7-7.0-78.i386.rpm \
-#	intel-ecc7-7.0-78.ia64.rpm \
-#	intel-eldb7-7.0-156.ia64.rpm \
-#	intel-esubh7-7.0-78.ia64.rpm
+	intel-icc7-7.0-82.i386.rpm
+#	intel-ildb7-7.0-164.i386.rpm \
+#	intel-isubh7-7.0-82.i386.rpm \
+#	intel-ecc7-7.0-82.ia64.rpm \
+#	intel-eldb7-7.0-164.ia64.rpm \
+#	intel-esubh7-7.0-82.ia64.rpm
 	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
 		cpio -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
@@ -103,7 +102,7 @@ post-patch:
 .for i in icc.cfg icpc.cfg
 	@${REINPLACE_CMD} -i "" -e 's:-Xlinker -rpath -Xlinker <INSTALLDIR>/${COMPILERDIR}/ia32/lib::g' \
 		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
-	@${ECHO} -e "-Qlocation,ld,${PREFIX}/intel/${COMPILERDIR}/ia32/bin/ldwrapper\n\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+	@${ECHO} -e "-Qlocation,ld,${PREFIX}/intel/${COMPILERDIR}/ia32/bin/ldwrapper\n\n-Ulinux\n-U__linux__\n-U__linux\n-U__gnu_linux__\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .if ${OSVERSION} >= 500039
 	@${ECHO} -e "-D__wchar_t=__ct_rune_t\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endif
@@ -126,7 +125,7 @@ do-build:
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c
 .else
-.for i in libcxa.a libimf.a libirc.a libircmt.a libompstub.a libunwind.a
+.for i in libcxa.a libimf.a libirc.a libircmt.a libunwind.a
 	@${OBJCOPY} --redefine-sym stdin=__stdinp \
 		--redefine-sym stdout=__stdoutp \
 		--redefine-sym stderr=__stderrp \
@@ -161,5 +160,9 @@ post-install:
 	@${ECHO_CMD}
 	@${ECHO_CMD} "WARNING: If you use icc while having linux_devtools installed, icc will use"
 	@${ECHO_CMD} "the wrong includes and therefore will generate bogus (not working) binaries!"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "If you encounter further problems with icc please consult the errata at"
+	@${ECHO_CMD} "http://support.intel.com/support/performancetools/c/C_Compiler_Errata.htm"
+	@${ECHO_CMD} "first."
 
 .include <bsd.port.post.mk>
diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo
index 1e5e6fb3ced0..8c37b8146c19 100644
--- a/lang/icc7/distinfo
+++ b/lang/icc7/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pu_7.0.078.tar) = d89198776a948895597c39b83daa923c
+MD5 (l_cc_pu_7.0.082.tar) = 7f066133cf978c550fd34353da482660
diff --git a/lang/icc7/files/cpio-exclude b/lang/icc7/files/cpio-exclude
index be25b951fc6a..6f8fc41c5875 100644
--- a/lang/icc7/files/cpio-exclude
+++ b/lang/icc7/files/cpio-exclude
@@ -29,12 +29,14 @@
 */opt/intel/%%COMPILERDIR%%/ia32/include/list.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/locale
 */opt/intel/%%COMPILERDIR%%/ia32/include/map
+*/opt/intel/%%COMPILERDIR%%/ia32/include/mathf.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/memory
 */opt/intel/%%COMPILERDIR%%/ia32/include/numeric
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/ostream
 */opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/regex.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/set
 */opt/intel/%%COMPILERDIR%%/ia32/include/slist
 */opt/intel/%%COMPILERDIR%%/ia32/include/sstream
@@ -82,6 +84,7 @@
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libompstub.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so.3
 */opt/intel/%%COMPILERDIR%%/man/man1/ecc.1
diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc
index 55406344c471..596787d71cc3 100644
--- a/lang/icc7/files/patch-ia32::bin::icc
+++ b/lang/icc7/files/patch-ia32::bin::icc
@@ -1,12 +1,19 @@
 --- ia32/bin/icc.orig	Fri Jan 10 16:57:18 2003
 +++ ia32/bin/icc	Fri Jan 10 17:09:38 2003
-@@ -1,29 +1,62 @@
+@@ -1,34 +1,68 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc
index 49c3609b345b..a4cc5026d007 100644
--- a/lang/icc7/files/patch-ia32::bin::icpc
+++ b/lang/icc7/files/patch-ia32::bin::icpc
@@ -1,12 +1,19 @@
 --- ia32/bin/icpc.orig	Fri Jan 10 16:47:29 2003
 +++ ia32/bin/icpc	Fri Jan 10 17:19:03 2003
-@@ -1,29 +1,55 @@
+@@ -1,34 +1,61 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc7/files/patch-ia32::include::dvec.h b/lang/icc7/files/patch-ia32::include::dvec.h
index 0dd3c423d040..e269b138b912 100644
--- a/lang/icc7/files/patch-ia32::include::dvec.h
+++ b/lang/icc7/files/patch-ia32::include::dvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -50,10 +50,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM)
++#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM) || defined(_STLP_IOSTREAM)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::fvec.h b/lang/icc7/files/patch-ia32::include::fvec.h
index 2a68afbc28e9..fdbb75016ce2 100644
--- a/lang/icc7/files/patch-ia32::include::fvec.h
+++ b/lang/icc7/files/patch-ia32::include::fvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -53,10 +53,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::ivec.h b/lang/icc7/files/patch-ia32::include::ivec.h
index 50ec1c1ead5b..716ae2bc1c7b 100644
--- a/lang/icc7/files/patch-ia32::include::ivec.h
+++ b/lang/icc7/files/patch-ia32::include::ivec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -36,10 +36,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::yvals.h b/lang/icc7/files/patch-ia32::include::yvals.h
index e566d6000799..b212cdf178b5 100644
--- a/lang/icc7/files/patch-ia32::include::yvals.h
+++ b/lang/icc7/files/patch-ia32::include::yvals.h
@@ -172,11 +172,11 @@
 -typedef wchar_t _Wchart;
 -typedef wchar_t _Wintt;
 -    #else /* _HAS_WCHAR_TYPE */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -    #endif /* _HAS_WCHAR_TYPE */
 -  #else /* __cplusplus */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -  #endif /* __cplusplus */
 - #endif /* __CYGWIN__ */
diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist
index d6a2ff6148e1..293956e4f108 100644
--- a/lang/icc7/pkg-plist
+++ b/lang/icc7/pkg-plist
@@ -732,7 +732,6 @@ intel/%%COMPILERDIR%%/ia32/include/exception
 intel/%%COMPILERDIR%%/ia32/include/fvec.h
 intel/%%COMPILERDIR%%/ia32/include/ivec.h
 intel/%%COMPILERDIR%%/ia32/include/math.h
-intel/%%COMPILERDIR%%/ia32/include/mathf.h
 intel/%%COMPILERDIR%%/ia32/include/mathimf.h
 intel/%%COMPILERDIR%%/ia32/include/mmintrin.h
 intel/%%COMPILERDIR%%/ia32/include/new
@@ -759,7 +758,6 @@ intel/%%COMPILERDIR%%/ia32/lib/libcxa.so.3
 intel/%%COMPILERDIR%%/ia32/lib/libimf.a
 intel/%%COMPILERDIR%%/ia32/lib/libirc.a
 intel/%%COMPILERDIR%%/ia32/lib/libircmt.a
-intel/%%COMPILERDIR%%/ia32/lib/libompstub.a
 intel/%%COMPILERDIR%%/ia32/lib/libsvml.a
 intel/%%COMPILERDIR%%/ia32/lib/libunwind.a
 @dirrm intel/%%COMPILERDIR%%/ia32/lib