diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2004-01-28 22:15:03 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2004-01-28 22:15:03 +0000 |
| commit | dcdb48da4235c1cb5bdeed6c78f9b2f8a9df9fec (patch) | |
| tree | bf941a0ee5f9b7b13080dedaec20b8b56bb300ee /lang | |
| parent | 09f1f366298661769c51cbe406c14ebf6d0b39e4 (diff) | |
| download | ports-dcdb48da4235c1cb5bdeed6c78f9b2f8a9df9fec.tar.gz ports-dcdb48da4235c1cb5bdeed6c78f9b2f8a9df9fec.zip | |
Notes
Diffstat (limited to 'lang')
39 files changed, 494 insertions, 507 deletions
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc-ooo/distinfo +++ b/lang/gcc-ooo/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc-ooo/files/patch-regrename.c b/lang/gcc-ooo/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc-ooo/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc/files/patch-regrename.c b/lang/gcc/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc34/files/patch-regrename.c b/lang/gcc34/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc34/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc35/Makefile +++ b/lang/gcc35/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc35/distinfo +++ b/lang/gcc35/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc35/files/patch-regrename.c b/lang/gcc35/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc35/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc40/files/patch-regrename.c b/lang/gcc40/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc40/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc41/distinfo +++ b/lang/gcc41/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc41/files/patch-regrename.c b/lang/gcc41/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc41/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc42/files/patch-regrename.c b/lang/gcc42/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc42/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc43/distinfo +++ b/lang/gcc43/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc43/files/patch-regrename.c b/lang/gcc43/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc43/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc44/files/patch-regrename.c b/lang/gcc44/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc44/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc45/files/patch-regrename.c b/lang/gcc45/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc45/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc46/files/patch-regrename.c b/lang/gcc46/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc46/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc47/files/patch-regrename.c b/lang/gcc47/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc47/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 959695d51dab..f0414265a439 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-01-14 +SNAPDATE= 2004-01-28 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -30,9 +30,12 @@ COMMENT?= GNU Compiler Collection 3.4 LATEST_LINK?= gcc34${PKGNAMESUFFIX} +USE_BISON= yes USE_BZIP2= yes -USE_REINPLACE= yes +USE_GMAKE= yes USE_PERL5_BUILD=yes +USE_REINPLACE= yes +USE_SIZE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure @@ -48,15 +51,13 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build +SUFFIX= 34 TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} -PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ - --program-suffix=34 \ + --program-suffix=${SUFFIX} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -73,10 +74,20 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap-lean -MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ - gcj34.1 gcjh34.1 gij34.1 grepjar34.1 jar34.1 \ - jcf-dump34.1 jv-scan34.1 jv-convert34.1 \ - rmic34.1 rmiregistry34.1 +PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} +MAN1= cpp${SUFFIX}.1 \ + g++${SUFFIX}.1 \ + g77-${SUFFIX}.1 \ + gcc${SUFFIX}.1 \ + gcov${SUFFIX}.1 \ + gcj${SUFFIX}.1 \ + gcjh${SUFFIX}.1 \ + gij${SUFFIX}.1 \ + grepjar${SUFFIX}.1 \ + jar${SUFFIX}.1 \ + jcf-dump${SUFFIX}.1 \ + jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ + rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar @@ -129,12 +140,13 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - if [ -e ${PREFIX}/bin/${f}34 ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}34; \ +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry + # gij and jv-convert, for example, are not built on all platforms. + if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}34.1 ); \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ fi .endfor ${MV} -f ${PREFIX}/bin/g7734 ${PREFIX}/bin/g77-34 diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index beb1d8053304..8c4de4209084 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,6 +1,12 @@ -MD5 (gcc-core-3.4-20040114.tar.bz2) = 2742be0bc0d14d5eadee3a75664b37bc -MD5 (gcc-g++-3.4-20040114.tar.bz2) = caa96c9ebfa7bdd120d7c03a9fb66bda -MD5 (gcc-g77-3.4-20040114.tar.bz2) = 92a1a266ca11743daa5510cc561956e1 -MD5 (gcc-java-3.4-20040114.tar.bz2) = 1ebfd7502c9600d1838af5eff5766d86 -MD5 (gcc-objc-3.4-20040114.tar.bz2) = ae08a05a56a312776f959db343bc5319 -MD5 (gcc-testsuite-3.4-20040114.tar.bz2) = 7ce504cbee33ab818845fcd9e4949a71 +MD5 (gcc-core-3.4-20040128.tar.bz2) = df476a362e721552d715a3cbbf681c07 +SIZE (gcc-core-3.4-20040128.tar.bz2) = 10306748 +MD5 (gcc-g++-3.4-20040128.tar.bz2) = afcfb816b0a27dd0f6c9e2297f1b3c2d +SIZE (gcc-g++-3.4-20040128.tar.bz2) = 2330806 +MD5 (gcc-g77-3.4-20040128.tar.bz2) = 8bce257456d20b12bb6709cfb2c084fd +SIZE (gcc-g77-3.4-20040128.tar.bz2) = 890981 +MD5 (gcc-java-3.4-20040128.tar.bz2) = 3fdb8800c6b82cafc26c152ab66307ba +SIZE (gcc-java-3.4-20040128.tar.bz2) = 4543572 +MD5 (gcc-objc-3.4-20040128.tar.bz2) = db001e79eebf90a280c3cf7b2e0559d5 +SIZE (gcc-objc-3.4-20040128.tar.bz2) = 148656 +MD5 (gcc-testsuite-3.4-20040128.tar.bz2) = 17076b02a6f0766b9207518fe2952e12 +SIZE (gcc-testsuite-3.4-20040128.tar.bz2) = 2580386 diff --git a/lang/gcc48/files/patch-regrename.c b/lang/gcc48/files/patch-regrename.c deleted file mode 100644 index a687acded7eb..000000000000 --- a/lang/gcc48/files/patch-regrename.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: gcc/regrename.c -=================================================================== -RCS file: /cvs/gcc/gcc/gcc/regrename.c,v -retrieving revision 1.72 -retrieving revision 1.73 -diff -u -3 -p -r1.72 -r1.73 ---- gcc/regrename.c 14 Jan 2004 16:25:09 -0000 1.72 -+++ gcc/regrename.c 14 Jan 2004 17:55:20 -0000 1.73 -@@ -1345,8 +1345,8 @@ find_oldest_value_reg (enum reg_class cl - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) - return NULL_RTX; - -- if (new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, -- regno)) -+ new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); -+ if (new) - { - ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg); - REG_ATTRS (new) = REG_ATTRS (reg); |