svn commit: r417156 - in head: Mk/Uses benchmarks/himenobench

[Mathieu Arnold]

Author: mat
Date: Mon Jun 20 13:12:09 2016
New Revision: 417156
URL: https://svnweb.freebsd.org/changeset/ports/417156

Log:
  lang/ifc was removed quite a while back.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/fortran.mk
  head/benchmarks/himenobench/Makefile   (contents, props changed)

Modified: head/Mk/Uses/fortran.mk
==============================================================================
--- head/Mk/Uses/fortran.mk	Mon Jun 20 12:51:32 2016	(r417155)
+++ head/Mk/Uses/fortran.mk	Mon Jun 20 13:12:09 2016	(r417156)
@@ -4,7 +4,7 @@
 #
 # Feature:	fortran
 # Usage:	USES=fortran
-# Valid ARGS:	gcc (default), ifort
+# Valid ARGS:	gcc (default)
 #
 # MAINTAINER:	fortran at FreeBSD.org
 
@@ -32,11 +32,6 @@ FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc
 FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
-.elif ${fortran_ARGS} == ifort
-BUILD_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
-RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
-F77=		${LOCALBASE}/intel_fc_80/bin/ifort
-FC=		${LOCALBASE}/intel_fc_80/bin/ifort
 .else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .endif

Modified: head/benchmarks/himenobench/Makefile
==============================================================================
--- head/benchmarks/himenobench/Makefile	Mon Jun 20 12:51:32 2016	(r417155)
+++ head/benchmarks/himenobench/Makefile	Mon Jun 20 13:12:09 2016	(r417156)
@@ -19,25 +19,20 @@ LICENSE=	LGPL20 # (or later)
 
 EXTRACT_DEPENDS=	lha:archivers/lha
 
-USES=		zip
+USES=		fortran zip
 NO_WRKSUBDIR=	yes
 
 
-OPTIONS_DEFINE=		ICC IFC OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=		ICC OPTIMIZED_CFLAGS
 OPTIONS_SUB=		yes
 
 ICC_DESC=		Intel C compiler support
 ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
-IFC_DESC=		Intel Fortran compiler support
-IFC_USES=		fortran:ifort
-IFC_USES_OFF=		fortran
 OPTIMIZED_CFLAGS_CFLAGS=${OPTFLAGS}
 OPTIMIZED_CFLAGS_VARS=	FFLAGS+="${OPTFLAGS}"
 
 ICC=		${LOCALBASE}/intel_cc_80/bin/icc
 CFLAGS_ICC=	-O3 -tpp7 -axN -Vaxlib
-IFC=		${LOCALBASE}/intel_fc_80/bin/ifort
-FFLAGS_IFC=	-O3 -tpp7 -axN -Vaxlib -ipo
 OPTFLAGS=	-O2 -ffast-math -finline-functions -fomit-frame-pointer \
 		-funroll-loops -fexpensive-optimizations
 
@@ -56,17 +51,8 @@ do-build:
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSMALL   -o himenobmtxps_s  himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSSMALL  -o himenobmtxps_ss himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS}           -o himenobmtxpa    himenobmtxpa.c
-
-do-build-IFC-off:
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp    himenobmtxp.f90
 
-do-build-IFC-on:
-#	cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_xl.ifc himenobmtxp_xl.f #Too large
-	cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_l.ifc  himenobmtxp_l.f
-	cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_m.ifc  himenobmtxp_m.f
-	cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_s.ifc  himenobmtxp_s.f
-	cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp.ifc    himenobmtxp.f90
-
 do-build-ICC-on:
 #	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DELARGE  -o himenobmtxps_xl.icc himenobmtxps.c #Too large
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DLARGE   -o himenobmtxps_l.icc  himenobmtxps.c
@@ -85,17 +71,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m         ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s         ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss        ${STAGEDIR}${PREFIX}/bin
-
-do-install-IFC-off:
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp            ${STAGEDIR}${PREFIX}/bin
 
-do-install-IFC-on:
-#	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl.ifc     ${STAGEDIR}${PREFIX}/bin #Too large
-	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l.ifc      ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m.ifc      ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s.ifc      ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp.ifc        ${STAGEDIR}${PREFIX}/bin
-
 do-install-ICC-on:
 #	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_xl.icc    ${STAGEDIR}${PREFIX}/bin #Too large
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l.icc     ${STAGEDIR}${PREFIX}/bin