update to ifc to 7.1.038.

Submitted by:	Masakazu HIGAKI <higamasa@dream.com>

1 files changed, 22 insertions, 13 deletions

diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index fe5fb1b265ba..38000221be3a 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ifc
-PORTVERSION=	7.1.033
-PORTREVISION=	1
+PORTVERSION=	7.1.038
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_fc_pc_${PORTVERSION}
@@ -16,7 +15,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Intel's Fortran compiler, set up to produce native FreeBSD objects
 
-BUILD_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
@@ -40,6 +39,10 @@ IFC_SITE=	http://www.intel.com/software/products/compilers/
 
 .include <bsd.port.pre.mk>
 
+EXTRACT_AFTER_ARGS=	| tar -xf - \
+			--exclude \*ia64.rpm \
+			--exclude flexlm64
+
 IFCCFGVAL!=	${UNAME} -r | ${SED} -e 's/\..*//'
 
 CPIO?=		/usr/bin/cpio
@@ -63,11 +66,9 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-ifc7-7.1-34.i386.rpm
-#	intel-iidb7-7.2.2-64.i386.rpm \
-#	intel-efc7-7.1-34.ia64.rpm \
-#	intel-eidb7-7.2.2-64.ia64.rpm
-	@cd ${WRKSRC} ; rpm2cpio.pl 2>/dev/null ${i} | \
+	intel-ifc7-7.1-40.i386.rpm
+#	intel-iidb7-7.2.2-78.i386.rpm
+	@cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
 
@@ -88,7 +89,8 @@ pre-patch:
 post-patch:
 # Correct some paths and patch some files
 .for i in ia32/bin/ifc ia32/bin/ifcvars.csh ia32/bin/ifcvars.sh
-	@${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
@@ -103,6 +105,9 @@ post-patch:
 		-e 's@\<INSTALLDIR\>@${PREFIX}/intel@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-U__gnu_linux__\n\n-D__FreeBSD__=${IFCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+.if ${OSVERSION} < 500016
+	@${ECHO} -e "-Qoption,ld,-MT\n" >>${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
+.endif
 	@${CHMOD} a-x,g-w ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/${i}
 .endfor
 	@cd ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ && ${LN} -s ifc.cfg ifcbin.cfg
@@ -117,10 +122,14 @@ OBJCOPY_OPS=    --redefine-sym stdin=__stdinp \
 do-build:
 # Fix unresolved references
 	@cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/assert_fail.c \
-		${FILESDIR}/cxa_atexit.c ${FILESDIR}/cxa_finalize.c \
-		${FILESDIR}/linux_file.c ${FILESDIR}/sysconf.c \
+		${FILESDIR}/linux_file.c ${FILESDIR}/linux_stat.c \
 		${FILESDIR}/mmap.c       ${FILESDIR}/pthread.c \
+		${FILESDIR}/sysconf.c    \
 		${FILESDIR}/errno_location.c ${FILESDIR}/mcount.S
+.if ( ${OSVERSION} < 502101 )
+	@cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c \
+		${FILESDIR}/cxa_finalize.c
+.endif
 .if ( ${OSVERSION} < 470101 ) || \
 	( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 )
 	@${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c
@@ -134,13 +143,13 @@ do-build:
 		${OBJCOPY_OPS} \
 		${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/${i}
 .endfor
-	@(cd ${WRKSRC}; ${AR} x /usr/lib/libcompat.a ftime.o)
+	@cd ${WRKSRC} && ${AR} x /usr/lib/libcompat.a ftime.o
 	@${AR} q ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/lib/libcxa.a ${WRKSRC}/*.o
 .for i in BINDF90 PEPCF90 CEPCF90 POSF90 IEPCF90
 	@${OBJCOPY} --strip-symbol=stat \
 		--strip-symbol=fstat \
 		--strip-symbol=lstat \
-		--redefine-sym lseek=Lseek \
+		--redefine-sym lseek=l_lseek \
 		--redefine-sym lseek64=lseek \
 		--redefine-sym open64=open \
 		--redefine-sym creat64=creat \