aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/gcc/Makefile13
-rw-r--r--lang/gcc/distinfo24
-rw-r--r--lang/gcc/pkg-plist6
-rw-r--r--lang/gcc41/Makefile13
-rw-r--r--lang/gcc41/distinfo24
-rw-r--r--lang/gcc41/pkg-plist6
-rw-r--r--lang/gcc42/Makefile13
-rw-r--r--lang/gcc42/distinfo24
-rw-r--r--lang/gcc42/pkg-plist6
-rw-r--r--lang/gcc43/Makefile13
-rw-r--r--lang/gcc43/distinfo24
-rw-r--r--lang/gcc43/pkg-plist6
-rw-r--r--lang/gcc44/Makefile13
-rw-r--r--lang/gcc44/distinfo24
-rw-r--r--lang/gcc44/pkg-plist6
-rw-r--r--lang/gcc45/Makefile13
-rw-r--r--lang/gcc45/distinfo24
-rw-r--r--lang/gcc45/pkg-plist6
-rw-r--r--lang/gcc46/Makefile13
-rw-r--r--lang/gcc46/distinfo24
-rw-r--r--lang/gcc46/pkg-plist6
-rw-r--r--lang/gcc47/Makefile13
-rw-r--r--lang/gcc47/distinfo24
-rw-r--r--lang/gcc47/pkg-plist6
-rw-r--r--lang/gcc48/Makefile13
-rw-r--r--lang/gcc48/distinfo24
-rw-r--r--lang/gcc48/pkg-plist6
27 files changed, 135 insertions, 252 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gcc
PORTVERSION= 4.1.0
-PORTREVISION= 20050618
+PORTREVISION= 20050625
CATEGORIES= lang java
VERSIONSTRING= 4.1-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --disable-nls \
--with-system-zlib \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
+ --libdir=${TARGLIB} \
--with-gxx-include-dir=${TARGLIB}/include/c++/
.if defined(WITH_FORTRAN)
CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
CONFIGURE_ARGS+= --enable-shared
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS= libgcc_s
.else
CONFIGURE_ARGS+= --disable-shared
.endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
-EXTRA_LIBS+= libffi libgcj libgij
.endif
.if defined(WITH_FORTRAN)
MAN1+= gfortran${SUFFIX}.1
INFO+= gfortran
PLIST_SUB+= FORTRAN=""
-EXTRA_LIBS+= libgfortran libgfortranbegin
.else
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -157,12 +155,7 @@ post-install:
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- # These libraries are moved from PREFIX/lib to avoid conflicts with
- # the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
- ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
- ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+ ${RM} -f ${TARGLIB}/*.la
${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
# Add target libraries and include files to packaging list.
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
%%LIBJAVA%%bin/grmiregistry41
%%LIBJAVA%%bin/jv-convert41
%%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:39:00 +0000