aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LEGAL2
-rw-r--r--lang/icc/Makefile29
-rw-r--r--lang/icc/distinfo2
-rw-r--r--lang/icc/pkg-plist1
-rw-r--r--lang/icc7/Makefile29
-rw-r--r--lang/icc7/distinfo2
-rw-r--r--lang/icc7/pkg-plist1
7 files changed, 35 insertions, 31 deletions
diff --git a/LEGAL b/LEGAL
index 85db25ec8764..9d6a640838d4 100644
--- a/LEGAL
+++ b/LEGAL
@@ -136,7 +136,7 @@ jdk-tutorial-* ports/java/jdk-tutorial This software is under license and expor
JRE-* ports/java/jre Put copyright on packaging!
kaffe-* ports/java/kaffe Restrictive copyright
ksh93 ports/shells/ksh93 User must agree to "regularly monitor the Website".
-l_cc_p_6.0.139.tar ports/lang/icc No redistribution allowed
+l_cc_pu_6.0.149.tar ports/lang/icc No redistribution allowed
lgrind ports/print/lgrind Contains non-free code written by Van Jacobson
linux-netscape6 ports/www/linux-netscape6 Java plugin is from Sun.
linuxq3ademo-* ports/games/linux-q3ademo Restrictive license by Loki Software
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 8d3590f98cca..bf131b2ae8a9 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= icc
-PORTVERSION= 6.0.139
-PORTREVISION= 1
+PORTVERSION= 6.0.149
CATEGORIES= lang linux
-MASTER_SITES= http://www.intel.com/software/products/compilers/
-DISTNAME= l_cc_p_6.0.139
+MASTER_SITES=
+DISTNAME= l_cc_pu_6.0.149
EXTRACT_SUFX= .tar
MAINTAINER= netchild@FreeBSD.org
@@ -28,22 +27,24 @@ NO_WRKSUBDIR= yes
NO_BUILD= yes
NO_FILTER_SHLIBS= yes
+ICC_SITE= http://www.intel.com/software/products/compilers/
+
.include <bsd.port.pre.mk>
ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//'
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= "Please manually download it from ${MASTER_SITES}, e.g. from http://www.intel.com/software/products/compilers/c60l/noncom.htm. Put it into ${DISTDIR} and run make again. WARNING: this will lead to a mixed up installation if you already use the default linux emulation. This port uses the linux_base-7 port instead of the default linux_base port"
+.if !exists(${DISTDIR}/${DISTFILES})
+IGNORE= "Please manually download ${DISTFILES} from ${ICC_SITE}, e.g. from ${ICC_SITE}c60l/noncom.htm. Put it into ${DISTDIR} and run make again."
.endif
post-extract:
.for i in \
- intel-icc6-6.0-139.i386.rpm \
-# intel-ildb6-6.0-189.i386.rpm \
-# intel-isubh6-6.0-139.i386.rpm \
-# intel-ecc6-6.0-139.ia64.rpm \
-# intel-eldb6-6.0-189.ia64.rpm \
-# intel-esubh6-6.0-139.ia64.rpm
+ intel-icc6-6.0-149.i386.rpm \
+# intel-ildb6-6.0-208.i386.rpm \
+# intel-isubh6-6.0-149.i386.rpm \
+# intel-ecc6-6.0-149.ia64.rpm \
+# intel-eldb6-6.0-208.ia64.rpm \
+# intel-esubh6-6.0-149.ia64.rpm
@cd ${WRKSRC}; rpm2cpio ${i} | cpio -idu --quiet
.endfor
@@ -65,8 +66,8 @@ pre-patch:
post-patch:
# Correct some paths and patch some files
.for i in ia32/bin/icc ia32/bin/icc.cfg ia32/bin/iccvars.csh \
- ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg
- @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g' \
+ ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg docs/csupport
+ @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:Intel(R) C++ Compiler for Linux:g' \
${WRKSRC}/opt/intel/compiler60/${i} \
>${WRKSRC}/opt/intel/compiler60/${i}.seded
@${MV} -f ${WRKSRC}/opt/intel/compiler60/${i}.seded \
diff --git a/lang/icc/distinfo b/lang/icc/distinfo
index 564a6236fe3c..3f8b46cb865b 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1 +1 @@
-MD5 (l_cc_p_6.0.139.tar) = a8143725154434763b32926f8aca2473
+MD5 (l_cc_pu_6.0.149.tar) = 8c5d9a2e0ee5e82b0bb02800a9394e9e
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index 24a47b5f3807..7b578d4558c0 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -505,6 +505,7 @@
%%PORTDOCS%%intel/compiler60/docs/c_ug_lnx.pdf
%%PORTDOCS%%intel/compiler60/docs/ccompindex.htm
%%PORTDOCS%%intel/compiler60/docs/clicense
+%%PORTDOCS%%intel/compiler60/docs/credist.txt
%%PORTDOCS%%intel/compiler60/docs/csupport
%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
%%PORTDOCS%%intel/compiler60/docs/icid.htm
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index 8d3590f98cca..bf131b2ae8a9 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= icc
-PORTVERSION= 6.0.139
-PORTREVISION= 1
+PORTVERSION= 6.0.149
CATEGORIES= lang linux
-MASTER_SITES= http://www.intel.com/software/products/compilers/
-DISTNAME= l_cc_p_6.0.139
+MASTER_SITES=
+DISTNAME= l_cc_pu_6.0.149
EXTRACT_SUFX= .tar
MAINTAINER= netchild@FreeBSD.org
@@ -28,22 +27,24 @@ NO_WRKSUBDIR= yes
NO_BUILD= yes
NO_FILTER_SHLIBS= yes
+ICC_SITE= http://www.intel.com/software/products/compilers/
+
.include <bsd.port.pre.mk>
ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//'
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= "Please manually download it from ${MASTER_SITES}, e.g. from http://www.intel.com/software/products/compilers/c60l/noncom.htm. Put it into ${DISTDIR} and run make again. WARNING: this will lead to a mixed up installation if you already use the default linux emulation. This port uses the linux_base-7 port instead of the default linux_base port"
+.if !exists(${DISTDIR}/${DISTFILES})
+IGNORE= "Please manually download ${DISTFILES} from ${ICC_SITE}, e.g. from ${ICC_SITE}c60l/noncom.htm. Put it into ${DISTDIR} and run make again."
.endif
post-extract:
.for i in \
- intel-icc6-6.0-139.i386.rpm \
-# intel-ildb6-6.0-189.i386.rpm \
-# intel-isubh6-6.0-139.i386.rpm \
-# intel-ecc6-6.0-139.ia64.rpm \
-# intel-eldb6-6.0-189.ia64.rpm \
-# intel-esubh6-6.0-139.ia64.rpm
+ intel-icc6-6.0-149.i386.rpm \
+# intel-ildb6-6.0-208.i386.rpm \
+# intel-isubh6-6.0-149.i386.rpm \
+# intel-ecc6-6.0-149.ia64.rpm \
+# intel-eldb6-6.0-208.ia64.rpm \
+# intel-esubh6-6.0-149.ia64.rpm
@cd ${WRKSRC}; rpm2cpio ${i} | cpio -idu --quiet
.endfor
@@ -65,8 +66,8 @@ pre-patch:
post-patch:
# Correct some paths and patch some files
.for i in ia32/bin/icc ia32/bin/icc.cfg ia32/bin/iccvars.csh \
- ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg
- @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g' \
+ ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg docs/csupport
+ @${SED} 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:Intel(R) C++ Compiler for Linux:g' \
${WRKSRC}/opt/intel/compiler60/${i} \
>${WRKSRC}/opt/intel/compiler60/${i}.seded
@${MV} -f ${WRKSRC}/opt/intel/compiler60/${i}.seded \
diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo
index 564a6236fe3c..3f8b46cb865b 100644
--- a/lang/icc7/distinfo
+++ b/lang/icc7/distinfo
@@ -1 +1 @@
-MD5 (l_cc_p_6.0.139.tar) = a8143725154434763b32926f8aca2473
+MD5 (l_cc_pu_6.0.149.tar) = 8c5d9a2e0ee5e82b0bb02800a9394e9e
diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist
index 24a47b5f3807..7b578d4558c0 100644
--- a/lang/icc7/pkg-plist
+++ b/lang/icc7/pkg-plist
@@ -505,6 +505,7 @@
%%PORTDOCS%%intel/compiler60/docs/c_ug_lnx.pdf
%%PORTDOCS%%intel/compiler60/docs/ccompindex.htm
%%PORTDOCS%%intel/compiler60/docs/clicense
+%%PORTDOCS%%intel/compiler60/docs/credist.txt
%%PORTDOCS%%intel/compiler60/docs/csupport
%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
%%PORTDOCS%%intel/compiler60/docs/icid.htm
generated by cgit (git 2.34.1) at 2024-11-17 07:26:31 +0800