aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2006-03-16 06:42:16 +0800
committergerald <gerald@FreeBSD.org>2006-03-16 06:42:16 +0800
commita624f590ad4f3bd9b6348b5ff032cdafb87f7e1c (patch)
tree75a169c54ead66302b55bb6d7e327f2a6da32086 /lang
parentb3fb0a0ebe92d0dd749b6beec8f7f3df944a6eac (diff)
downloadfreebsd-ports-gnome-a624f590ad4f3bd9b6348b5ff032cdafb87f7e1c.tar.gz
freebsd-ports-gnome-a624f590ad4f3bd9b6348b5ff032cdafb87f7e1c.tar.zst
freebsd-ports-gnome-a624f590ad4f3bd9b6348b5ff032cdafb87f7e1c.zip
Update to the 20060311 snapshot of GCC 4.2.0.
The spamming of $PREFIX/include/ssp is now finally gone after my reports upstream, which allows us to restrict the conflict with gcc-4.1.* to the case where we build Java. Convert the build-time dependency on math/mpfr to a full one, since the Fortran frontend also needs this at run time. Always build both shared and static libraries instead of having these as two exclusive options defaulting to the former. Remove bogus USE_X11 (which was not used by default nor any other port). No longer hardcode the version number in LATEST_LINK.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc/Makefile23
-rw-r--r--lang/gcc/distinfo30
-rw-r--r--lang/gcc/pkg-plist8
-rw-r--r--lang/gcc42/Makefile23
-rw-r--r--lang/gcc42/distinfo30
-rw-r--r--lang/gcc42/pkg-plist8
-rw-r--r--lang/gcc43/Makefile23
-rw-r--r--lang/gcc43/distinfo30
-rw-r--r--lang/gcc43/pkg-plist8
-rw-r--r--lang/gcc44/Makefile23
-rw-r--r--lang/gcc44/distinfo30
-rw-r--r--lang/gcc44/pkg-plist8
-rw-r--r--lang/gcc45/Makefile23
-rw-r--r--lang/gcc45/distinfo30
-rw-r--r--lang/gcc45/pkg-plist8
-rw-r--r--lang/gcc46/Makefile23
-rw-r--r--lang/gcc46/distinfo30
-rw-r--r--lang/gcc46/pkg-plist8
-rw-r--r--lang/gcc47/Makefile23
-rw-r--r--lang/gcc47/distinfo30
-rw-r--r--lang/gcc47/pkg-plist8
-rw-r--r--lang/gcc48/Makefile23
-rw-r--r--lang/gcc48/distinfo30
-rw-r--r--lang/gcc48/pkg-plist8
24 files changed, 200 insertions, 288 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 51231453b04e..e2e851286dbe 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.2.0
-PORTREVISION= 20060218
+PORTREVISION= 20060311
CATEGORIES= lang java
VERSIONSTRING= 4.2-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.2
.if defined(WITH_FORTRAN)
-LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
+ mpfr.1:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-4.1.*
-LATEST_LINK?= gcc42${PKGNAMESUFFIX}
+SUFFIX= 42
+LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
USE_BZIP2= yes
@@ -36,7 +36,6 @@ USE_ICONV= yes
USE_PERL5_BUILD=yes
.if defined(WITH_JAVA_AWT)
USE_GNOME= gtk20
-USE_X11= yes
.endif
PATCH_WRKSRC= ${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 42
TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+= --disable-nls \
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes # We need this at the moment.
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+ALL_TARGET= bootstrap
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-ALL_TARGET= bootstrap
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
MAN1= cpp${SUFFIX}.1 \
@@ -107,6 +99,7 @@ PLIST_SUB+= FORTRAN="@comment "
.endif
.if ! defined(WITHOUT_JAVA)
+CONFLICTS= gcc-4.1.*
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
EXTRA_PATCHES= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on
@@ -168,6 +161,8 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
+ ${MV} -f ${PREFIX}/include/mf-runtime.h \
+ ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 422b1fc8657b..05410402fe66 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.2-20060218.tar.bz2) = d4a5af82c2703780b141d836fefb9c28
-SHA256 (gcc-core-4.2-20060218.tar.bz2) = 6a865cd2925204bf17031f2aac44f76063debcb2ac62154f506759d06513cff9
-SIZE (gcc-core-4.2-20060218.tar.bz2) = 15735953
-MD5 (gcc-g++-4.2-20060218.tar.bz2) = 96a31653a06466af37160d7ff8b526e7
-SHA256 (gcc-g++-4.2-20060218.tar.bz2) = 412985d7c12ae323c59a0d33c38888442e5a07c123152e945460bc204f706a2a
-SIZE (gcc-g++-4.2-20060218.tar.bz2) = 3883659
-MD5 (gcc-objc-4.2-20060218.tar.bz2) = 76ef013a64b2005012d95deb622dca82
-SHA256 (gcc-objc-4.2-20060218.tar.bz2) = 3cfb21286c422237dd13df7c327e2ee30657a3ba31ecf7cca2d07600f277f405
-SIZE (gcc-objc-4.2-20060218.tar.bz2) = 191063
-MD5 (gcc-testsuite-4.2-20060218.tar.bz2) = 952536f8c659b6f649393819351c2aa6
-SHA256 (gcc-testsuite-4.2-20060218.tar.bz2) = b9a8fe0b9b97f04d3702d86245ec3bd1c8dae725f809cf97b8827f9d338ee0f0
-SIZE (gcc-testsuite-4.2-20060218.tar.bz2) = 3607223
-MD5 (gcc-fortran-4.2-20060218.tar.bz2) = a4f897e0ecaefd7aee8b7d8de6cbc055
-SHA256 (gcc-fortran-4.2-20060218.tar.bz2) = 8565982522b0893bee0311cf39e5c1e9799e2f6716bad026194fb1e99ba5c953
-SIZE (gcc-fortran-4.2-20060218.tar.bz2) = 787192
+MD5 (gcc-core-4.2-20060311.tar.bz2) = e5135269ca597566a98d37f1a9f7fb4f
+SHA256 (gcc-core-4.2-20060311.tar.bz2) = 546d779ae1a599149c5d47f51d3b0368527e817023ad5277310bd15fca7e1764
+SIZE (gcc-core-4.2-20060311.tar.bz2) = 15739134
+MD5 (gcc-g++-4.2-20060311.tar.bz2) = fd1e55cd98518c875317039cf41f3346
+SHA256 (gcc-g++-4.2-20060311.tar.bz2) = 022d9e45e2f02112ec58b46bec9b23b4cb976c3f505ff82975fec1e794fb2dfa
+SIZE (gcc-g++-4.2-20060311.tar.bz2) = 3916654
+MD5 (gcc-objc-4.2-20060311.tar.bz2) = 5013eb8e4d1da64a11ba43bcf0e46d79
+SHA256 (gcc-objc-4.2-20060311.tar.bz2) = 95cd73293c582cf3cd2f8546c7db7b688226369c8146acf054aadc6e98943dec
+SIZE (gcc-objc-4.2-20060311.tar.bz2) = 191218
+MD5 (gcc-testsuite-4.2-20060311.tar.bz2) = a0e3535edcfd34479f5253501ae50c81
+SHA256 (gcc-testsuite-4.2-20060311.tar.bz2) = 57fabb7a1cb267cd532ece793b32376e7808f45293ac6ffaec8def89bbd7dd14
+SIZE (gcc-testsuite-4.2-20060311.tar.bz2) = 3615412
+MD5 (gcc-fortran-4.2-20060311.tar.bz2) = 371aef8db51dd12df9d6e929b57850e5
+SHA256 (gcc-fortran-4.2-20060311.tar.bz2) = 6e82f961994a5a6962cfbc76109559c3325cb0144d9741ce669c6f66762a2368
+SIZE (gcc-fortran-4.2-20060311.tar.bz2) = 794795
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 109f227a4fe4..c354ad32d65c 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -3,19 +3,13 @@ bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
bin/g++%%SUFFIX%%
bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
include/omp.h
-@dirrm include/ssp
info/gcc%%SUFFIX%%/dir
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%