aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2005-05-09 20:53:40 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2005-05-09 20:53:40 +0000
commit9843b4e4335ed13df961e4a8d48b285306872588 (patch)
tree55c8b1dc34663a7f5145e6635df724b6764f4662
parent9d20fc2a8d89db71f2263bf5d1e6aec6e5d64857 (diff)
downloadports-9843b4e4335ed13df961e4a8d48b285306872588.tar.gz
ports-9843b4e4335ed13df961e4a8d48b285306872588.zip
Notes
-rw-r--r--lang/gcc/Makefile20
-rw-r--r--lang/gcc/distinfo24
-rw-r--r--lang/gcc/pkg-plist13
-rw-r--r--lang/gcc41/Makefile20
-rw-r--r--lang/gcc41/distinfo24
-rw-r--r--lang/gcc41/pkg-plist13
-rw-r--r--lang/gcc42/Makefile20
-rw-r--r--lang/gcc42/distinfo24
-rw-r--r--lang/gcc42/pkg-plist13
-rw-r--r--lang/gcc43/Makefile20
-rw-r--r--lang/gcc43/distinfo24
-rw-r--r--lang/gcc43/pkg-plist13
-rw-r--r--lang/gcc44/Makefile20
-rw-r--r--lang/gcc44/distinfo24
-rw-r--r--lang/gcc44/pkg-plist13
-rw-r--r--lang/gcc45/Makefile20
-rw-r--r--lang/gcc45/distinfo24
-rw-r--r--lang/gcc45/pkg-plist13
-rw-r--r--lang/gcc46/Makefile20
-rw-r--r--lang/gcc46/distinfo24
-rw-r--r--lang/gcc46/pkg-plist13
-rw-r--r--lang/gcc47/Makefile20
-rw-r--r--lang/gcc47/distinfo24
-rw-r--r--lang/gcc47/pkg-plist13
-rw-r--r--lang/gcc48/Makefile20
-rw-r--r--lang/gcc48/distinfo24
-rw-r--r--lang/gcc48/pkg-plist13
27 files changed, 270 insertions, 243 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 9b1e7d9ee574..a5be84c9fabb 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050501
+PORTREVISION= 20050508
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -23,13 +23,14 @@ DISTFILES= \
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
.endif
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.1
+MAINTAINER= gerald@FreeBSD.org
+COMMENT= GNU Compiler Collection 4.1
.if defined(WITH_FORTRAN)
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
+CONFLICTS= gcc-3.3.* gcc-4.0.*
LATEST_LINK?= gcc41${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -53,7 +54,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
-# FIXME: needed to make gcc41 port work for now.
+# FIXME: needed to make this port build at all.
WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
@@ -67,7 +68,7 @@ CONFIGURE_ARGS= --disable-nls \
--program-suffix=${SUFFIX} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
.endif
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
.if defined(WANT_SHAREDLIBS)
@@ -89,6 +90,7 @@ MAN1= cpp${SUFFIX}.1 \
gcj-dbtool${SUFFIX}.1 \
gcjh${SUFFIX}.1 \
gij${SUFFIX}.1 \
+ gjnih${SUFFIX}.1 \
grmic${SUFFIX}.1 \
grmiregistry${SUFFIX}.1 \
grepjar${SUFFIX}.1 \
@@ -166,8 +168,8 @@ post-install: fake-manpages
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
fi
.endfor
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
- (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+ (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@@ -177,8 +179,8 @@ post-install: fake-manpages
cd ${WRKDIR} ; ex < ex.script
cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
- @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.0'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+ @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
.endfor
.include <bsd.port.post.mk>
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 737be16cb7f1..4d40523f8330 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050501.tar.bz2) = b0d874912d7f072e3e21f38521508a2f
-SIZE (gcc-core-4.1-20050501.tar.bz2) = 13606925
-MD5 (gcc-g++-4.1-20050501.tar.bz2) = ae3fea2e3033ade4be1817361db76716
-SIZE (gcc-g++-4.1-20050501.tar.bz2) = 2662042
-MD5 (gcc-java-4.1-20050501.tar.bz2) = fb0f713e228b41e2a47ade4ccf2b1364
-SIZE (gcc-java-4.1-20050501.tar.bz2) = 6025501
-MD5 (gcc-objc-4.1-20050501.tar.bz2) = d244b1543201cfa8577fb36fc325ecd1
-SIZE (gcc-objc-4.1-20050501.tar.bz2) = 178899
-MD5 (gcc-testsuite-4.1-20050501.tar.bz2) = 970b8cc070b29f5d3c5eaf4c7d186970
-SIZE (gcc-testsuite-4.1-20050501.tar.bz2) = 3076639
-MD5 (gcc-fortran-4.1-20050501.tar.bz2) = 34b246a1b614c59ac1c83254eedcf01c
-SIZE (gcc-fortran-4.1-20050501.tar.bz2) = 578315
+MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5
+SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663
+MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748
+SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482
+MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8
+SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354
+MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299
+SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875
+MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d
+SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624
+MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4
+SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index c154566ba35d..43c7c4fcb376 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -5,23 +5,24 @@ bin/fastjar41
bin/g++41
bin/gcc41
bin/gcov41
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%lib/libgfortran.a
-%%FORTRAN%%lib/libgfortranbegin.a
-%%FORTRAN%%lib/libgfortran.la
-%%FORTRAN%%lib/libgfortranbegin.la
bin/%%GNU_HOST%%-c++41
+bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
bin/%%GNU_HOST%%-gcc41
-bin/%%GNU_HOST%%-g++41
bin/%%GNU_HOST%%-gcj41
bin/%%GNU_HOST%%-gcjh41
bin/gccbug41
bin/gcj41
bin/gcjh41
+bin/gjnih41
bin/grepjar41
bin/jv-scan41
bin/jcf-dump41
+%%FORTRAN%%bin/gfortran41
+%%FORTRAN%%lib/libgfortran.a
+%%FORTRAN%%lib/libgfortranbegin.a
+%%FORTRAN%%lib/libgfortran.la
+%%FORTRAN%%lib/libgfortranbegin.la
%%LIBJAVA%%bin/addr2name.awk41
%%LIBJAVA%%bin/gcj-dbtool41
%%LIBJAVA%%bin/gij41