Update icc to 7.0.078.

Note:
Object files built with version 6.0 of Intel(R) Compilers may not link
properly with objects built with version 7.0 of Intel(R) Compilers.
Rebuilding of the object files is suggested.

Changes between the submitted version and the committed version:
 - update to 078 instead of 075
 - treat excessive parameters in function calls as an error instead
   of a warning (removed compatibility with a not named MS product, as
   suggested by Intel)
 - allow to override the INTEL_FLEXLM_LICENSE variable

From the submitter:
- Unbreak usage of signal.h on -current and RELENG_5_0.
  (committers note: see below)
- Fix ownership of installed files when built as non-root.
- Fix the patched versions of the icc- and the icpc-script to work with options
  containing spaces (e.g. '-DFOOBAR="foo bar"').
- Install 'clicense' and 'csupport' in the docs-dir even if NOPORTDOCS is
  defined, the later is not optional but required by 'icid'.
- Move the ld-wrapper to a sub-dir and thus out of what is normally set in
  PATH to prevent footshooting (this isn't perfect but simple until someone
  reworks this port to provide FreeBSD-compatibility in another way... or
  Intel releases a native version).
- Patch the headers to better fit for FreeBSD (hopefully...).

Notes:	- Icc7 is more picky about unknow options than the previous versions,
	  i.e. the gcc-options normally supplied in CFLAGS unless altered in
	  /etc/make.conf. Therefore compilation of ports with icc likely fail
	  if the standard CFLAGS are not unset (e.g. `make CC=icc CFLAGS=""`)
	  or replaced by options valid for icc.
	- When compiling multi-threaded C-code make sure to link with icc and
	  option '-mt' (for ports e.g. via PTHREAD_CFLAGS) otherwise libc_r
	  won't be linked in correctly.

Submitted by:	marius@alchemy.franken.de

Additional information:
 - rev 1.20 of src/sys/i386/include/signal.h introduced __aligned which
   isn't handled in sys/cdefs.h for non GCC compilers (at least not in
   publically available sources)
 - the FreeBSD stdarg.h is missing a macro for va_copy() in the non GCC case,
   we handle it in the port, but be prepared to get problems when the base
   system gets fixed
 - we don't use the icc-buildin of alignof()
 - Intel provides a float.h which has different floatingpoint values
   (e.g. MAX_FLOAT) than we have in the base system, in the port we use the
   FreeBSD header (Warner knows about the issue... at least he got a mail
   from me and Marius)
 - we replace __wchar_t with __ct_rune_t because icc has a build-in type
   for it, this affects "typedef __ct_rune_t __wchar_t;" in sys/_types.h.
   It isn't known if this may be evil...
 - icc doesn't need the option "-mt" anymore to generate thread safe code,
   but our FreeBSD version still needs it to be able to choose libc_r
   instead of libc

If a src-committer wants to address any of the above mentioned issues he
should first contact me, I may have already some fixes in my local tree.

1 files changed, 63 insertions, 52 deletions

diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index e11c54316ef4..698fa26bd144 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	6.0.1.304
-PORTREVISION=	1
+PORTVERSION=	7.0.078
 CATEGORIES=	lang linux devel
 MASTER_SITES=
-DISTNAME=	l_cc_p_6.0.1.304
+DISTNAME=	l_cc_pu_${PORTVERSION}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	netchild@FreeBSD.org
@@ -28,8 +27,12 @@ USE_REINPLACE=		yes
 NO_WRKSUBDIR=		yes
 NO_FILTER_SHLIBS=	yes
 
-MAN1=	icc.1
-MANPREFIX=	${PREFIX}/intel/compiler60/
+COMPILERDIR=	compiler70
+PLIST_SUB=	COMPILERDIR=${COMPILERDIR}
+PATCH_WRKSRC=	${WRKSRC}/opt/intel/${COMPILERDIR}
+
+MAN1=		icc.1
+MANPREFIX=	${PREFIX}/intel/${COMPILERDIR}/
 
 ICC_SITE=	http://www.intel.com/software/products/compilers/
 
@@ -40,30 +43,31 @@ ICCCFGVAL!=	${UNAME} -r | ${SED} -e 's/\..*//'
 OBJCOPY?=	/usr/bin/objcopy
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}c60l/noncom.htm or https://premier.intel.com/ \(whichever has the file, to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
+IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}clin/noncom.htm or https://premier.intel.com/ \(whichever has the file, to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
 .endif
 
 .if exists(${LINUXBASE}/boot/kernel.h) || \
-	exists(${PREFIX}/intel/compiler60/bin/ifc)
+	exists(${PREFIX}/intel/compiler60/bin/ifc) || \
+	exists(${PREFIX}/intel/compiler70/bin/ifc)
 BROKEN=	Cannot coexist with linux_devtools or ifc
 .endif
 
 post-extract:
-.for i in \
-	intel-icc6-6.0.1-304.i386.rpm \
-#	intel-ildb6-6.0.1-308.i386.rpm \
-#	intel-isubh6-6.0.1-304.i386.rpm \
-#	intel-ecc6-6.0.1-304.ia64.rpm \
-#	intel-eldb6-6.0.1-308.ia64.rpm \
-#	intel-esubh6-6.0.1-304.ia64.rpm
+	@${SED} 's:%%COMPILERDIR%%:${COMPILERDIR}:' ${FILESDIR}/cpio-exclude \
+		>${WRKDIR}/cpio-exclude
 .if defined(NOPORTDOCS)
-	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
-		cpio -idfuE ${FILESDIR}/cpio-exclude --quiet \
-		*/opt/intel/compiler60/docs/*
-.else
-	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
-		cpio -idfuE ${FILESDIR}/cpio-exclude --quiet
+	@${SED} 's:%%COMPILERDIR%%:${COMPILERDIR}:' \
+		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
+.for i in \
+	intel-icc7-7.0-78.i386.rpm
+#	intel-ildb7-7.0-156.i386.rpm \
+#	intel-isubh7-7.0-78.i386.rpm \
+#	intel-ecc7-7.0-78.ia64.rpm \
+#	intel-eldb7-7.0-156.ia64.rpm \
+#	intel-esubh7-7.0-78.ia64.rpm
+	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
+		cpio -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
 pre-patch:
@@ -71,43 +75,44 @@ pre-patch:
 	@${CHMOD} a+rx ${WRKSRC}/opt
 # Remove unneeded/unsafe access rights
 .for i in docs ia32/include ia32/lib
-	@${FIND} ${WRKSRC}/opt/intel/compiler60/${i} -type f -print0 | \
+	@${FIND} ${WRKSRC}/opt/intel/${COMPILERDIR}/${i} -type f -print0 | \
 		xargs -0 ${CHMOD} a-x,g-w
 .endfor
 	@${FIND} ${WRKSRC}/opt -type d -print0 | xargs -0 ${CHMOD} go-w
+	@${CHMOD} a-x ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/Errormatch.txt
 # Use the Linux ABI for the binaries
-.for i in INTEL iccbin iccfilt icid icpcbin icpi lmgrd.intel lmutil mcpcom \
-	profmerge proforder xiar xild
-	@brandelf -t Linux ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
+.for i in iccbin iccfilt icid icpcbin icpi mcpcom profmerge proforder xiar xild
+	@brandelf -t Linux ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endfor
 
 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 docs/csupport
-	@${REINPLACE_CMD} -i "" -e 's:@@PREFIX@@:${PREFIX}:g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:${DISTNAME}:g' \
-		${WRKSRC}/opt/intel/compiler60/${i}
-	@${CHMOD} 755 ${WRKSRC}/opt/intel/compiler60/${i}
-.endfor
-.for i in cfloat.orig cwchar.orig yvals.h.orig
-	@${RM} ${WRKSRC}/opt/intel/compiler60/ia32/include/${i}
+.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' \
+		${WRKSRC}/opt/intel/${COMPILERDIR}/${i}
+	@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/${i}
 .endfor
+	@${REINPLACE_CMD} -i "" -e 's:\<INSTALLTIMECOMBOPACKAGEID\>:${DISTNAME}:g' \
+		${WRKSRC}/opt/intel/${COMPILERDIR}/docs/csupport
+	@${RM} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/include/*.orig
 .for i in icc.orig icpc.orig
-	@${RM} ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
+	@${RM} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endfor
-# Remove empty directory
-.if defined(NOPORTDOCS)
-	@${RM} -rf ${WRKSRC}/opt/intel/compiler60/docs
-.endif
 # Provide a more FreeBSD'ish compile environment
 .for i in icc.cfg icpc.cfg
-	@${ECHO} -e "\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
-	@${CHMOD} a-x,g-w ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
+	@${REINPLACE_CMD} -i "" -e 's:-Xlinker -rpath -Xlinker <INSTALLDIR>/${COMPILERDIR}/ia32/lib::g' \
+		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+	@${ECHO} -e "-Qlocation,ld,${PREFIX}/intel/${COMPILERDIR}/ia32/bin/ldwrapper\n\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n\n-Qwr1125\n-Qwe140\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+.if ${OSVERSION} >= 500039
+	@${ECHO} -e "-D__wchar_t=__ct_rune_t\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+.endif
+	@${CHMOD} a-x,g-w ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endfor
 # C++ hack for icpc
-	@${ECHO} -e "\n-I${PREFIX}/include/stlport\n-Qoption,ld,-CPLUSPLUS\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/icpc.cfg
-	@cd ${WRKSRC}/opt/intel/compiler60/ia32/bin/ && ${LN} -s icc.cfg iccbin.cfg && ${LN} -s icpc.cfg icpcbin.cfg
-# \n-Qlocation,ld,/usr/bin\n\n-sox-\n
+	@${ECHO} -e "\n-I${PREFIX}/include/stlport\n-Qoption,ld,-CPLUSPLUS\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/icpc.cfg
+	@cd ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ && ${LN} -s icc.cfg iccbin.cfg && ${LN} -s icpc.cfg icpcbin.cfg
+# Hack while there's no support for icc in the stdarg.h of FreeBSD.
+	@${CP} ${FILESDIR}/stdarg.h ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/include
 
 do-build:
 # Fix unresolved references
@@ -116,28 +121,34 @@ do-build:
 		${FILESDIR}/errno_location.c ${FILESDIR}/mcount.S
 .if ( ${OSVERSION} < 470101 ) || \
 	( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 )
+	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c
+	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c
 .else
-.for i in libcxa.a libimf.a libirc.a libircmt.a libunwind.a
-	@${OBJCOPY} --redefine-sym stderr=__stderrp \
-		${WRKSRC}/opt/intel/compiler60/ia32/lib/${i}
+.for i in libcxa.a libimf.a libirc.a libircmt.a libompstub.a libunwind.a
+	@${OBJCOPY} --redefine-sym stdin=__stdinp \
+		--redefine-sym stdout=__stdoutp \
+		--redefine-sym stderr=__stderrp \
+		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/${i}
 .endfor
 .endif
-	@${AR} q ${WRKSRC}/opt/intel/compiler60/ia32/lib/libcxa.a ${WRKSRC}/*.o
+	@${AR} q ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/libcxa.a ${WRKSRC}/*.o
 # Some magic to be able to link
-	@${CC} ${CFLAGS} -o ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld ${FILESDIR}/ld.c
-	@${STRIP_CMD} ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld
-	@${CHMOD} 755 ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld
+	@${MKDIR} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper
+	@${CC} ${CFLAGS} -o \
+		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld \
+		${FILESDIR}/ld.c
+	@${STRIP_CMD} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
+	@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
 
 do-install:
-	@cd ${WRKSRC}/opt && ${TAR} -cf - . | \
-		${TAR} -xf - -C ${PREFIX}
+	@cd ${WRKSRC}/opt && find . | cpio -pdu -R ${BINOWN}:${BINGRP} ${PREFIX}
 
 post-install:
 	@${ECHO_CMD} "${PKGNAME} is now installed in ${PREFIX}/intel, to use it you have to"
 	@${ECHO_CMD} "put your license into your \$${INTEL_FLEXLM_LICENSE} (default:"
 	@${ECHO_CMD} "${PREFIX}/intel/licenses) directory and add"
-	@${ECHO_CMD} "${PREFIX}/intel/compiler60/ia32/bin to your PATH."
+	@${ECHO_CMD} "${PREFIX}/intel/${COMPILERDIR}/ia32/bin to your PATH."
 	@${ECHO_CMD}
 	@${ECHO_CMD} "In order to be able to compile C++ source with icpc you have to install"
 	@${ECHO_CMD} "devel/stlport-icc. (It is a good idea to run 'rehash' before or stlport-icc"