From 41b6bbecf514b3014611dca98b5d581e1d26c7d6 Mon Sep 17 00:00:00 2001
From: netchild <netchild@FreeBSD.org>
Date: Sun, 11 Jan 2004 17:35:29 +0000
Subject: After the fast bandaid fix for patch-...{icc,icpc} for those fast
 upgrader adopters commit a better fix which also respects PREFIX.

Bump PORTREVISION for this fix, not bumping it for the bandaid fix
was intended.
---
 lang/icc7/Makefile                    |  1 +
 lang/icc7/files/patch-ia32::bin::icc  | 30 ++++++++++++------------------
 lang/icc7/files/patch-ia32::bin::icpc | 30 ++++++++++++------------------
 3 files changed, 25 insertions(+), 36 deletions(-)

(limited to 'lang')

diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index 6aa8bde0033a..e8c4cdeef7a4 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icc7
 PORTVERSION=	7.1.035
+PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pc_${PORTVERSION}
diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc
index 6141a035cc58..bef8fac42018 100644
--- a/lang/icc7/files/patch-ia32::bin::icc
+++ b/lang/icc7/files/patch-ia32::bin::icc
@@ -1,41 +1,35 @@
---- ia32/bin/icc.orig	Tue Oct 21 18:57:00 2003
-+++ ia32/bin/icc	Tue Oct 21 19:12:23 2003
-@@ -1,34 +1,72 @@
+--- ia32/bin/icc.orig	Sun Jan 11 18:23:24 2004
++++ ia32/bin/icc	Sun Jan 11 18:22:09 2004
+@@ -1,6 +1,9 @@
  #!/bin/sh
  
 -if [ -z INTEL_LICENSE_FILE ]
-+ICC_LOCALBASE=%%ICC_LOCALBASE%%
++ICC_LOCALBASE=/usr/local
 +export ICC_LOCALBASE;
 +
 +if [ -z "$INTEL_LICENSE_FILE" ]
  then
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=${ICC_LOCALBASE}/intel/licenses;
+ INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
  else
--INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${ICC_LOCALBASE}/intel/licenses;
+@@ -8,7 +11,7 @@
  fi
  export INTEL_LICENSE_FILE;
  
 -if [ -z LD_LIBRARY_PATH ]
 +if [ -z "$LD_LIBRARY_PATH" ]
  then 
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
-+ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib;
+  LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
  else
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
+@@ -16,7 +19,7 @@
  fi
  export LD_LIBRARY_PATH;
  
 -if [ -z PATH ]
 +if [ -z "$PATH" ]
  then
-- PATH=<INSTALLDIR>/compiler70/ia32/bin;
-+ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin;
+  PATH=<INSTALLDIR>/compiler70/ia32/bin;
  else
-- PATH=<INSTALLDIR>/compiler70/ia32/bin:$PATH;
-+ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin:$PATH;
+@@ -24,11 +27,46 @@
  fi
  export PATH;
  
@@ -81,8 +75,8 @@
 +  set -- "$@" "$val1"
 +  i=$(($i+1))
 + done
-+ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/iccbin "$@";
++ exec <INSTALLDIR>/compiler70/ia32/bin/iccbin "$@";
  else
 - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icc" <INSTALLDIR>/compiler70/ia32/bin/iccbin;
-+ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/iccbin;
++ exec <INSTALLDIR>/compiler70/ia32/bin/iccbin;
  fi
diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc
index a1034fe92498..273ba769c93e 100644
--- a/lang/icc7/files/patch-ia32::bin::icpc
+++ b/lang/icc7/files/patch-ia32::bin::icpc
@@ -1,41 +1,35 @@
---- ia32/bin/icpc.orig	Tue Oct 21 18:57:00 2003
-+++ ia32/bin/icpc	Tue Oct 21 19:11:54 2003
-@@ -1,34 +1,65 @@
+--- ia32/bin/icpc.orig	Sun Jan 11 18:23:25 2004
++++ ia32/bin/icpc	Sun Jan 11 18:22:52 2004
+@@ -1,6 +1,9 @@
  #!/bin/sh
  
 -if [ -z INTEL_LICENSE_FILE ]
-+ICC_LOCALBASE=%%ICC_LOCALBASE%%
++ICC_LOCALBASE=/usr/local
 +export ICC_LOCALBASE;
 +
 +if [ -z "$INTEL_LICENSE_FILE" ]
  then
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=${ICC_LOCALBASE}/intel/licenses;
+ INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
  else
--INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
-+INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${ICC_LOCALBASE}/intel/licenses;
+@@ -8,7 +11,7 @@
  fi
  export INTEL_LICENSE_FILE;
  
 -if [ -z LD_LIBRARY_PATH ]
 +if [ -z "$LD_LIBRARY_PATH" ]
  then 
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
-+ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib;
+  LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib;
  else
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler70/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
+@@ -16,7 +19,7 @@
  fi
  export LD_LIBRARY_PATH;
  
 -if [ -z PATH ]
 +if [ -z "$PATH" ]
  then
-- PATH=<INSTALLDIR>/compiler70/ia32/bin;
-+ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin;
+  PATH=<INSTALLDIR>/compiler70/ia32/bin;
  else
-- PATH=<INSTALLDIR>/compiler70/ia32/bin:$PATH;
-+ PATH=${ICC_LOCALBASE}/intel/compiler70/ia32/bin:$PATH;
+@@ -24,11 +27,39 @@
  fi
  export PATH;
  
@@ -74,8 +68,8 @@
 +  set -- "$@" "$val1"
 +  i=$(($i+1))
 + done
-+ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/icpcbin "$@";
++ exec <INSTALLDIR>/compiler70/ia32/bin/icpcbin "$@";
  else
 - exec -a "<INSTALLDIR>/compiler70/ia32/bin/icpc" <INSTALLDIR>/compiler70/ia32/bin/icpcbin;
-+ exec ${ICC_LOCALBASE}/intel/compiler70/ia32/bin/icpcbin;
++ exec <INSTALLDIR>/compiler70/ia32/bin/icpcbin;
  fi
-- 
cgit