diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2003-12-13 13:11:20 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2003-12-13 13:11:20 +0000 |
| commit | 18a58e67ad0f4591ac874729f749049098ba784c (patch) | |
| tree | 8da65259136f8ae82c7c3dde1d1a1d3dc9bda16f /lang | |
| parent | * Fix pkg-message generation on read-only filesystem. (diff) | |
- Update to 7.1.034.
- Modify plist to print a diagnostic instead of a pkg_delete warning
if there's a license in the license directory.
Notes
Notes:
svn path=/head/; revision=95723
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/icc/Makefile | 10 | ||||
| -rw-r--r-- | lang/icc/distinfo | 2 | ||||
| -rw-r--r-- | lang/icc/pkg-plist | 4 | ||||
| -rw-r--r-- | lang/icc7/Makefile | 10 | ||||
| -rw-r--r-- | lang/icc7/distinfo | 2 | ||||
| -rw-r--r-- | lang/icc7/pkg-plist | 4 |
6 files changed, 12 insertions, 20 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 89eead493e54..a91f9b8a16c2 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= icc -PORTVERSION= 7.1.033 +PORTVERSION= 7.1.034 #PORTREVISION= 1 CATEGORIES= lang linux devel MASTER_SITES= @@ -69,12 +69,8 @@ post-extract: ${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude .endif .for i in \ - intel-icc7-7.1-35.i386.rpm -# intel-iidb7-7.2.2-72.i386.rpm \ -# intel-isubh7-7.1-35.i386.rpm \ -# intel-ecc7-7.1-35.ia64.rpm \ -# intel-eidb7-7.2.2-72.ia64.rpm \ -# intel-esubh7-7.1-35.ia64.rpm + intel-icc7-7.1-37.i386.rpm +# intel-iidb7-7.2.2-75.i386.rpm @cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \ ${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet .endfor diff --git a/lang/icc/distinfo b/lang/icc/distinfo index 6cf3cc094e50..de9f003134e5 100644 --- a/lang/icc/distinfo +++ b/lang/icc/distinfo @@ -1 +1 @@ -MD5 (l_cc_pc_7.1.033.tar) = 391f173c6c81756707a778481a657fed +MD5 (l_cc_pc_7.1.034.tar) = 1b53d88da56fdb30b002c0c1fb8e481f diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist index a26c8ece9fc3..67426a5a00ab 100644 --- a/lang/icc/pkg-plist +++ b/lang/icc/pkg-plist @@ -1354,5 +1354,5 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training/templ_im %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training @dirrm intel/%%COMPILERDIR%% -@dirrm intel/licenses -@dirrm intel +@unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** license directory (%D/intel/licenses/) not removed, it may contain a license' +@unexec rmdir %D/intel >/dev/null 2>&1 || true diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index 89eead493e54..a91f9b8a16c2 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -6,7 +6,7 @@ # PORTNAME= icc -PORTVERSION= 7.1.033 +PORTVERSION= 7.1.034 #PORTREVISION= 1 CATEGORIES= lang linux devel MASTER_SITES= @@ -69,12 +69,8 @@ post-extract: ${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude .endif .for i in \ - intel-icc7-7.1-35.i386.rpm -# intel-iidb7-7.2.2-72.i386.rpm \ -# intel-isubh7-7.1-35.i386.rpm \ -# intel-ecc7-7.1-35.ia64.rpm \ -# intel-eidb7-7.2.2-72.ia64.rpm \ -# intel-esubh7-7.1-35.ia64.rpm + intel-icc7-7.1-37.i386.rpm +# intel-iidb7-7.2.2-75.i386.rpm @cd ${WRKSRC} && rpm2cpio.pl 2>/dev/null ${i} | \ ${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet .endfor diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo index 6cf3cc094e50..de9f003134e5 100644 --- a/lang/icc7/distinfo +++ b/lang/icc7/distinfo @@ -1 +1 @@ -MD5 (l_cc_pc_7.1.033.tar) = 391f173c6c81756707a778481a657fed +MD5 (l_cc_pc_7.1.034.tar) = 1b53d88da56fdb30b002c0c1fb8e481f diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist index a26c8ece9fc3..67426a5a00ab 100644 --- a/lang/icc7/pkg-plist +++ b/lang/icc7/pkg-plist @@ -1354,5 +1354,5 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training/templ_im %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training @dirrm intel/%%COMPILERDIR%% -@dirrm intel/licenses -@dirrm intel +@unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** license directory (%D/intel/licenses/) not removed, it may contain a license' +@unexec rmdir %D/intel >/dev/null 2>&1 || true |