5 files changed, 19 insertions, 69 deletions

diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 6562f1f6cdf5..e4128ae90b50 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	8.1.026
-PORTREVISION=	3
+PORTVERSION=	8.1.028
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pc_${PORTVERSION:C/p.+$//}
@@ -64,7 +63,7 @@ PLIST_SUB+=	MACHINE__TYPES_H="@comment " STDARG_H="" SYS_CDEFS_H="" \
 		STDBOOL_H=""
 .else
 PLIST_SUB+=	STDARG_H="@comment " SYS_CDEFS_H="@comment "
-.if ( ${OSVERSION} < 600013 )
+.if ( ${OSVERSION} < 503103 || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600013 ) )
 PLIST_SUB+=	MACHINE__TYPES_H="" STDBOOL_H=""
 .else
 PLIST_SUB+=	MACHINE__TYPES_H="@comment " STDBOOL_H="@comment "
@@ -171,12 +170,12 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/opt/${COMPILERDIR}/include/sys
 	@${CP} ${FILESDIR}/cdefs.h ${WRKSRC}/opt/${COMPILERDIR}/include/sys
 .endif
-.if ( ${OSVERSION} >= 502108 && ${OSVERSION} < 600013 )
+.if ( ( ${OSVERSION} >= 502108 && ${OSVERSION} < 503103 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600013 ) )
 # Work around bug for ICC support in src/sys/i386/include/_types.h.
 	@${MKDIR} ${WRKSRC}/opt/${COMPILERDIR}/include/machine
 	@${CP} ${FILESDIR}/_types.h ${WRKSRC}/opt/${COMPILERDIR}/include/machine
 .endif
-.if ( ${OSVERSION} < 600013 )
+.if ( ${OSVERSION} < 503103 || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600013 ) )
 # Work around a bug in stdbool.h
 	@${SED} -e 's:__STDC_VERSION__ < 199901L.*:__STDC_VERSION__ < 199901L \&\& defined(__GNUC__) \&\& __GNUC__ < 3 \&\& !defined(__INTEL_COMPILER):g' \
 		</usr/include/stdbool.h \
diff --git a/lang/icc/distinfo b/lang/icc/distinfo
index 61b5333e9875..0570f43787c4 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1,2 +1,2 @@
-MD5 (l_cc_pc_8.1.026.tar.gz) = 73f7d45ac68a59e49419d756d1d66803
-SIZE (l_cc_pc_8.1.026.tar.gz) = 134654912
+MD5 (l_cc_pc_8.1.028.tar.gz) = c731762ff850020e67856980d9919030
+SIZE (l_cc_pc_8.1.028.tar.gz) = 135460369
diff --git a/lang/icc/files/patch-bin::icc b/lang/icc/files/patch-bin::icc
index 3e8be91a7406..c839ac96d8b3 100644
--- a/lang/icc/files/patch-bin::icc
+++ b/lang/icc/files/patch-bin::icc
@@ -1,37 +1,17 @@
---- bin/icc.orig	Tue Dec  9 19:55:19 2003
-+++ bin/icc	Tue Dec  9 20:03:34 2003
-@@ -1,6 +1,12 @@
+--- bin/icc.orig	Sun Mar  6 15:40:09 2005
++++ bin/icc	Sun Mar  6 15:44:30 2005
+@@ -1,5 +1,11 @@
  #!/bin/sh
  
--if [ -z INTEL_LICENSE_FILE ]
 +ICC_LOCALBASE=%%ICC_LOCALBASE%%
 +export ICC_LOCALBASE
 +
-+GXX_ROOT=<INSTALLDIR>/lib
++GXX_ROOT=${GXX_ROOT:-<INSTALLDIR>/lib}
 +export GXX_ROOT
 +
-+if [ -z "$INTEL_LICENSE_FILE" ]
+ if [ -z "$INTEL_LICENSE_FILE" ]
  then
- INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
- else
-@@ -8,7 +14,7 @@
- fi
- export INTEL_LICENSE_FILE;
- 
--if [ -z LD_LIBRARY_PATH ]
-+if [ -z "$LD_LIBRARY_PATH" ]
- then 
-  LD_LIBRARY_PATH=<INSTALLDIR>/lib;
- else
-@@ -16,7 +22,7 @@
- fi
- export LD_LIBRARY_PATH;
- 
--if [ -z PATH ]
-+if [ -z "$PATH" ]
- then
-  PATH=<INSTALLDIR>/bin;
- else
+  INTEL_LICENSE_FILE="<INSTALLDIR>/licenses";
 @@ -24,11 +30,46 @@
  fi
  export PATH;
diff --git a/lang/icc/files/patch-bin::icpc b/lang/icc/files/patch-bin::icpc
index 04f3858d9aed..7ea91465461a 100644
--- a/lang/icc/files/patch-bin::icpc
+++ b/lang/icc/files/patch-bin::icpc
@@ -1,43 +1,23 @@
---- bin/icpc.orig	Tue Dec  9 19:55:12 2003
-+++ bin/icpc	Tue Dec  9 20:12:01 2003
-@@ -1,6 +1,18 @@
+--- bin/icpc.orig	Sun Mar  6 15:46:09 2005
++++ bin/icpc	Sun Mar  6 15:48:12 2005
+@@ -1,5 +1,17 @@
  #!/bin/sh
  
--if [ -z INTEL_LICENSE_FILE ]
 +ICC_LOCALBASE=%%ICC_LOCALBASE%%
 +export ICC_LOCALBASE
 +
-+GXX_ROOT=<INSTALLDIR>/lib
++GXX_ROOT=${GXX_ROOT:-<INSTALLDIR>/lib}
 +export GXX_ROOT
 +
-+GXX_INCLUDE=%%GXX_INCLUDE%%
++GXX_INCLUDE=${GXX_INCLUDE:-%%GXX_INCLUDE%%}
 +if [ ! -z "$GXX_INCLUDE" ]
 +then
 + export GXX_INCLUDE
 +fi
 +
-+if [ -z "$INTEL_LICENSE_FILE" ]
+ if [ -z "$INTEL_LICENSE_FILE" ]
  then
- INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
- else
-@@ -8,7 +20,7 @@
- fi
- export INTEL_LICENSE_FILE;
- 
--if [ -z LD_LIBRARY_PATH ]
-+if [ -z "$LD_LIBRARY_PATH" ]
- then 
-  LD_LIBRARY_PATH=<INSTALLDIR>/lib;
- else
-@@ -16,7 +28,7 @@
- fi
- export LD_LIBRARY_PATH;
- 
--if [ -z PATH ]
-+if [ -z "$PATH" ]
- then
-  PATH=<INSTALLDIR>/bin;
- else
+  INTEL_LICENSE_FILE="<INSTALLDIR>/licenses";
 @@ -24,11 +36,43 @@
  fi
  export PATH;
diff --git a/lang/icc/files/patch-include::mathimf.h b/lang/icc/files/patch-include::mathimf.h
index 16d004800238..8de149da80b2 100644
--- a/lang/icc/files/patch-include::mathimf.h
+++ b/lang/icc/files/patch-include::mathimf.h
@@ -9,15 +9,6 @@
  # include <math.h>  /* utilize GNU math header */
  # if defined(fpclassify)
  #  undef fpclassify
-@@ -110,7 +110,7 @@
- #if defined(_DLL) && (defined(_WIN32) || defined(_WIN64))   /* Windows DLL */
- # define _LIBIMF_PUBAPI __declspec(dllimport) __cdecl
- # define _LIBIMF_PUBVAR __declspec(dllimport)
--#elif defined(__linux__)                          /* Linux */
-+#elif defined(__linux__) || defined(__FreeBSD__)  /* Linux || FreeBSD */
- # define _LIBIMF_PUBAPI /* do not change this line! */
- # define _LIBIMF_PUBVAR
- #else                                             /* Windows static */
 @@ -262,7 +262,7 @@
  
  /* Radian argument trigonometric functions */