- Update to 6.0.159.

  Submitted by:	maintainer
  PR:		40446

- Portlint
- add missing USE_LINUX

8 files changed, 140 insertions, 132 deletions

diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index 6b95d54442b7..d663c20a4e86 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -1,64 +1,69 @@
-# New ports collection makefile for:	ifc
-# Date created:				Oct 30, 2001
-# Whom:					chat95@mbox.kyoto-inet.or.jp
+# New ports collection makefile for:    ifc
+# Date created:         Oct 30, 2001
+# Whom:                 chat95@mbox.kyoto-inet.or.jp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ifc
-PORTVERSION=	6.0.140
-CATEGORIES=	lang linux
-MASTER_SITES=	http://developer.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.htm
-DISTNAME=	l_fc_p_6.0.140
+PORTVERSION=	6.0.159
+CATEGORIES=	lang devel emulators linux
+MASTER_SITES=#
+DISTNAME=	l_fc_pu_6.0.159
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	chat95@mbox.kyoto-inet.or.jp
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.2.2.so:${PORTSDIR}/emulators/linux_base
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7
 
-RESTRICTED=	"Redistribution not allowed"
+RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 
 ONLY_FOR_ARCHS=	i386
 
-#USE_LINUX=		yes
+USE_LINUX=		yes
 NO_WRKSUBDIR=		yes
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 
+IFC_SITE=	http://www.intel.com/software/products/compilers/
+
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= "Please manually download the version for RedHat 7.1 from ${MASTER_SITES}, e.g. from http://developer.intel.com/software/products/compilers/f60l/noncom.htm. Put it into ${DISTDIR} and run make again."
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=	"Please manually download ${DISTFILES} from ${IFC_SITE}, e.g. from https://premier.intel.com/. Registration is required!! Put it into ${DISTDIR} and run make again."
 .endif
 
 post-extract:
 .for i in \
-	intel-ifc6-6.0-140.i386.rpm  \
-#	intel-ildb6-6.0-191.i386.rpm \
-#	intel-efc6-6.0-140.ia64.rpm \
-#	intel-eldb6-6.0-191.ia64.rpm
+	intel-ifc6-6.0-159.i386.rpm \
+#	intel-ildb6-6.0-229.i386.rpm \
+#	intel-efc6-6.0-159.ia64.rpm \
+#	intel-eldb6-6.0-229.ia64.rpm
 	@cd ${WRKSRC}; rpm2cpio ${i} | cpio -idu --quiet
 .endfor
 
 pre-patch:
+# Allow everyone to use it
 	@${CHMOD} a+rx ${WRKSRC}/opt
+# Remove unneded/unsafe access rights
 .for i in docs ia32/include ia32/lib
 	@${FIND} ${WRKSRC}/opt/intel/compiler60/${i} -type f -print0 | \
 		xargs -0 ${CHMOD} a-x,g-w
 .endfor
 	@${FIND} ${WRKSRC}/opt -type d -print0 | xargs -0 ${CHMOD} go-w
+# Use the Linux ABI for the binaries
 .for i in INTEL f90com fpp icid ifcbin ifccem lmgrd.intel lmutil profmerge proforder xiar xild
 	@brandelf -t Linux ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
 .endfor
 
 post-patch:
+# Correct some paths and patch some files
 .for i in ia32/bin/ifcvars.csh ia32/bin/ifcvars.sh \
-	ia32/bin/ifc ia32/bin/ifc.pcl
-	@${SED} 's@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath@ ; s@/bin/sh@${LINUXBASE}/bin/sh@' \
+	ia32/bin/ifc #ia32/bin/ifc.pcl
+	@${SED} 's@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath@ ; s@/bin/sh@${LINUXBASE}/bin/bash@' \
 		${WRKSRC}/opt/intel/compiler60/${i} \
 		>${WRKSRC}/opt/intel/compiler60/${i}.seded
 	@${MV} -f ${WRKSRC}/opt/intel/compiler60/${i}.seded \
diff --git a/lang/ifc/distinfo b/lang/ifc/distinfo
index 55a91a2a3e93..c5d65b350b87 100644
--- a/lang/ifc/distinfo
+++ b/lang/ifc/distinfo
@@ -1 +1 @@
-MD5 (l_fc_p_6.0.140.tar) = 7eb172e4148261373e43fda07bb7aaf7
+MD5 (l_fc_pu_6.0.159.tar) = 3f54e7c40747a7c90aef4dc9a03110f6
diff --git a/lang/ifc/pkg-descr b/lang/ifc/pkg-descr
index 07ceaae34624..b21449bd8677 100644
--- a/lang/ifc/pkg-descr
+++ b/lang/ifc/pkg-descr
@@ -5,9 +5,8 @@ processor (and the 64-bit Intel Itanium processor).
 
 You can obtain 30-day Free Evaluation Software(Includes Support) 
 or, Non-Commercial Unsupported lisence.
+Newer version of ifc can obtain at https://premier.intel.com/,
+and another registration is required.
 
-URL:  http://developer.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.htm
-WWW: http://developer.intel.com/software/products/eval/
-
-- NAKATA, Maho
- E-mail: chat95@mbox.kyoto-inet.or.jp
+WWW: http://www.intel.com/software/products/compilers/f60l/
+     https://premier.intel.com/
diff --git a/lang/ifc/pkg-plist b/lang/ifc/pkg-plist
index 1469170a6dcb..9b29cebb0f32 100644
--- a/lang/ifc/pkg-plist
+++ b/lang/ifc/pkg-plist
@@ -1,3 +1,6 @@
+%%PORTDOCS%%intel/compiler60/docs/FortranReleaseNotes.htm
+%%PORTDOCS%%intel/compiler60/docs/asm_lan.pdf
+%%PORTDOCS%%intel/compiler60/docs/asm_ug.pdf
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/anal_cmb.htm
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/anal_exc.htm
@@ -139,10 +142,7 @@
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp0.cab
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp0.zip
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp4.js
-%%PORTDOCS%%@dirrm intel/compiler60/docs/asm_ug
-%%PORTDOCS%%intel/compiler60/docs/notes/ifc_fixes.txt
-%%PORTDOCS%%intel/compiler60/docs/notes/ifc_issues.txt
-%%PORTDOCS%%@dirrm intel/compiler60/docs/notes
+%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
 %%PORTDOCS%%intel/compiler60/docs/f_ug/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/add_arg.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/add_list.htm
@@ -422,7 +422,16 @@
 %%PORTDOCS%%intel/compiler60/docs/f_ug/webhelp4.js
 %%PORTDOCS%%intel/compiler60/docs/f_ug/welcome.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/xref_bth.htm
-%%PORTDOCS%%@dirrm intel/compiler60/docs/f_ug
+%%PORTDOCS%%intel/compiler60/docs/fcompindex.htm
+%%PORTDOCS%%intel/compiler60/docs/flicense
+%%PORTDOCS%%intel/compiler60/docs/for_lib.pdf
+%%PORTDOCS%%intel/compiler60/docs/for_prg.pdf
+%%PORTDOCS%%intel/compiler60/docs/for_ug_lnx.pdf
+%%PORTDOCS%%intel/compiler60/docs/fredist.txt
+%%PORTDOCS%%intel/compiler60/docs/fsupport
+%%PORTDOCS%%intel/compiler60/docs/icid.htm
+%%PORTDOCS%%intel/compiler60/docs/notes/ifc_fixes.txt
+%%PORTDOCS%%intel/compiler60/docs/notes/ifc_issues.txt
 %%PORTDOCS%%intel/compiler60/docs/ref/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/ref/ann_entr.htm
 %%PORTDOCS%%intel/compiler60/docs/ref/ann_mem.htm
@@ -586,28 +595,11 @@
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp0.cab
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp0.zip
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp4.js
-%%PORTDOCS%%@dirrm intel/compiler60/docs/ref
-%%PORTDOCS%%intel/compiler60/docs/FortranReleaseNotes.htm
-%%PORTDOCS%%intel/compiler60/docs/asm_lan.pdf
-%%PORTDOCS%%intel/compiler60/docs/asm_ug.pdf
-%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
-%%PORTDOCS%%intel/compiler60/docs/fcompindex.htm
-%%PORTDOCS%%intel/compiler60/docs/flicense
-%%PORTDOCS%%intel/compiler60/docs/for_lib.pdf
-%%PORTDOCS%%intel/compiler60/docs/for_prg.pdf
-%%PORTDOCS%%intel/compiler60/docs/for_ug_lnx.pdf
-%%PORTDOCS%%intel/compiler60/docs/fsupport
-%%PORTDOCS%%intel/compiler60/docs/icid.htm
-%%PORTDOCS%%@dirrm intel/compiler60/docs
-%%PORTDOCS%%intel/compiler60/man/man1/ifc.1
-%%PORTDOCS%%@dirrm intel/compiler60/man/man1
-%%PORTDOCS%%@dirrm intel/compiler60/man
 intel/compiler60/ia32/bin/INTEL
 intel/compiler60/ia32/bin/f90com
 intel/compiler60/ia32/bin/fpp
 intel/compiler60/ia32/bin/icid
 intel/compiler60/ia32/bin/ifc
-intel/compiler60/ia32/bin/ifc.pcl
 intel/compiler60/ia32/bin/ifcbin
 intel/compiler60/ia32/bin/ifccem
 intel/compiler60/ia32/bin/ifcvars.csh
@@ -619,7 +611,19 @@ intel/compiler60/ia32/bin/proforder
 intel/compiler60/ia32/bin/uninstall
 intel/compiler60/ia32/bin/xiar
 intel/compiler60/ia32/bin/xild
-@dirrm intel/compiler60/ia32/bin
+intel/compiler60/ia32/include/iflkinds.d
+intel/compiler60/ia32/include/iflkinds.f90
+intel/compiler60/ia32/include/iflkinds.o
+intel/compiler60/ia32/include/iflomp.d
+intel/compiler60/ia32/include/iflomp.f90
+intel/compiler60/ia32/include/iflport.d
+intel/compiler60/ia32/include/iflport.f90
+intel/compiler60/ia32/include/iflport.o
+intel/compiler60/ia32/include/iflposix.d
+intel/compiler60/ia32/include/iflposix.f90
+intel/compiler60/ia32/include/iflposix.o
+intel/compiler60/ia32/include/work.pc
+intel/compiler60/ia32/include/work.pcl
 intel/compiler60/ia32/lib/crtxi.o
 intel/compiler60/ia32/lib/crtxn.o
 intel/compiler60/ia32/lib/icrt.internal.map
@@ -654,22 +658,18 @@ intel/compiler60/ia32/lib/libsvml.a
 intel/compiler60/ia32/lib/libunwind.a
 intel/compiler60/ia32/lib/libunwind.so
 intel/compiler60/ia32/lib/libunwind.so.1
-@dirrm intel/compiler60/ia32/lib
-intel/compiler60/ia32/include/iflkinds.d
-intel/compiler60/ia32/include/iflkinds.f90
-intel/compiler60/ia32/include/iflkinds.o
-intel/compiler60/ia32/include/iflomp.d
-intel/compiler60/ia32/include/iflomp.f90
-intel/compiler60/ia32/include/iflport.d
-intel/compiler60/ia32/include/iflport.f90
-intel/compiler60/ia32/include/iflport.o
-intel/compiler60/ia32/include/iflposix.d
-intel/compiler60/ia32/include/iflposix.f90
-intel/compiler60/ia32/include/iflposix.o
-intel/compiler60/ia32/include/work.pc
-intel/compiler60/ia32/include/work.pcl
-@dirrm intel/compiler60/ia32/include
-@dirrm intel/compiler60/ia32
-@dirrm intel/compiler60
-@dirrm intel/licenses
-@dirrm intel
+intel/compiler60/man/man1/ifc.1
+@dirrm %%PORTDOCS%%intel/licenses
+@dirrm %%PORTDOCS%%intel/compiler60/man/man1
+@dirrm %%PORTDOCS%%intel/compiler60/man
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/lib
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/include
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/bin
+@dirrm %%PORTDOCS%%intel/compiler60/ia32
+@dirrm %%PORTDOCS%%intel/compiler60/docs/ref
+@dirrm %%PORTDOCS%%intel/compiler60/docs/notes
+@dirrm %%PORTDOCS%%intel/compiler60/docs/f_ug
+@dirrm %%PORTDOCS%%intel/compiler60/docs/asm_ug
+@dirrm %%PORTDOCS%%intel/compiler60/docs
+@dirrm %%PORTDOCS%%intel/compiler60
+@dirrm %%PORTDOCS%%intel
diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile
index 6b95d54442b7..d663c20a4e86 100644
--- a/lang/ifc7/Makefile
+++ b/lang/ifc7/Makefile
@@ -1,64 +1,69 @@
-# New ports collection makefile for:	ifc
-# Date created:				Oct 30, 2001
-# Whom:					chat95@mbox.kyoto-inet.or.jp
+# New ports collection makefile for:    ifc
+# Date created:         Oct 30, 2001
+# Whom:                 chat95@mbox.kyoto-inet.or.jp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ifc
-PORTVERSION=	6.0.140
-CATEGORIES=	lang linux
-MASTER_SITES=	http://developer.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.htm
-DISTNAME=	l_fc_p_6.0.140
+PORTVERSION=	6.0.159
+CATEGORIES=	lang devel emulators linux
+MASTER_SITES=#
+DISTNAME=	l_fc_pu_6.0.159
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	chat95@mbox.kyoto-inet.or.jp
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.2.2.so:${PORTSDIR}/emulators/linux_base
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7
 
-RESTRICTED=	"Redistribution not allowed"
+RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 
 ONLY_FOR_ARCHS=	i386
 
-#USE_LINUX=		yes
+USE_LINUX=		yes
 NO_WRKSUBDIR=		yes
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 
+IFC_SITE=	http://www.intel.com/software/products/compilers/
+
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= "Please manually download the version for RedHat 7.1 from ${MASTER_SITES}, e.g. from http://developer.intel.com/software/products/compilers/f60l/noncom.htm. Put it into ${DISTDIR} and run make again."
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=	"Please manually download ${DISTFILES} from ${IFC_SITE}, e.g. from https://premier.intel.com/. Registration is required!! Put it into ${DISTDIR} and run make again."
 .endif
 
 post-extract:
 .for i in \
-	intel-ifc6-6.0-140.i386.rpm  \
-#	intel-ildb6-6.0-191.i386.rpm \
-#	intel-efc6-6.0-140.ia64.rpm \
-#	intel-eldb6-6.0-191.ia64.rpm
+	intel-ifc6-6.0-159.i386.rpm \
+#	intel-ildb6-6.0-229.i386.rpm \
+#	intel-efc6-6.0-159.ia64.rpm \
+#	intel-eldb6-6.0-229.ia64.rpm
 	@cd ${WRKSRC}; rpm2cpio ${i} | cpio -idu --quiet
 .endfor
 
 pre-patch:
+# Allow everyone to use it
 	@${CHMOD} a+rx ${WRKSRC}/opt
+# Remove unneded/unsafe access rights
 .for i in docs ia32/include ia32/lib
 	@${FIND} ${WRKSRC}/opt/intel/compiler60/${i} -type f -print0 | \
 		xargs -0 ${CHMOD} a-x,g-w
 .endfor
 	@${FIND} ${WRKSRC}/opt -type d -print0 | xargs -0 ${CHMOD} go-w
+# Use the Linux ABI for the binaries
 .for i in INTEL f90com fpp icid ifcbin ifccem lmgrd.intel lmutil profmerge proforder xiar xild
 	@brandelf -t Linux ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
 .endfor
 
 post-patch:
+# Correct some paths and patch some files
 .for i in ia32/bin/ifcvars.csh ia32/bin/ifcvars.sh \
-	ia32/bin/ifc ia32/bin/ifc.pcl
-	@${SED} 's@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath@ ; s@/bin/sh@${LINUXBASE}/bin/sh@' \
+	ia32/bin/ifc #ia32/bin/ifc.pcl
+	@${SED} 's@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath@ ; s@/bin/sh@${LINUXBASE}/bin/bash@' \
 		${WRKSRC}/opt/intel/compiler60/${i} \
 		>${WRKSRC}/opt/intel/compiler60/${i}.seded
 	@${MV} -f ${WRKSRC}/opt/intel/compiler60/${i}.seded \
diff --git a/lang/ifc7/distinfo b/lang/ifc7/distinfo
index 55a91a2a3e93..c5d65b350b87 100644
--- a/lang/ifc7/distinfo
+++ b/lang/ifc7/distinfo
@@ -1 +1 @@
-MD5 (l_fc_p_6.0.140.tar) = 7eb172e4148261373e43fda07bb7aaf7
+MD5 (l_fc_pu_6.0.159.tar) = 3f54e7c40747a7c90aef4dc9a03110f6
diff --git a/lang/ifc7/pkg-descr b/lang/ifc7/pkg-descr
index 07ceaae34624..b21449bd8677 100644
--- a/lang/ifc7/pkg-descr
+++ b/lang/ifc7/pkg-descr
@@ -5,9 +5,8 @@ processor (and the 64-bit Intel Itanium processor).
 
 You can obtain 30-day Free Evaluation Software(Includes Support) 
 or, Non-Commercial Unsupported lisence.
+Newer version of ifc can obtain at https://premier.intel.com/,
+and another registration is required.
 
-URL:  http://developer.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.htm
-WWW: http://developer.intel.com/software/products/eval/
-
-- NAKATA, Maho
- E-mail: chat95@mbox.kyoto-inet.or.jp
+WWW: http://www.intel.com/software/products/compilers/f60l/
+     https://premier.intel.com/
diff --git a/lang/ifc7/pkg-plist b/lang/ifc7/pkg-plist
index 1469170a6dcb..9b29cebb0f32 100644
--- a/lang/ifc7/pkg-plist
+++ b/lang/ifc7/pkg-plist
@@ -1,3 +1,6 @@
+%%PORTDOCS%%intel/compiler60/docs/FortranReleaseNotes.htm
+%%PORTDOCS%%intel/compiler60/docs/asm_lan.pdf
+%%PORTDOCS%%intel/compiler60/docs/asm_ug.pdf
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/anal_cmb.htm
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/anal_exc.htm
@@ -139,10 +142,7 @@
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp0.cab
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp0.zip
 %%PORTDOCS%%intel/compiler60/docs/asm_ug/webhelp4.js
-%%PORTDOCS%%@dirrm intel/compiler60/docs/asm_ug
-%%PORTDOCS%%intel/compiler60/docs/notes/ifc_fixes.txt
-%%PORTDOCS%%intel/compiler60/docs/notes/ifc_issues.txt
-%%PORTDOCS%%@dirrm intel/compiler60/docs/notes
+%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
 %%PORTDOCS%%intel/compiler60/docs/f_ug/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/add_arg.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/add_list.htm
@@ -422,7 +422,16 @@
 %%PORTDOCS%%intel/compiler60/docs/f_ug/webhelp4.js
 %%PORTDOCS%%intel/compiler60/docs/f_ug/welcome.htm
 %%PORTDOCS%%intel/compiler60/docs/f_ug/xref_bth.htm
-%%PORTDOCS%%@dirrm intel/compiler60/docs/f_ug
+%%PORTDOCS%%intel/compiler60/docs/fcompindex.htm
+%%PORTDOCS%%intel/compiler60/docs/flicense
+%%PORTDOCS%%intel/compiler60/docs/for_lib.pdf
+%%PORTDOCS%%intel/compiler60/docs/for_prg.pdf
+%%PORTDOCS%%intel/compiler60/docs/for_ug_lnx.pdf
+%%PORTDOCS%%intel/compiler60/docs/fredist.txt
+%%PORTDOCS%%intel/compiler60/docs/fsupport
+%%PORTDOCS%%intel/compiler60/docs/icid.htm
+%%PORTDOCS%%intel/compiler60/docs/notes/ifc_fixes.txt
+%%PORTDOCS%%intel/compiler60/docs/notes/ifc_issues.txt
 %%PORTDOCS%%intel/compiler60/docs/ref/_blank.htm
 %%PORTDOCS%%intel/compiler60/docs/ref/ann_entr.htm
 %%PORTDOCS%%intel/compiler60/docs/ref/ann_mem.htm
@@ -586,28 +595,11 @@
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp0.cab
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp0.zip
 %%PORTDOCS%%intel/compiler60/docs/ref/webhelp4.js
-%%PORTDOCS%%@dirrm intel/compiler60/docs/ref
-%%PORTDOCS%%intel/compiler60/docs/FortranReleaseNotes.htm
-%%PORTDOCS%%intel/compiler60/docs/asm_lan.pdf
-%%PORTDOCS%%intel/compiler60/docs/asm_ug.pdf
-%%PORTDOCS%%intel/compiler60/docs/enduser.pdf
-%%PORTDOCS%%intel/compiler60/docs/fcompindex.htm
-%%PORTDOCS%%intel/compiler60/docs/flicense
-%%PORTDOCS%%intel/compiler60/docs/for_lib.pdf
-%%PORTDOCS%%intel/compiler60/docs/for_prg.pdf
-%%PORTDOCS%%intel/compiler60/docs/for_ug_lnx.pdf
-%%PORTDOCS%%intel/compiler60/docs/fsupport
-%%PORTDOCS%%intel/compiler60/docs/icid.htm
-%%PORTDOCS%%@dirrm intel/compiler60/docs
-%%PORTDOCS%%intel/compiler60/man/man1/ifc.1
-%%PORTDOCS%%@dirrm intel/compiler60/man/man1
-%%PORTDOCS%%@dirrm intel/compiler60/man
 intel/compiler60/ia32/bin/INTEL
 intel/compiler60/ia32/bin/f90com
 intel/compiler60/ia32/bin/fpp
 intel/compiler60/ia32/bin/icid
 intel/compiler60/ia32/bin/ifc
-intel/compiler60/ia32/bin/ifc.pcl
 intel/compiler60/ia32/bin/ifcbin
 intel/compiler60/ia32/bin/ifccem
 intel/compiler60/ia32/bin/ifcvars.csh
@@ -619,7 +611,19 @@ intel/compiler60/ia32/bin/proforder
 intel/compiler60/ia32/bin/uninstall
 intel/compiler60/ia32/bin/xiar
 intel/compiler60/ia32/bin/xild
-@dirrm intel/compiler60/ia32/bin
+intel/compiler60/ia32/include/iflkinds.d
+intel/compiler60/ia32/include/iflkinds.f90
+intel/compiler60/ia32/include/iflkinds.o
+intel/compiler60/ia32/include/iflomp.d
+intel/compiler60/ia32/include/iflomp.f90
+intel/compiler60/ia32/include/iflport.d
+intel/compiler60/ia32/include/iflport.f90
+intel/compiler60/ia32/include/iflport.o
+intel/compiler60/ia32/include/iflposix.d
+intel/compiler60/ia32/include/iflposix.f90
+intel/compiler60/ia32/include/iflposix.o
+intel/compiler60/ia32/include/work.pc
+intel/compiler60/ia32/include/work.pcl
 intel/compiler60/ia32/lib/crtxi.o
 intel/compiler60/ia32/lib/crtxn.o
 intel/compiler60/ia32/lib/icrt.internal.map
@@ -654,22 +658,18 @@ intel/compiler60/ia32/lib/libsvml.a
 intel/compiler60/ia32/lib/libunwind.a
 intel/compiler60/ia32/lib/libunwind.so
 intel/compiler60/ia32/lib/libunwind.so.1
-@dirrm intel/compiler60/ia32/lib
-intel/compiler60/ia32/include/iflkinds.d
-intel/compiler60/ia32/include/iflkinds.f90
-intel/compiler60/ia32/include/iflkinds.o
-intel/compiler60/ia32/include/iflomp.d
-intel/compiler60/ia32/include/iflomp.f90
-intel/compiler60/ia32/include/iflport.d
-intel/compiler60/ia32/include/iflport.f90
-intel/compiler60/ia32/include/iflport.o
-intel/compiler60/ia32/include/iflposix.d
-intel/compiler60/ia32/include/iflposix.f90
-intel/compiler60/ia32/include/iflposix.o
-intel/compiler60/ia32/include/work.pc
-intel/compiler60/ia32/include/work.pcl
-@dirrm intel/compiler60/ia32/include
-@dirrm intel/compiler60/ia32
-@dirrm intel/compiler60
-@dirrm intel/licenses
-@dirrm intel
+intel/compiler60/man/man1/ifc.1
+@dirrm %%PORTDOCS%%intel/licenses
+@dirrm %%PORTDOCS%%intel/compiler60/man/man1
+@dirrm %%PORTDOCS%%intel/compiler60/man
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/lib
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/include
+@dirrm %%PORTDOCS%%intel/compiler60/ia32/bin
+@dirrm %%PORTDOCS%%intel/compiler60/ia32
+@dirrm %%PORTDOCS%%intel/compiler60/docs/ref
+@dirrm %%PORTDOCS%%intel/compiler60/docs/notes
+@dirrm %%PORTDOCS%%intel/compiler60/docs/f_ug
+@dirrm %%PORTDOCS%%intel/compiler60/docs/asm_ug
+@dirrm %%PORTDOCS%%intel/compiler60/docs
+@dirrm %%PORTDOCS%%intel/compiler60
+@dirrm %%PORTDOCS%%intel