7 files changed, 20 insertions, 17 deletions

diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 2e44e0ab7b3a..623f73484a05 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	8.1.030
+PORTVERSION=	8.1.032
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pc_${PORTVERSION:C/p.+$//}
diff --git a/lang/icc/distinfo b/lang/icc/distinfo
index 178d23aa6910..3f28ca31adb6 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1,2 +1,2 @@
-MD5 (l_cc_pc_8.1.030.tar.gz) = 355b8ed8c2390133077d5dce76d35e45
-SIZE (l_cc_pc_8.1.030.tar.gz) = 135376166
+MD5 (l_cc_pc_8.1.032.tar.gz) = a6ca6bf933f9e39971dfa89a27963c3a
+SIZE (l_cc_pc_8.1.032.tar.gz) = 135581695
diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c
index 797fe7497610..3823e5bb8689 100644
--- a/lang/icc/files/ld.c
+++ b/lang/icc/files/ld.c
@@ -216,12 +216,13 @@ main(int argc, char *argv[], char *envp[])
 
 		/*
 		 * Don't add "-m elf_i386" ICC passed to us. Don't add
-		 * libgcc_eh, libgcc_s or libgcc_s_32.
+		 * libgcc_eh, libgcc_s or libgcc_s_32, libdl.
 		 */
 		if ((ARGCMP(i, "-m") && i < argc - 1 && ARGCMP(i + 1,
 		    "elf_i386")) || (ARGCMP(i, "elf_i386") && i != 0 &&
 		    ARGCMP(i - 1, "-m")) || ARGCMP(i, "-lgcc_eh") ||
-		    ARGCMP(i, "-lgcc_s") || ARGCMP(i, "-lgcc_s_32"))
+		    ARGCMP(i, "-lgcc_s") || ARGCMP(i, "-lgcc_s_32") ||
+		    ARGCMP(i, "-ldl"))
 			continue;
 
 		/*
diff --git a/lang/icc/files/patch-include::dvec.h b/lang/icc/files/patch-include::dvec.h
index d22ebce0dc17..a8f4ff75ca64 100644
--- a/lang/icc/files/patch-include::dvec.h
+++ b/lang/icc/files/patch-include::dvec.h
@@ -1,11 +1,11 @@
---- include/dvec.h.orig	Fri Jan 10 18:12:30 2003
-+++ include/dvec.h	Fri Jan 10 18:53:34 2003
+--- include/dvec.h.orig	Sat Jun  4 17:31:49 2005
++++ include/dvec.h	Sat Jun  4 17:34:42 2005
 @@ -38,7 +38,7 @@
  
  
  /* If using MSVC5.0, explicit keyword should be used */
--#if (_MSC_VER >= 1100) || defined (__linux__)
-+#if (_MSC_VER >= 1100) || defined (__linux__) || defined (__FreeBSD__)
+-#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__)
++#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__) || defined (__FreeBSD__)
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
diff --git a/lang/icc/files/patch-include::fvec.h b/lang/icc/files/patch-include::fvec.h
index b0a61402485d..0ec03efd745f 100644
--- a/lang/icc/files/patch-include::fvec.h
+++ b/lang/icc/files/patch-include::fvec.h
@@ -1,11 +1,11 @@
---- include/fvec.h.orig	Tue Dec  9 20:16:16 2003
-+++ include/fvec.h	Tue Dec  9 20:18:31 2003
+--- include/fvec.h.orig	Sat Jun  4 17:36:19 2005
++++ include/fvec.h	Sat Jun  4 17:45:48 2005
 @@ -41,7 +41,7 @@
  #pragma pack(push,16) /* Must ensure class & union 16-B aligned */
  
  /* If using MSVC5.0, explicit keyword should be used */
--#if (_MSC_VER >= 1100) || defined (__linux__)
-+#if (_MSC_VER >= 1100) || defined (__linux__) || defined (__FreeBSD__)
+-#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__)
++#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__) || defined (__FreeBSD__)
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
diff --git a/lang/icc/files/patch-include::ivec.h b/lang/icc/files/patch-include::ivec.h
index 5ccbaab6242c..f250e87f4c94 100644
--- a/lang/icc/files/patch-include::ivec.h
+++ b/lang/icc/files/patch-include::ivec.h
@@ -1,11 +1,11 @@
---- include/ivec.h.orig	Tue Dec  9 20:16:16 2003
-+++ include/ivec.h	Tue Dec  9 20:36:38 2003
+--- include/ivec.h.orig	Sat Jun  4 17:36:19 2005
++++ include/ivec.h	Sat Jun  4 17:47:23 2005
 @@ -23,7 +23,7 @@
  #include <assert.h>
  
  /* If using MSVC5.0, explicit keyword should be used */
--#if (_MSC_VER >= 1100) || defined (__linux__)
-+#if (_MSC_VER >= 1100) || defined (__linux__) || defined (__FreeBSD__)
+-#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__)
++#if (_MSC_VER >= 1100) || defined (__linux__) || defined(__QNX__) || defined (__FreeBSD__)
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index b962504cb4b6..9c2e837c6c99 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -940,7 +940,9 @@
 %%COMPILERDIR%%/lib/libimf.a
 %%COMPILERDIR%%/lib/libimf.so
 %%COMPILERDIR%%/lib/libirc.a
+%%COMPILERDIR%%/lib/libirc_nonpic.a
 %%COMPILERDIR%%/lib/libirc_s.a
+%%COMPILERDIR%%/lib/libirc_s_nonpic.a
 %%COMPILERDIR%%/lib/libsvml.a
 %%COMPILERDIR%%/lib/libunwind.a
 @dirrm %%COMPILERDIR%%/lib