6 files changed, 20 insertions, 17 deletions

diff --git a/lang/Makefile b/lang/Makefile
index a38f668ed09c..82d5206aeb90 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -90,6 +90,7 @@
     SUBDIR += huc
     SUBDIR += hugs
     SUBDIR += icc
+    SUBDIR += icc7
     SUBDIR += ici
     SUBDIR += icon
     SUBDIR += ifc
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index d3a956984d26..6aa8bde0033a 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	icc
-PORTVERSION=	7.1.034
-PORTREVISION=	1
+PORTNAME=	icc7
+PORTVERSION=	7.1.035
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pc_${PORTVERSION}
@@ -51,9 +50,11 @@ ICCCFGVAL!=	${UNAME} -r | ${SED} -e 's/\..*//'
 CPIO?=		/usr/bin/cpio
 OBJCOPY?=	/usr/bin/objcopy
 
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
+.for file in ${DISTNAME}
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${file}${EXTRACT_SUFX})
 IGNORE=	"Go to Intel Premier Support, https://premier.intel.com, to obtain ${DISTFILES}. Product updates such as this compiler are posted regularly on Premier Support. You must have a license to obtain access to Premier Support. If you do not already have a license go to ${ICC_SITE} to review licensing options \(evaluation, commercial, and free non-commercial\) and obtain a license. Put ${DISTFILES} into ${DISTDIR} and run make again"
 .endif
+.endfor
 
 .if exists(${LINUXBASE}/boot/kernel.h) || \
 	exists(${PREFIX}/intel/compiler60/bin/ifc) || \
@@ -69,8 +70,8 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.1-37.i386.rpm
-#	intel-iidb7-7.2.2-75.i386.rpm
+	intel-icc7-7.1-38.i386.rpm
+#	intel-iidb7-7.2.2-77.i386.rpm
 	@cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
@@ -93,7 +94,8 @@ pre-patch:
 post-patch:
 # Correct some paths and patch some files
 .for i in ia32/bin/icc ia32/bin/iccvars.csh ia32/bin/iccvars.sh ia32/bin/icpc
-	@${REINPLACE_CMD} -i "" -e 's:@@PREFIX@@:${PREFIX}:g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@man -w@manpath -q@g' \
+	@${REINPLACE_CMD} -i "" -e 's:%%ICC_LOCALBASE%%:${LOCALBASE}:g; \
+		s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@man -w@manpath -q@g' \
 		${WRKSRC}/opt/intel/${COMPILERDIR}/${i}
 	@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/${i}
 .endfor
diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo
index de9f003134e5..1d6467f3d4f8 100644
--- a/lang/icc7/distinfo
+++ b/lang/icc7/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pc_7.1.034.tar) = 1b53d88da56fdb30b002c0c1fb8e481f
+MD5 (l_cc_pc_7.1.035.tar) = 4c13c28ae20db26b0acab29acb8d24db
diff --git a/lang/icc7/files/ld.c b/lang/icc7/files/ld.c
index a55671768e79..aa184e484658 100644
--- a/lang/icc7/files/ld.c
+++ b/lang/icc7/files/ld.c
@@ -76,7 +76,7 @@ main(int argc, char *argv[], char *envp[])
 {
 	size_t i;
 	u_int flags;
-	const char *libc, *libthr, *prefix;
+	const char *libc, *libthr, *icc_localbase;
 	struct arglist al = { 0, NULL };
 
 	flags = 0;
@@ -84,8 +84,8 @@ main(int argc, char *argv[], char *envp[])
 	if (argc == 1)
 		errx(1, "no input files");
 
-	if ((prefix = getenv("PREFIX")) == NULL)
-		errx(1, "can't get PREFIX");
+	if ((icc_localbase = getenv("ICC_LOCALBASE")) == NULL)
+		errx(1, "can't get ICC_LOCALBASE");
 
 #ifdef DEBUG
 	printf("input: ");
@@ -247,7 +247,7 @@ main(int argc, char *argv[], char *envp[])
 			addarg(&al, "-L/usr/lib");
 			if (flags & LDW_CPP) {
 				char *p;
-				asprintf(&p, "-L%s/lib", prefix);
+				asprintf(&p, "-L%s/lib", icc_localbase);
 				if (p == NULL)
 					err(1, NULL);
 				addarg(&al, p);
@@ -273,7 +273,7 @@ main(int argc, char *argv[], char *envp[])
 
 		/* Don't add superfluous -Bstatic. */
 		if (ARGCMP(i, "-Bstatic") && i < argc - 1 &&
-		    (ARGCMP(i + 1, "-lcprts") ||  ARGCMP(i + 1, "-lunwind")))
+		    (ARGCMP(i + 1, "-lcprts") || ARGCMP(i + 1, "-lunwind")))
 			continue;
 
 		/*
diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc
index 69b3e4ff1c13..a671913fa720 100644
--- a/lang/icc7/files/patch-ia32::bin::icc
+++ b/lang/icc7/files/patch-ia32::bin::icc
@@ -4,8 +4,8 @@
  #!/bin/sh
  
 -if [ -z INTEL_LICENSE_FILE ]
-+PREFIX=@@PREFIX@@
-+export PREFIX;
++ICC_LOCALBASE=%%ICC_LOCALBASE%%
++export ICC_LOCALBASE;
 +
 +if [ -z "$INTEL_LICENSE_FILE" ]
  then
diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc
index 0557997d9a8b..2777cf0bb24e 100644
--- a/lang/icc7/files/patch-ia32::bin::icpc
+++ b/lang/icc7/files/patch-ia32::bin::icpc
@@ -4,8 +4,8 @@
  #!/bin/sh
  
 -if [ -z INTEL_LICENSE_FILE ]
-+PREFIX=@@PREFIX@@
-+export PREFIX;
++ICC_LOCALBASE=%%ICC_LOCALBASE%%
++export ICC_LOCALBASE;
 +
 +if [ -z "$INTEL_LICENSE_FILE" ]
  then