From a7ecba81994923221344ea9cc95955f4785b10d8 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sun, 8 May 2005 22:18:08 +0000 Subject: [PATCH] Update to the 20050507 snapshot of GCC 4.0.1. Add the new gjnih40 program and its man page, address some portlint warnings, and resort pkg-plist. The fix to allow sparc64 bootstraps is upstream and the local patch not needed any longer. --- lang/gcc40/Makefile | 7 ++--- lang/gcc40/distinfo | 24 ++++++++--------- lang/gcc40/files/patch-config-freebsd-spec.h | 15 ----------- lang/gcc40/pkg-plist | 27 ++++++++++---------- 4 files changed, 30 insertions(+), 43 deletions(-) delete mode 100644 lang/gcc40/files/patch-config-freebsd-spec.h diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index ecb650db90f5..5d3b0d64d78f 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.0.1 -PORTREVISION= 20050430 +PORTREVISION= 20050507 CATEGORIES= lang java VERSIONSTRING= 4.0-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -89,6 +89,7 @@ MAN1= cpp${SUFFIX}.1 \ gcj-dbtool${SUFFIX}.1 \ gcjh${SUFFIX}.1 \ gij${SUFFIX}.1 \ + gjnih${SUFFIX}.1 \ grmic${SUFFIX}.1 \ grmiregistry${SUFFIX}.1 \ grepjar${SUFFIX}.1 \ @@ -166,8 +167,8 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib + (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib + (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index d80ef5bd8db4..bafbc791a406 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-4.0-20050430.tar.bz2) = 1301ffd4f9a9f57ad49da1d25a52b886 -SIZE (gcc-core-4.0-20050430.tar.bz2) = 13284830 -MD5 (gcc-g++-4.0-20050430.tar.bz2) = ee6d5bdeb3641c42c6a71d9595bf3de7 -SIZE (gcc-g++-4.0-20050430.tar.bz2) = 2659674 -MD5 (gcc-java-4.0-20050430.tar.bz2) = e112ff0b970d37caaafec96a54c98f08 -SIZE (gcc-java-4.0-20050430.tar.bz2) = 5931486 -MD5 (gcc-objc-4.0-20050430.tar.bz2) = e63c6d4de066a3b013a3dd1655aa96ae -SIZE (gcc-objc-4.0-20050430.tar.bz2) = 177765 -MD5 (gcc-testsuite-4.0-20050430.tar.bz2) = 580412e434f897354356beb29f7dec5f -SIZE (gcc-testsuite-4.0-20050430.tar.bz2) = 3046910 -MD5 (gcc-fortran-4.0-20050430.tar.bz2) = 2736e420939b0397ea5c5aa2c1e67818 -SIZE (gcc-fortran-4.0-20050430.tar.bz2) = 570484 +MD5 (gcc-core-4.0-20050507.tar.bz2) = d7f71ba06b60860dd0fa5d92176df8eb +SIZE (gcc-core-4.0-20050507.tar.bz2) = 13384136 +MD5 (gcc-g++-4.0-20050507.tar.bz2) = 39aae8f0ef2008fcac482d87a18e97f4 +SIZE (gcc-g++-4.0-20050507.tar.bz2) = 2661654 +MD5 (gcc-java-4.0-20050507.tar.bz2) = ab11934ce38b169d7be57488c9941e71 +SIZE (gcc-java-4.0-20050507.tar.bz2) = 5935227 +MD5 (gcc-objc-4.0-20050507.tar.bz2) = 147c743d7a248d17f3dcd1ba32b0864e +SIZE (gcc-objc-4.0-20050507.tar.bz2) = 177811 +MD5 (gcc-testsuite-4.0-20050507.tar.bz2) = 98f974520b46f39f81cbd3842a52a14c +SIZE (gcc-testsuite-4.0-20050507.tar.bz2) = 3049856 +MD5 (gcc-fortran-4.0-20050507.tar.bz2) = e0349e0cf44d87895b239aad075bda60 +SIZE (gcc-fortran-4.0-20050507.tar.bz2) = 570367 diff --git a/lang/gcc40/files/patch-config-freebsd-spec.h b/lang/gcc40/files/patch-config-freebsd-spec.h deleted file mode 100644 index 7949c47c81ca..000000000000 --- a/lang/gcc40/files/patch-config-freebsd-spec.h +++ /dev/null @@ -1,15 +0,0 @@ -Index: gcc/config/freebsd-spec.h -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/config/freebsd-spec.h,v -retrieving revision 1.13 -diff -u -3 -p -r1.13 freebsd-spec.h ---- gcc/config/freebsd-spec.h 23 Jan 2005 15:05:37 -0000 1.13 -+++ gcc/config/freebsd-spec.h 27 Apr 2005 17:37:38 -0000 -@@ -78,6 +78,7 @@ Boston, MA 02111-1307, USA. */ - - #define FBSD_CPP_SPEC " \ - %(cpp_cpu) \ -+ %(cpp_arch) \ - %{fPIC|fpic|fPIE|fpie:-D__PIC__ -D__pic__} \ - %{posix:-D_POSIX_SOURCE}" - diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist index 1db52eccfa72..2a362859e5f6 100644 --- a/lang/gcc40/pkg-plist +++ b/lang/gcc40/pkg-plist @@ -5,23 +5,25 @@ bin/fastjar40 bin/g++40 bin/gcc40 bin/gcov40 +bin/gccbug40 +bin/gcj40 +bin/gcjh40 +bin/gjnih40 +bin/grepjar40 +bin/jv-scan40 +bin/jcf-dump40 +bin/%%GNU_HOST%%-c++40 +bin/%%GNU_HOST%%-g++40 +bin/%%GNU_HOST%%-gcc-%%GCC_VER%% +bin/%%GNU_HOST%%-gcc40 +bin/%%GNU_HOST%%-gcj40 +bin/%%GNU_HOST%%-gcjh40 +include/mf-runtime.h %%FORTRAN%%bin/gfortran40 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a %%FORTRAN%%lib/libgfortran.la %%FORTRAN%%lib/libgfortranbegin.la -bin/%%GNU_HOST%%-c++40 -bin/%%GNU_HOST%%-gcc-%%GCC_VER%% -bin/%%GNU_HOST%%-gcc40 -bin/%%GNU_HOST%%-g++40 -bin/%%GNU_HOST%%-gcj40 -bin/%%GNU_HOST%%-gcjh40 -bin/gccbug40 -bin/gcj40 -bin/gcjh40 -bin/grepjar40 -bin/jv-scan40 -bin/jcf-dump40 %%LIBJAVA%%bin/addr2name.awk40 %%LIBJAVA%%bin/gcj-dbtool40 %%LIBJAVA%%bin/gij40 @@ -40,7 +42,6 @@ bin/jcf-dump40 %%LIBJAVA%%lib/security/libgcj.security %%LIBJAVA%%@dirrm lib/security %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=-